quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor SelectionIntersection

Browse Source
This commit is contained in:
Garux 2018-05-14 22:31:37 +03:00
parent af9850510f
commit 26b2065350
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
include/selectable.h
View File

@ -30,45 +30,46 @@
class SelectionIntersection class SelectionIntersection
{ {
//public: float m_depth;
double m_depth;
float m_distance; float m_distance;
double m_depth2; float m_depth2;
bool m_direct; bool m_indirect;
public: public:
SelectionIntersection() : m_depth( 1 ), m_distance( 2 ), m_depth2( -1 ), m_direct( false ){ SelectionIntersection() : m_depth( 1 ), m_distance( 2 ), m_depth2( -1 ), m_indirect( true ){
} }
SelectionIntersection( float depth, float distance ) : m_depth( depth ), m_distance( distance ), m_depth2( -1 ), m_direct( distance == 0.f ){ SelectionIntersection( float depth, float distance ) : m_depth( depth ), m_distance( distance ), m_depth2( -1 ), m_indirect( distance != 0.f ){
} }
SelectionIntersection( float depth, float distance, float depth2 ) : m_depth( depth ), m_distance( distance ), m_depth2( depth2 ), m_direct( distance == 0.f ){ SelectionIntersection( float depth, float distance, float depth2 ) : m_depth( depth ), m_distance( distance ), m_depth2( depth2 ), m_indirect( distance != 0.f ){
} }
bool operator<( const SelectionIntersection& other ) const { bool operator<( const SelectionIntersection& other ) const {
if ( ( m_direct ^ other.m_direct ) || if( m_indirect != other.m_indirect ){
( !m_direct && !other.m_direct && fabs( m_distance - other.m_distance ) > 1e-3f /*0.00002f*/ ) ) { return other.m_indirect; //m_distance < other.m_distance;
return m_distance < other.m_distance;
} }
if( !m_direct && !other.m_direct ){ else if( m_indirect && other.m_indirect ){
if( fabs( m_depth - other.m_depth ) > 1e-6 ){ if( fabs( m_distance - other.m_distance ) > 1e-3f /*0.00002f*/ ){
return m_distance < other.m_distance;
}
else if( fabs( m_depth - other.m_depth ) > 1e-6f ){
return m_depth < other.m_depth; return m_depth < other.m_depth;
} }
else{ else{
return m_depth2 > other.m_depth2; return m_depth2 > other.m_depth2;
} }
} }
if ( m_depth != other.m_depth ) { else if( m_depth != other.m_depth ){
return m_depth < other.m_depth; return m_depth < other.m_depth;
} }
return false; return false;
} }
bool equalEpsilon( const SelectionIntersection& other, float distanceEpsilon, float depthEpsilon ) const { bool equalEpsilon( const SelectionIntersection& other, float distanceEpsilon, float depthEpsilon ) const {
if ( m_direct ^ other.m_direct ) { if( m_indirect != other.m_indirect ){
return false; return false;
} }
if( !m_direct && !other.m_direct ){ else if( m_indirect && other.m_indirect ){
#if 1 #if 1
return float_equal_epsilon( m_distance, other.m_distance, distanceEpsilon ) return float_equal_epsilon( m_distance, other.m_distance, distanceEpsilon )
&& float_equal_epsilon( m_depth, other.m_depth, static_cast<double>( depthEpsilon ) ) && float_equal_epsilon( m_depth, other.m_depth, depthEpsilon )
&& float_equal_epsilon( m_depth2, other.m_depth2, 3e-7 ); && float_equal_epsilon( m_depth2, other.m_depth2, 3e-7f );
#else #else
return ( m_distance == other.m_distance ) return ( m_distance == other.m_distance )
&& ( m_depth == other.m_depth ) && ( m_depth == other.m_depth )
@ -76,8 +77,8 @@ bool equalEpsilon( const SelectionIntersection& other, float distanceEpsilon, fl
#endif #endif
} }
return float_equal_epsilon( m_distance, other.m_distance, distanceEpsilon ) return float_equal_epsilon( m_distance, other.m_distance, distanceEpsilon )
&& float_equal_epsilon( m_depth, other.m_depth, static_cast<double>( depthEpsilon ) ) && float_equal_epsilon( m_depth, other.m_depth, depthEpsilon )
&& float_equal_epsilon( m_depth2, other.m_depth2, static_cast<double>( depthEpsilon ) ); && float_equal_epsilon( m_depth2, other.m_depth2, depthEpsilon );
} }
float depth() const { float depth() const {
return m_depth; return m_depth;