Version 7.0

Pulled the .suo from the repo
Removed some warnings
This commit is contained in:
mkazhdan
2015-07-20 23:47:03 -04:00
parent 9bf6b043a4
commit a9b508b188
5 changed files with 3 additions and 4 deletions
+1
View File
@@ -1,4 +1,5 @@
*.sdf
*.suo
/Obj/
/Debug/
/Bin/
Binary file not shown.
+1 -1
View File
@@ -272,7 +272,7 @@ Real Octree< Real >::GetIsoValue( ConstPointer( Real ) solution , const std::vec
int mn = 2+o , mx = (1<<d)-2-o;
bool isInterior = ( off[0]>=mn && off[0]<mx && off[1]>=mn && off[1]<mx && off[2]>=mn && off[2]<mx );
value = getCenterValue( neighborKey , node , solution , GetPointer( metSolution ) , evaluator , vStencils[d].stencil , vStencils[d].stencils[c] , isInterior );
value = getCenterValue( neighborKey , node , ( ConstPointer( Real ) )solution , ( ConstPointer( Real ) )GetPointer( metSolution ) , evaluator , vStencils[d].stencil , vStencils[d].stencils[c] , isInterior );
}
centerValues[i] = value;
Real w = centerWeights[ node->nodeData.nodeIndex ];
-2
View File
@@ -2751,7 +2751,6 @@ template< class V >
V Octree< Real >::getCornerValue( const typename TreeOctNode::ConstNeighborKey3& neighborKey , const TreeOctNode* node , int corner , ConstPointer( V ) solution , ConstPointer( V ) metSolution , const typename BSplineData< 2 >::template CornerEvaluator< 2 >& evaluator , const Stencil< double , 3 >& stencil , const Stencil< double , 3 > stencils[8] , bool isInterior ) const
{
V value(0);
#pragma message ( "[WARNING] Why is this here?" )
if( _boundaryType==-1 ) value = -0.5;
int d , off[3];
node->depthAndOffset( d , off );
@@ -3143,7 +3142,6 @@ Pointer( V ) Octree< Real >::Evaluate( ConstPointer( V ) coefficients , int& res
vTables.valueTable[ idx[2] + z*vTables.functionCount ];
}
}
#pragma message ( "[WARNING] Why is this here?" )
if( _boundaryType==-1 ) for( int i=0 ; i<res*res*res ; i++ ) values[i] -= Real(0.5);
for( int i=0 ; i<res*res*res ; i++ ) values[i] -= isoValue;
+1 -1
View File
@@ -428,7 +428,7 @@ int Execute( int argc , char* argv[] )
else
{
int res;
Pointer( Real ) values = tree.Evaluate( solution , res , isoValue , VoxelDepth.value );
Pointer( Real ) values = tree.Evaluate( ( ConstPointer( Real ) )solution , res , isoValue , VoxelDepth.value );
fwrite( &res , sizeof(int) , 1 , fp );
if( sizeof(Real)==sizeof(float) ) fwrite( values , sizeof(float) , res*res*res , fp );
else