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

change points order in plane3_for_points( const BasicVector3<Element>& p0, const BasicVector3<Element>& p1, const BasicVector3<Element>& p2 )

Browse Source 
to be consistent over the related code
to omit points swap there and there
This commit is contained in:
Garux 2019-05-01 12:38:58 +03:00
parent 71c63fbdc6
commit 3ce07bb310
6 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/math/plane.h
View File

@ -125,17 +125,27 @@ inline bool plane3_valid( const Plane3& self ){
return float_equal_epsilon( vector3_dot( self.normal(), self.normal() ), 1.0, 0.01 ); return float_equal_epsilon( vector3_dot( self.normal(), self.normal() ), 1.0, 0.01 );
} }
/*
* The order of points, when looking from outside the face:
*
* 1
* |
* |
* |
* |
* 0-----------2
*/
template<typename Element> template<typename Element>
inline Plane3 plane3_for_points( const BasicVector3<Element>& p0, const BasicVector3<Element>& p1, const BasicVector3<Element>& p2 ){ inline Plane3 plane3_for_points( const BasicVector3<Element>& p0, const BasicVector3<Element>& p1, const BasicVector3<Element>& p2 ){
Plane3 self; Plane3 self;
self.normal() = vector3_normalised( vector3_cross( vector3_subtracted( p1, p0 ), vector3_subtracted( p2, p0 ) ) ); self.normal() = vector3_normalised( vector3_cross( vector3_subtracted( p2, p0 ), vector3_subtracted( p1, p0 ) ) );
self.dist() = vector3_dot( p0, self.normal() ); self.dist() = vector3_dot( p0, self.normal() );
return self; return self;
} }
template<typename Element> template<typename Element>
inline Plane3 plane3_for_points( const BasicVector3<Element> planepts[3] ){ inline Plane3 plane3_for_points( const BasicVector3<Element> planepts[3] ){
return plane3_for_points( planepts[2], planepts[1], planepts[0] ); return plane3_for_points( planepts[0], planepts[1], planepts[2] );
} }
template<typename T> template<typename T>

4
radiant/brush.cpp
View File

@ -467,7 +467,7 @@ void Brush::vertexModeBuildHull( bool allTransformed /*= false*/ ){
static_cast<double>( i.m_vertexTransformed.y() ), static_cast<double>( i.m_vertexTransformed.y() ),
static_cast<double>( i.m_vertexTransformed.z() ) ) ); static_cast<double>( i.m_vertexTransformed.z() ) ) );
} }
auto hull = quickhull.getConvexHull( pointCloud, false, true ); auto hull = quickhull.getConvexHull( pointCloud, true, true );
const auto& indexBuffer = hull.getIndexBuffer(); const auto& indexBuffer = hull.getIndexBuffer();
const size_t triangleCount = indexBuffer.size() / 3; const size_t triangleCount = indexBuffer.size() / 3;
VertexModePlanes vertexModePlanes; VertexModePlanes vertexModePlanes;
@ -490,7 +490,7 @@ void Brush::vertexModeBuildHull( bool allTransformed /*= false*/ ){
if( vector3_dot( plane.normal(), face->getPlane().plane3().normal() ) < 0 ){ //likely reversed plane if( vector3_dot( plane.normal(), face->getPlane().plane3().normal() ) < 0 ){ //likely reversed plane
transformed = true; transformed = true;
} }
vertexModePlanes.push_back( VertexModePlane( plane, face, v[0], v[2], v[1], transformed ) ); vertexModePlanes.push_back( VertexModePlane( plane, face, v[0], v[1], v[2], transformed ) );
} }
else{ else{
it->m_transformed |= transformed; it->m_transformed |= transformed;

2
radiant/brush.h
View File

@ -831,7 +831,7 @@ void copy( const Vector3& p0, const Vector3& p1, const Vector3& p2 ){
} }
else else
{ {
m_planeCached = plane3_for_points( p2, p1, p0 ); m_planeCached = plane3_for_points( p0, p1, p2 );
updateSource(); updateSource();
} }
} }

16
radiant/csg.cpp
View File

