Version 8.0

Modified the code to support use of different order B-splines

Author: mkazhdan

PoissonRecon.vcxproj

@@ -214,8 +214,11 @@
     <None Include="Src\Array.inl" />
     <None Include="Src\CmdLineParser.inl" />
     <None Include="Src\MAT.inl" />
+    <None Include="Src\MultiGridOctreeData.Evaluation.inl" />
     <None Include="Src\MultiGridOctreeData.IsoSurface.inl" />
     <None Include="Src\MultiGridOctreeData.SortedTreeNodes.inl" />
+    <None Include="Src\MultiGridOctreeData.System.inl" />
+    <None Include="Src\MultiGridOctreeData.WeightedSamples.inl" />
     <None Include="Src\PointStream.inl" />
     <None Include="Src\BSplineData.inl" />
     <None Include="Src\Geometry.inl" />

PoissonRecon.vcxproj.filters

@@ -139,5 +139,14 @@
     <None Include="Src\MultiGridOctreeData.IsoSurface.inl">
       <Filter>Include Files</Filter>
     </None>
+    <None Include="Src\MultiGridOctreeData.Evaluation.inl">
+      <Filter>Include Files</Filter>
+    </None>
+    <None Include="Src\MultiGridOctreeData.WeightedSamples.inl">
+      <Filter>Include Files</Filter>
+    </None>
+    <None Include="Src\MultiGridOctreeData.System.inl">
+      <Filter>Include Files</Filter>
+    </None>
   </ItemGroup>
 </Project>

Src/Array.h

@@ -68,12 +68,10 @@ template< class C > void AlignedFreePointer( Array< C >& a ){ a.Free( ); }
 template< class C > void       VFreePointer( Array< C >& a ){ a.Free( ); }
 template< class C > void      DeletePointer( Array< C >& a ){ a.Delete( ); }
 
-template< class C > Array< C >          NewPointer(                  size_t size ,                 const char* name=NULL ){ return Array< C >::New         (     size ,                     name ); }
-template< class C > Array< C >        AllocPointer(                  size_t size ,                 const char* name=NULL ){ return Array< C >::Alloc       (     size ,             false , name ); }
+template< class C > Array< C >          NewPointer(                  size_t size ,                    const char* name=NULL ){ return Array< C >::New         (     size ,                     name ); }
+template< class C > Array< C >        AllocPointer(                  size_t size ,                    const char* name=NULL ){ return Array< C >::Alloc       (     size ,             false , name ); }
 template< class C > Array< C > AlignedAllocPointer(                  size_t size , size_t alignment , const char* name=NULL ){ return Array< C >::AlignedAlloc(     size , alignment , false , name ); }
-template< class C > Array< C >      ReAllocPointer( Array< C >&  a , size_t size ,                 const char* name=NULL ){ return Array< C >::ReAlloc     ( a , size ,             false , name ); }
-
-//template< class C > Array< C > NullPointer( void ){ return Array< C >( ); }
+template< class C > Array< C >      ReAllocPointer( Array< C >&  a , size_t size ,                    const char* name=NULL ){ return Array< C >::ReAlloc     ( a , size ,             false , name ); }
 
 template< class C >       C* PointerAddress(      Array< C >& a ) { return a.pointer(); }
 template< class C > const C* PointerAddress( ConstArray< C >& a ) { return a.pointer(); }

Src/Array.inl

@@ -188,7 +188,7 @@ public:
 			// [WARNING] Chaning szC and szD to size_t causes some really strange behavior.
 			long long szC = sizeof( C );
 			long long szD = sizeof( D );
-			data = (C*)&a[0];
+			data = (C*)a.data;
 			min = ( a.minimum() * szD ) / szC;
 			max = ( a.maximum() * szD ) / szC;
 			if( min*szC!=a.minimum()*szD || max*szC!=a.maximum()*szD )
@@ -306,6 +306,7 @@ public:
 		return (*this);
 	}
 	inline Array& operator ++ ( void  ) { return (*this) += 1; }
+	inline Array operator++( int ){ Array< C > temp = (*this) ; (*this) +=1 ; return temp; }
 	Array  operator -  ( int idx ) const { return (*this) +  (-idx); }
 	Array  operator -  ( long long idx ) const { return (*this) +  (-idx); }
 	Array  operator -  ( unsigned int idx ) const { return (*this) +  (-idx); }
@@ -315,6 +316,7 @@ public:
 	Array& operator -= ( unsigned int idx )    { return (*this) += (-idx); }
 	Array& operator -= ( unsigned long long idx )    { return (*this) += (-idx); }
 	Array& operator -- ( void ) { return (*this) -= 1; }
+	inline Array operator--( int ){ Array< C > temp = (*this) ; (*this) -=1 ; return temp; }
 	long long operator - ( const Array& a ) const { return ( long long )( data - a.data ); }
 
 	void Free( void )
@@ -501,6 +503,7 @@ public:
 		return (*this);
 	}
 	inline ConstArray& operator ++ ( void ) { return (*this) += 1; }
+	inline ConstArray operator++( int ){ ConstArray< C > temp = (*this) ; (*this) +=1 ; return temp; }
 	ConstArray  operator -  ( int idx ) const { return (*this) +  (-idx); }
 	ConstArray  operator -  ( long long idx ) const { return (*this) +  (-idx); }
 	ConstArray  operator -  ( unsigned int idx ) const { return (*this) +  (-idx); }
@@ -510,6 +513,7 @@ public:
 	ConstArray& operator -= ( unsigned int idx )    { return (*this) += (-idx); }
 	ConstArray& operator -= ( unsigned long long idx )    { return (*this) += (-idx); }
 	ConstArray& operator -- ( void ) { return (*this) -= 1; }
+	inline ConstArray operator--( int ){ ConstArray< C > temp = (*this) ; (*this) -=1 ; return temp; }
 	long long operator - ( const ConstArray& a ) const { return ( long long )( data - a.data ); }
 	long long operator - ( const Array< C >& a ) const { return ( long long )( data - a.pointer() ); }