diff --git a/radiant/brush.cpp b/radiant/brush.cpp index e45b437c..684551d5 100644 --- a/radiant/brush.cpp +++ b/radiant/brush.cpp @@ -106,8 +106,6 @@ inline bool Brush_isBounded( const Brush& brush ){ } void Brush::buildBRep(){ - globalOutputStream() << " buildBRep start\n"; - m_BRep_evaluation = true; bool degenerate = buildWindings(); @@ -316,10 +314,8 @@ void Brush::buildBRep(){ for ( Observers::iterator o = m_observers.begin(); o != m_observers.end(); ++o ) ( *o )->vertex_select( i.m_vertexTransformed ); } - globalOutputStream() << m_vertexModeOn << " m_vertexModeOn\n"; } m_BRep_evaluation = false; - globalOutputStream() << " buildBRep end\n"; } @@ -464,7 +460,6 @@ const Face* vertex_mode_find_common_face( const Brush::VertexModeVertex& v1, con #include "quickhull/QuickHull.hpp" void Brush::vertexModeBuildHull( bool allTransformed /*= false*/ ){ - globalOutputStream() << " vertexModeBuildHull\n"; quickhull::QuickHull quickhull; std::vector> pointCloud; pointCloud.reserve( m_vertexModeVertices.size() ); diff --git a/radiant/brush.h b/radiant/brush.h index d4fa70be..2f0d2661 100644 --- a/radiant/brush.h +++ b/radiant/brush.h @@ -1777,13 +1777,11 @@ void updateFiltered(){ // observer void planeChanged(){ -// globalOutputStream() << " planeChanged\n"; /* m_BRep_evaluation mutex prevents cyclic dependency: transformModifier.set ; transformChanged() ; planeChanged() ; pivotChanged() ; sceneChangeNotify() ; sceneRender() ; localAABB ; evaluateBRep ; buildBRep() ; evaluateTransform ; !!!problem starts here!!!! planeChanged() ; pivotChanged() ; sceneChangeNotify() ; sceneRender() ; localAABB ; evaluateBRep ; buildBRep() ; */ if( !m_BRep_evaluation ){ - globalOutputStream() << " planeChangedOK\n"; m_planeChanged = true; aabbChanged(); m_lightsChanged(); @@ -1802,7 +1800,6 @@ void evaluateBRep() const { } void transformChanged(){ - globalOutputStream() << " transformChanged()\n"; planeChanged(); m_transformChanged = true; } @@ -1810,7 +1807,6 @@ typedef MemberCaller TransformChangedCaller; void evaluateTransform(){ if ( m_transformChanged ) { - globalOutputStream() << " Brush::evaluateTransform()\n"; revertTransform(); m_evaluateTransform(); m_transformChanged = false; @@ -1867,14 +1863,12 @@ void snapto( float snap ){ // } } void revertTransform(){ - globalOutputStream() << " revertTransform \n"; for ( Faces::iterator i = m_faces.begin(); i != m_faces.end(); ++i ) { ( *i )->revertTransform(); } } void freezeTransform(){ - globalOutputStream() << " freezeTransform\n"; for ( Faces::iterator i = m_faces.begin(); i != m_faces.end(); ++i ) { ( *i )->freezeTransform(); @@ -1899,16 +1893,14 @@ VertexModeVertices m_vertexModeVertices; bool m_vertexModeOn{false}; void vertexModeInit(){ - globalOutputStream() << " vertexModeInit\n"; m_vertexModeOn = true; m_vertexModeVertices.clear(); undoSave(); } void vertexModeFree(){ - globalOutputStream() << " vMF\n"; m_vertexModeOn = false; -// m_vertexModeVertices.clear(); //keep, as it is required by buildBRep() after this call +// m_vertexModeVertices.clear(); //keep, as it may be required by buildBRep() after this call } void vertexModeTransform( const Matrix4& matrix ); @@ -3857,7 +3849,6 @@ void snapComponents( float snap ){ fi.snapComponents( snap ); } void evaluateTransform(){ - globalOutputStream() << " evaluateTransform\n"; if( m_transform.m_transformFrozen && m_transform.isIdentity() ) return; if( m_transform.m_transformFrozen && !m_transform.isIdentity() ){ /* new transform */ @@ -3880,7 +3871,6 @@ void evaluateTransform(){ } const Matrix4 matrix( m_transform.calculateTransform() ); - globalOutputStream() << matrix << " matrix\n"; if ( m_transform.getType() == TRANSFORM_PRIMITIVE ) { m_brush.transform( matrix ); @@ -3902,7 +3892,6 @@ void evaluateTransform(){ } void applyTransform(){ if( !m_transform.isIdentity() ){ - globalOutputStream() << " applyTransform\n"; if( m_transform.m_transformFrozen ){ //not yet unfrozen by evaluateTransform(), so evaluate // m_brush.revertTransform(); // evaluateTransform(); diff --git a/radiant/selection.cpp b/radiant/selection.cpp index 9a2f4890..00a51bbe 100644 --- a/radiant/selection.cpp +++ b/radiant/selection.cpp @@ -5530,7 +5530,6 @@ bool pre( const scene::Path& path, scene::Instance& instance ) const { }; void RadiantSelectionSystem::freezeTransforms(){ - globalOutputStream() << " RadiantSelectionSystem::freezeTransforms() \n"; GlobalSceneGraph().traverse( FreezeTransforms() ); }