@ -747,7 +747,7 @@ void CSG_Subtract(){
class BrushSplitByPlaneSelected : public scene::Graph::Walker class BrushSplitByPlaneSelected : public scene::Graph::Walker
{ {
const ClipperPoints m_points; const ClipperPoints m_points;
const Plane3 m_plane; const Plane3 m_plane; /* plane to insert */
const char* m_shader; const char* m_shader;
const TextureProjection& m_projection; const TextureProjection& m_projection;
const bool m_split; /* split or clip */ const bool m_split; /* split or clip */
@ -774,7 +774,7 @@ void post( const scene::Path& path, scene::Instance& instance ) const {
NodeSmartReference node( ( new BrushNode() )->node() ); NodeSmartReference node( ( new BrushNode() )->node() );
Brush* fragment = Node_getBrush( node ); Brush* fragment = Node_getBrush( node );
fragment->copy( *brush ); fragment->copy( *brush );
fragment->addPlane( m_points[0], m_points[1], m_points[2], m_shader, m_projection ); fragment->addPlane( m_points[0], m_points[2], m_points[1], m_shader, m_projection );
fragment->removeEmptyFaces(); fragment->removeEmptyFaces();
ASSERT_MESSAGE( !fragment->empty(), "brush left with no faces after split" ); ASSERT_MESSAGE( !fragment->empty(), "brush left with no faces after split" );
@ -786,13 +786,13 @@ void post( const scene::Path& path, scene::Instance& instance ) const {
} }
} }
brush->addPlane( m_points[0], m_points[2], m_points[1], m_shader, m_projection ); brush->addPlane( m_points[0], m_points[1], m_points[2], m_shader, m_projection );
brush->removeEmptyFaces(); brush->removeEmptyFaces();
ASSERT_MESSAGE( !brush->empty(), "brush left with no faces after split" ); ASSERT_MESSAGE( !brush->empty(), "brush left with no faces after split" );
} }
else else
// the plane does not intersect this brush // the plane does not intersect this brush
if ( !m_split && split.counts[ePlaneFront] != 0 ) { if ( !m_split && split.counts[ePlaneBack] != 0 ) {
// the brush is "behind" the plane // the brush is "behind" the plane
m_gj = true; m_gj = true;
Path_deleteTop( path ); Path_deleteTop( path );
@ -1097,9 +1097,9 @@ void CSG_build_hull( const MergeVertices& mergeVertices, MergePlanes& mergePlane
const brushsplit_t split = mergeVertices.classify_plane( plane ); const brushsplit_t split = mergeVertices.classify_plane( plane );
if( ( split.counts[ePlaneFront] == 0 ) != ( split.counts[ePlaneBack] == 0 ) ){ if( ( split.counts[ePlaneFront] == 0 ) != ( split.counts[ePlaneBack] == 0 ) ){
if( split.counts[ePlaneFront] != 0 ) if( split.counts[ePlaneFront] != 0 )
mergePlanes.insert( MergePlane( plane3_flipped( plane ), *i, *j, *k ) ); mergePlanes.insert( MergePlane( plane3_flipped( plane ), *i, *k, *j ) );
else else
mergePlanes.insert( MergePlane( plane, *i, *k, *j ) ); mergePlanes.insert( MergePlane( plane, *i, *j, *k ) );
} }
} }
} }
@ -1115,7 +1115,7 @@ void CSG_build_hull( const MergeVertices& mergeVertices, MergePlanes& mergePlane
static_cast<double>( mergeVertices[i].y() ), static_cast<double>( mergeVertices[i].y() ),
static_cast<double>( mergeVertices[i].z() ) ) ); static_cast<double>( mergeVertices[i].z() ) ) );
} }
auto hull = quickhull.getConvexHull( pointCloud, false, true ); auto hull = quickhull.getConvexHull( pointCloud, true, true );
const auto& indexBuffer = hull.getIndexBuffer(); const auto& indexBuffer = hull.getIndexBuffer();
const size_t triangleCount = indexBuffer.size() / 3; const size_t triangleCount = indexBuffer.size() / 3;
for( size_t i = 0; i < triangleCount; ++i ) { for( size_t i = 0; i < triangleCount; ++i ) {
@ -1125,7 +1125,7 @@ void CSG_build_hull( const MergeVertices& mergeVertices, MergePlanes& mergePlane
} }
const Plane3 plane = plane3_for_points( p[0], p[1], p[2] ); const Plane3 plane = plane3_for_points( p[0], p[1], p[2] );
if( plane3_valid( plane ) ){ if( plane3_valid( plane ) ){
mergePlanes.insert( MergePlane( plane, p[0], p[2], p[1] ) ); mergePlanes.insert( MergePlane( plane, p[0], p[1], p[2] ) );
} }
} }
} }

4
radiant/selection.cpp
View File

@ -4156,10 +4156,10 @@ public:
{ {
if( m_view->fill() ){ //3d if( m_view->fill() ){ //3d
viewdir_fixup(); viewdir_fixup();
m_points[2].m_point = m_points[0].m_point + m_viewdir * vector3_length( m_points[0].m_point - m_points[1].m_point ); m_points[2].m_point = m_points[0].m_point - m_viewdir * vector3_length( m_points[0].m_point - m_points[1].m_point );
viewdir_make_cut_worthy( plane3_for_points( m_points[0].m_point, m_points[1].m_point, m_points[2].m_point ) ); viewdir_make_cut_worthy( plane3_for_points( m_points[0].m_point, m_points[1].m_point, m_points[2].m_point ) );
} }
m_points[2].m_point = m_points[0].m_point + m_viewdir * vector3_length( m_points[0].m_point - m_points[1].m_point ); m_points[2].m_point = m_points[0].m_point - m_viewdir * vector3_length( m_points[0].m_point - m_points[1].m_point );
} // fall through } // fall through
case 3: case 3:
Clipper_setPlanePoints( ClipperPoints( m_points[0].m_point, m_points[1].m_point, m_points[2].m_point, npoints ) ); Clipper_setPlanePoints( ClipperPoints( m_points[0].m_point, m_points[1].m_point, m_points[2].m_point, npoints ) );

4
radiant/winding.h
View File

@ -74,8 +74,8 @@ inline indexremap_t indexremap_for_projectionaxis( const ProjectionAxis axis ){
enum PlaneClassification enum PlaneClassification
{ {
ePlaneFront = 0, ePlaneFront = 0, //! in front of plane ---->| *
ePlaneBack = 1, ePlaneBack = 1, //! behind the plane -*-->|
ePlaneOn = 2, ePlaneOn = 2,
}; };