Commit aede468f authored by Jan Möbius's avatar Jan Möbius

Tried to fix mac build error

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free-Staging@16312 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 9e95fcc7
......@@ -382,10 +382,10 @@ public:
int refineBoundary( int subdivisionDepth );
Pointer( Real ) GetSolutionGrid( int& res , Real isoValue=0.f , int depth=-1 );
int setTree( char* fileName , int maxDepth , int minDepth , int kernelDepth , Real samplesPerNode ,
Real scaleFactor , int useConfidence , Real constraintWeight , int adaptiveExponent , XForm4x4< Real > xForm=XForm4x4< Real >::Identity );
Real scaleFactor , int useConfidence , Real constraintWeight , int adaptiveExponent , XForm4x4< Real > xForm=XForm4x4< Real >::Identity() );
int setTreeMemory( std::vector< Real >& _pts_stream, int maxDepth , int minDepth ,
int splatDepth , Real samplesPerNode , Real scaleFactor ,
int useConfidence , Real constraintWeight , int adaptiveExponent , XForm4x4< Real > xForm=XForm4x4< Real >::Identity );
int useConfidence , Real constraintWeight , int adaptiveExponent , XForm4x4< Real > xForm=XForm4x4< Real >::Identity() );
void SetLaplacianConstraints(void);
void ClipTree(void);
int LaplacianMatrixIteration( int subdivideDepth , bool showResidual , int minIters , double accuracy , int maxSolveDepth , int fixedIters );
......
......@@ -94,7 +94,9 @@ void SortedTreeNodes::setCornerTable( CornerTableData& cData , const TreeOctNode
std::vector< std::pair< int , int > > spans( this->maxDepth , std::pair< int , int >( -1 , -1 ) );
int minDepth , off[3];
cData.offsets.resize( this->maxDepth , -1 );
int start , end;
int start = 0;
int end = 0;
if( rootNode ) rootNode->depthAndOffset( minDepth , off ) , start = end = rootNode->nodeData.nodeIndex;
else
{
......@@ -337,7 +339,12 @@ void SortedTreeNodes::setEdgeTable( EdgeTableData& eData , const TreeOctNode* ro
int ac = Square::AntipodalCornerIndex( Square::CornerIndex( i , j ) );
for( unsigned int cc=0 ; cc<Square::CORNERS ; cc++ )
{
int ii , jj , x , y , z;
int ii = 0;
int jj = 0;
int x = 0;
int y = 0;
int z = 0;
Square::FactorCornerIndex( cc , ii , jj );
ii += i , jj += j;
switch( o )
......
......@@ -78,7 +78,11 @@ run( std::vector< Real >& _pt_data, MeshT& _mesh, const Parameter& _parameter )
Real isoValue = 0;
Octree<2> tree;
#ifdef USE_OMP
tree.threads = omp_get_num_procs();
#else
tree.threads = 1;
#endif
TreeOctNode::SetAllocator( MEMORY_ALLOCATOR_BLOCK_SIZE );
tree.setBSplineData( m_parameter.Depth );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment