remove debug prints
This commit is contained in:
parent
435c41b73b
commit
3f3230ed2a
|
|
@ -106,7 +106,6 @@ inline bool Brush_isBounded( const Brush& brush ){
|
||||||
}
|
}
|
||||||
|
|
||||||
void Brush::buildBRep(){
|
void Brush::buildBRep(){
|
||||||
globalOutputStream() << " buildBRep() \n";
|
|
||||||
const bool _vertexModeOn = m_vertexModeOn;
|
const bool _vertexModeOn = m_vertexModeOn;
|
||||||
|
|
||||||
bool degenerate = buildWindings();
|
bool degenerate = buildWindings();
|
||||||
|
|
@ -122,7 +121,6 @@ void Brush::buildBRep(){
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( degenerate || faces_size < 4 || faceVerticesCount != ( faceVerticesCount >> 1 ) << 1 ) { // sum of vertices for each face of a valid polyhedron is always even
|
if ( degenerate || faces_size < 4 || faceVerticesCount != ( faceVerticesCount >> 1 ) << 1 ) { // sum of vertices for each face of a valid polyhedron is always even
|
||||||
globalOutputStream() << degenerate << " degenerate\n";
|
|
||||||
m_uniqueVertexPoints.resize( 0 );
|
m_uniqueVertexPoints.resize( 0 );
|
||||||
|
|
||||||
vertex_clear();
|
vertex_clear();
|
||||||
|
|
@ -309,8 +307,7 @@ void Brush::buildBRep(){
|
||||||
m_faceCentroidPoints[i] = pointvertex_for_windingpoint( m_faces[i]->centroid(), colour_vertex );
|
m_faceCentroidPoints[i] = pointvertex_for_windingpoint( m_faces[i]->centroid(), colour_vertex );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
globalOutputStream() << _vertexModeOn << " _vertexModeOn\n";
|
|
||||||
globalOutputStream() << m_vertexModeOn << " m_vertexModeOn\n";
|
|
||||||
// :faceleg: start move end
|
// :faceleg: start move end
|
||||||
// m_vertexModeOn 1 1 0
|
// m_vertexModeOn 1 1 0
|
||||||
// _vertexModeOn 0 1 1
|
// _vertexModeOn 0 1 1
|
||||||
|
|
@ -466,8 +463,6 @@ const Face* vertex_mode_find_common_face( const Brush::VertexModeVertex& v1, con
|
||||||
|
|
||||||
#include "quickhull/QuickHull.hpp"
|
#include "quickhull/QuickHull.hpp"
|
||||||
void Brush::vertexModeTransform( const Matrix4& matrix ){
|
void Brush::vertexModeTransform( const Matrix4& matrix ){
|
||||||
globalOutputStream() << " vertexModeTransform\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() );
|
||||||
|
|
@ -537,6 +532,5 @@ void Brush::vertexModeTransform( const Matrix4& matrix ){
|
||||||
addFace( face );
|
addFace( face );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
globalOutputStream() << m_faces.size() << " m_faces.size()\n";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1802,7 +1802,6 @@ void transformChanged(){
|
||||||
//m_transformChanged = true;
|
//m_transformChanged = true;
|
||||||
planeChanged();
|
planeChanged();
|
||||||
m_transformChanged = true; //experimental fix of cyclic dependency
|
m_transformChanged = true; //experimental fix of cyclic dependency
|
||||||
globalOutputStream() << m_planeChanged << " m_planeChanged\n";
|
|
||||||
}
|
}
|
||||||
typedef MemberCaller<Brush, &Brush::transformChanged> TransformChangedCaller;
|
typedef MemberCaller<Brush, &Brush::transformChanged> TransformChangedCaller;
|
||||||
|
|
||||||
|
|
@ -1861,14 +1860,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();
|
||||||
|
|
@ -1892,14 +1889,12 @@ 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() << " vertexModeFree(){\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 is required by buildBRep() after this call
|
||||||
}
|
}
|
||||||
|
|
@ -3779,7 +3774,6 @@ void snapComponents( float snap ){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void evaluateTransform(){
|
void evaluateTransform(){
|
||||||
globalOutputStream() << " evaluateTransform\n";
|
|
||||||
if( m_transform.m_transformFrozen )
|
if( m_transform.m_transformFrozen )
|
||||||
m_brush.vertexModeFree();
|
m_brush.vertexModeFree();
|
||||||
if( m_transform.m_transformFrozen && !m_transform.isIdentity() ){ /* new transform */
|
if( m_transform.m_transformFrozen && !m_transform.isIdentity() ){ /* new transform */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user