Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git

library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h

@@ -44,7 +44,7 @@ namespace PolyVox
 	extern const POLYVOX_API Vector3DInt32 arrayPathfinderCorners[8];
 
 	/// This function provides the default method for checking whether a given voxel
-	/// is vaid for the path computed by the AStarPathfinder.
+	/// is valid for the path computed by the AStarPathfinder.
 	template< template<typename> class VolumeType, typename VoxelType>
 	bool aStarDefaultVoxelValidator(const VolumeType<VoxelType>* volData, const Vector3DInt32& v3dPos);
 
@@ -72,7 +72,7 @@ namespace PolyVox
 			float fHBias = 1.0,
 			uint32_t uMaxNoOfNodes = 10000,
 			Connectivity connectivity = TwentySixConnected,
-			polyvox_function<bool (const VolumeType<VoxelType>*, const Vector3DInt32&)> funcIsVoxelValidForPath = &aStarDefaultVoxelValidator<VolumeType, VoxelType>,
+			polyvox_function<bool (const VolumeType<VoxelType>*, const Vector3DInt32&)> funcIsVoxelValidForPath = &aStarDefaultVoxelValidator,
 			polyvox_function<void (float)> funcProgressCallback = 0
 		)
 			:volume(volData)

library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl

@@ -326,4 +326,4 @@ namespace PolyVox
 		hVal += fHash;
 		return hVal;
 	}
-}
+}

library/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl

@@ -131,4 +131,4 @@ namespace PolyVox
 			}
 		}
 	}
-}
+}

library/PolyVoxCore/include/PolyVoxCore/ArraySizes.h

@@ -74,4 +74,4 @@ namespace PolyVox
 	};
 }//namespace PolyVox
 
-#endif //__PolyVox_ArraySizes_H__
+#endif //__PolyVox_ArraySizes_H__

library/PolyVoxCore/include/PolyVoxCore/ConstVolumeProxy.h

@@ -76,4 +76,4 @@ namespace PolyVox
 	};
 }
 
-#endif //__PolyVox_ConstVolumeProxy_H__
+#endif //__PolyVox_ConstVolumeProxy_H__

library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl

@@ -344,4 +344,4 @@ namespace PolyVox
 		//Quads cannot be merged.
 		return false;
 	}
-}
+}

library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractorWithNormals.inl

@@ -139,4 +139,4 @@ namespace PolyVox
 		lodRecord.endIndex = m_meshCurrent->getNoOfIndices();
 		m_meshCurrent->m_vecLodRecords.push_back(lodRecord);
 	}
-}
+}

library/PolyVoxCore/include/PolyVoxCore/LargeVolumeSampler.inl

@@ -512,4 +512,4 @@ namespace PolyVox
 }
 
 #undef BORDER_LOW
-#undef BORDER_HIGH
+#undef BORDER_HIGH

library/PolyVoxCore/include/PolyVoxCore/Log.h

@@ -60,4 +60,4 @@ namespace PolyVox
 #define POLYVOX_LOG_WARN(message) if(logHandler){logHandler(message, LS_WARN);}
 #define POLYVOX_LOG_ERROR(message) if(logHandler){logHandler(message, LS_ERROR);}
 
-#endif
+#endif

library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h

@@ -124,4 +124,4 @@ namespace PolyVox
 	typename VoxelTypeTraits<MaterialDensityPair88>::MaterialType convertToMaterial(MaterialDensityPair88 voxel);
 }
 
-#endif
+#endif

library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl

@@ -419,4 +419,4 @@ namespace PolyVox
 #undef BORDER_LOWY
 #undef BORDER_HIGHY
 #undef BORDER_LOWZ
-#undef BORDER_HIGHZ
+#undef BORDER_HIGHZ

library/PolyVoxCore/include/PolyVoxCore/Raycast.h

@@ -122,4 +122,4 @@ namespace PolyVox
 
 #include "PolyVoxCore/Raycast.inl"
 
-#endif //__PolyVox_Raycast_H__
+#endif //__PolyVox_Raycast_H__

library/PolyVoxCore/include/PolyVoxCore/Raycast.inl

@@ -179,4 +179,4 @@ namespace PolyVox
 		m_result.intersectionVoxel = Vector3DInt32(0,0,0);
 		m_result.previousVoxel = Vector3DInt32(0,0,0);
 	}
-}
+}

library/PolyVoxCore/include/PolyVoxCore/SurfaceMesh.inl

@@ -485,4 +485,4 @@ namespace PolyVox
 			m_vecVertices[ct].setPosition(position);
 		}
 	}
-}
+}

library/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h

@@ -32,4 +32,4 @@ namespace PolyVox
 	float computeSmoothedVoxel(typename VolumeType<uint8_t>::Sampler& volIter);
 }
 
-#endif
+#endif

library/PolyVoxCore/include/PolyVoxImpl/AStarPathfinderImpl.h

@@ -221,4 +221,4 @@ namespace PolyVox
 	//bool operator<(const AllNodesContainer::iterator& lhs, const  AllNodesContainer::iterator& rhs);
 }
 
-#endif //__PolyVox_AStarPathfinderImpl_H__
+#endif //__PolyVox_AStarPathfinderImpl_H__

library/PolyVoxCore/include/PolyVoxImpl/ArraySizesImpl.inl

@@ -43,4 +43,4 @@ namespace PolyVox
 		std::copy(&pSizes[0],&pSizes[N-1],m_pSizes);
 		m_pSizes[N-1]=uSize;
 	}
-}//namespace PolyVox
+}//namespace PolyVox

library/PolyVoxCore/include/PolyVoxImpl/MarchingCubesTables.h

@@ -28,8 +28,8 @@ freely, subject to the following restrictions:
 
 namespace PolyVox
 {
-	extern POLYVOX_API int edgeTable[256];
-	extern POLYVOX_API int triTable[256][16];
+	extern const POLYVOX_API int edgeTable[256];
+	extern const POLYVOX_API int triTable[256][16];
 }
 
 #endif

library/PolyVoxCore/include/PolyVoxImpl/SubArray.h

@@ -85,4 +85,4 @@ namespace PolyVox
 
 #include "PolyVoxImpl/SubArray.inl"
 
-#endif //__PolyVox_SubArray_H__
+#endif //__PolyVox_SubArray_H__

library/PolyVoxCore/include/PolyVoxImpl/TypeDef.h

@@ -76,6 +76,9 @@ freely, subject to the following restrictions:
 	#define polyvox_bind boost::bind
 	#define polyvox_placeholder_1 _1
 	#define polyvox_placeholder_2 _2
+	
+	#include <boost/static_assert.hpp>
+	#define static_assert BOOST_STATIC_ASSERT
 
 
 	//As long as we're requiring boost, we'll use it to compensate
@@ -98,6 +101,7 @@ freely, subject to the following restrictions:
 	#define polyvox_placeholder_1 std::placeholders::_1
 	#define polyvox_placeholder_2 std::placeholders::_2
 	#define polyvox_hash std::hash
+	//#define static_assert static_assert //we can use this
 #endif
 
 #endif