remove debug prints
This commit is contained in:
parent
9eff327c70
commit
bcbbde0b35
|
|
@ -106,8 +106,6 @@ inline bool Brush_isBounded( const Brush& brush ){
|
||||||
}
|
}
|
||||||
|
|
||||||
void Brush::buildBRep(){
|
void Brush::buildBRep(){
|
||||||
globalOutputStream() << " buildBRep start\n";
|
|
||||||
|
|
||||||
m_BRep_evaluation = true;
|
m_BRep_evaluation = true;
|
||||||
|
|
||||||
bool degenerate = buildWindings();
|
bool degenerate = buildWindings();
|
||||||
|
|
@ -316,10 +314,8 @@ void Brush::buildBRep(){
|
||||||
for ( Observers::iterator o = m_observers.begin(); o != m_observers.end(); ++o )
|
for ( Observers::iterator o = m_observers.begin(); o != m_observers.end(); ++o )
|
||||||
( *o )->vertex_select( i.m_vertexTransformed );
|
( *o )->vertex_select( i.m_vertexTransformed );
|
||||||
}
|
}
|
||||||
globalOutputStream() << m_vertexModeOn << " m_vertexModeOn\n";
|
|
||||||
}
|
}
|
||||||
m_BRep_evaluation = false;
|
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"
|
#include "quickhull/QuickHull.hpp"
|
||||||
void Brush::vertexModeBuildHull( bool allTransformed /*= false*/ ){
|
void Brush::vertexModeBuildHull( bool allTransformed /*= false*/ ){
|
||||||
globalOutputStream() << " vertexModeBuildHull\n";
|
|
||||||
quickhull::QuickHull<double> quickhull;
|
quickhull::QuickHull<double> quickhull;
|
||||||
std::vector<quickhull::Vector3<double>> pointCloud;
|
std::vector<quickhull::Vector3<double>> pointCloud;
|
||||||
pointCloud.reserve( m_vertexModeVertices.size() );
|
pointCloud.reserve( m_vertexModeVertices.size() );
|
||||||
|
|
|
||||||
|
|
@ -1777,13 +1777,11 @@ void updateFiltered(){
|
||||||
|
|
||||||
// observer
|
// observer
|
||||||
void planeChanged(){
|
void planeChanged(){
|
||||||
// globalOutputStream() << " planeChanged\n";
|
|
||||||
/* m_BRep_evaluation mutex prevents cyclic dependency:
|
/* m_BRep_evaluation mutex prevents cyclic dependency:
|
||||||
transformModifier.set ; transformChanged() ; planeChanged() ; pivotChanged() ; sceneChangeNotify() ;
|
transformModifier.set ; transformChanged() ; planeChanged() ; pivotChanged() ; sceneChangeNotify() ;
|
||||||
sceneRender() ; localAABB ; evaluateBRep ; buildBRep() ; evaluateTransform ; !!!problem starts here!!!! planeChanged() ; pivotChanged() ; sceneChangeNotify() ;
|
sceneRender() ; localAABB ; evaluateBRep ; buildBRep() ; evaluateTransform ; !!!problem starts here!!!! planeChanged() ; pivotChanged() ; sceneChangeNotify() ;
|
||||||
sceneRender() ; localAABB ; evaluateBRep ; buildBRep() ; */
|
sceneRender() ; localAABB ; evaluateBRep ; buildBRep() ; */
|
||||||
if( !m_BRep_evaluation ){
|
if( !m_BRep_evaluation ){
|
||||||
globalOutputStream() << " planeChangedOK\n";
|
|
||||||
m_planeChanged = true;
|
m_planeChanged = true;
|
||||||
aabbChanged();
|
aabbChanged();
|
||||||
m_lightsChanged();
|
m_lightsChanged();
|
||||||
|
|
@ -1802,7 +1800,6 @@ void evaluateBRep() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
void transformChanged(){
|
void transformChanged(){
|
||||||
globalOutputStream() << " transformChanged()\n";
|
|
||||||
planeChanged();
|
planeChanged();
|
||||||
m_transformChanged = true;
|
m_transformChanged = true;
|
||||||
}
|
}
|
||||||
|
|
@ -1810,7 +1807,6 @@ typedef MemberCaller<Brush, &Brush::transformChanged> TransformChangedCaller;
|
||||||
|
|
||||||
void evaluateTransform(){
|
void evaluateTransform(){
|
||||||
if ( m_transformChanged ) {
|
if ( m_transformChanged ) {
|
||||||
globalOutputStream() << " Brush::evaluateTransform()\n";
|
|
||||||
revertTransform();
|
revertTransform();
|
||||||
m_evaluateTransform();
|
m_evaluateTransform();
|
||||||
m_transformChanged = false;
|
m_transformChanged = false;
|
||||||
|
|
@ -1867,14 +1863,12 @@ void snapto( float snap ){
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
void revertTransform(){
|
void revertTransform(){
|
||||||
globalOutputStream() << " revertTransform \n";
|
|
||||||
for ( Faces::iterator i = m_faces.begin(); i != m_faces.end(); ++i )
|
for ( Faces::iterator i = m_faces.begin(); i != m_faces.end(); ++i )
|
||||||
{
|
{
|
||||||
( *i )->revertTransform();
|
( *i )->revertTransform();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void freezeTransform(){
|
void freezeTransform(){
|
||||||
globalOutputStream() << " freezeTransform\n";
|
|
||||||
for ( Faces::iterator i = m_faces.begin(); i != m_faces.end(); ++i )
|
for ( Faces::iterator i = m_faces.begin(); i != m_faces.end(); ++i )
|
||||||
{
|
{
|
||||||
( *i )->freezeTransform();
|
( *i )->freezeTransform();
|
||||||
|
|
@ -1899,16 +1893,14 @@ VertexModeVertices m_vertexModeVertices;
|
||||||
bool m_vertexModeOn{false};
|
bool m_vertexModeOn{false};
|
||||||
|
|
||||||
void vertexModeInit(){
|
void vertexModeInit(){
|
||||||
globalOutputStream() << " vertexModeInit\n";
|
|
||||||
m_vertexModeOn = true;
|
m_vertexModeOn = true;
|
||||||
m_vertexModeVertices.clear();
|
m_vertexModeVertices.clear();
|
||||||
undoSave();
|
undoSave();
|
||||||
}
|
}
|
||||||
|
|
||||||
void vertexModeFree(){
|
void vertexModeFree(){
|
||||||
globalOutputStream() << " vMF\n";
|
|
||||||
m_vertexModeOn = false;
|
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 );
|
void vertexModeTransform( const Matrix4& matrix );
|
||||||
|
|
@ -3857,7 +3849,6 @@ void snapComponents( float snap ){
|
||||||
fi.snapComponents( snap );
|
fi.snapComponents( snap );
|
||||||
}
|
}
|
||||||
void evaluateTransform(){
|
void evaluateTransform(){
|
||||||
globalOutputStream() << " evaluateTransform\n";
|
|
||||||
if( m_transform.m_transformFrozen && m_transform.isIdentity() )
|
if( m_transform.m_transformFrozen && m_transform.isIdentity() )
|
||||||
return;
|
return;
|
||||||
if( m_transform.m_transformFrozen && !m_transform.isIdentity() ){ /* new transform */
|
if( m_transform.m_transformFrozen && !m_transform.isIdentity() ){ /* new transform */
|
||||||
|
|
@ -3880,7 +3871,6 @@ void evaluateTransform(){
|
||||||
}
|
}
|
||||||
|
|
||||||
const Matrix4 matrix( m_transform.calculateTransform() );
|
const Matrix4 matrix( m_transform.calculateTransform() );
|
||||||
globalOutputStream() << matrix << " matrix\n";
|
|
||||||
|
|
||||||
if ( m_transform.getType() == TRANSFORM_PRIMITIVE ) {
|
if ( m_transform.getType() == TRANSFORM_PRIMITIVE ) {
|
||||||
m_brush.transform( matrix );
|
m_brush.transform( matrix );
|
||||||
|
|
@ -3902,7 +3892,6 @@ void evaluateTransform(){
|
||||||
}
|
}
|
||||||
void applyTransform(){
|
void applyTransform(){
|
||||||
if( !m_transform.isIdentity() ){
|
if( !m_transform.isIdentity() ){
|
||||||
globalOutputStream() << " applyTransform\n";
|
|
||||||
if( m_transform.m_transformFrozen ){ //not yet unfrozen by evaluateTransform(), so evaluate
|
if( m_transform.m_transformFrozen ){ //not yet unfrozen by evaluateTransform(), so evaluate
|
||||||
// m_brush.revertTransform();
|
// m_brush.revertTransform();
|
||||||
// evaluateTransform();
|
// evaluateTransform();
|
||||||
|
|
|
||||||
|
|
@ -5530,7 +5530,6 @@ bool pre( const scene::Path& path, scene::Instance& instance ) const {
|
||||||
};
|
};
|
||||||
|
|
||||||
void RadiantSelectionSystem::freezeTransforms(){
|
void RadiantSelectionSystem::freezeTransforms(){
|
||||||
globalOutputStream() << " RadiantSelectionSystem::freezeTransforms() \n";
|
|
||||||
GlobalSceneGraph().traverse( FreezeTransforms() );
|
GlobalSceneGraph().traverse( FreezeTransforms() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user