New 'ConvertToDensity' class for use in the SurfaceExtractor.

library/PolyVoxCore/include/PolyVoxCore/Density.h

@@ -102,9 +102,23 @@ namespace PolyVox
 		static Density8::DensityType minDensity() { return std::numeric_limits<Density8::DensityType>::min(); }
 		static Density8::DensityType maxDensity() { return std::numeric_limits<Density8::DensityType>::max(); }
 	};
+}
 
+#include "PolyVoxCore/SurfaceExtractor.h" //VERY UGLY THAT WE NEED THIS!!! TO BE CONSIDERED...
+
+namespace PolyVox
+{
 	template<>
 	typename VoxelTypeTraits<Density8>::DensityType convertToDensity(Density8 voxel);
+
+	template<>
+	class ConvertToDensity<Density8>
+	{
+	public:
+		typedef uint8_t DensityType;
+
+		DensityType operator()(Density8 voxel);
+	};
 }
 
 #endif //__PolyVox_Density_H__

library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h

@@ -131,10 +131,40 @@ namespace PolyVox
 	typename VoxelTypeTraits<MaterialDensityPair88>::DensityType convertToDensity(MaterialDensityPair88 voxel);
 
 	template<>
-	typename VoxelTypeTraits<MaterialDensityPair44>::MaterialType convertToMaterial(MaterialDensityPair44 voxel);
+	class ConvertToDensity<MaterialDensityPair44>
+	{
+	public:
+		typedef uint32_t DensityType;
+
+		DensityType operator()(MaterialDensityPair44 voxel);
+	};
 
 	template<>
-	typename VoxelTypeTraits<MaterialDensityPair88>::MaterialType convertToMaterial(MaterialDensityPair88 voxel);
+	class ConvertToDensity<MaterialDensityPair88>
+	{
+	public:
+		typedef uint32_t DensityType;
+
+		DensityType operator()(MaterialDensityPair88 voxel);
+	};
+
+	template<>
+	class ConvertToMaterial<MaterialDensityPair44>
+	{
+	public:
+		typedef uint32_t MaterialType;
+
+		MaterialType operator()(MaterialDensityPair44 voxel);
+	};
+
+	template<>
+	class ConvertToMaterial<MaterialDensityPair88>
+	{
+	public:
+		typedef uint32_t MaterialType;
+
+		MaterialType operator()(MaterialDensityPair88 voxel);
+	};
 }
 
 #endif

library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.h

@@ -43,10 +43,26 @@ namespace PolyVox
 	};
 
 	template<typename VoxelType>
-	typename VoxelTypeTraits<VoxelType>::MaterialType convertToMaterial(VoxelType voxel)
+	class ConvertToDensity
 	{
-		return 1;
+	public:
-	}
+		typedef VoxelType DensityType;
+		DensityType operator()(VoxelType voxel)
+		{
+			return voxel;
+		}
+	};
+
+	template<typename VoxelType>
+	class ConvertToMaterial
+	{
+	public:
+		typedef float MaterialType;
+		MaterialType operator()(VoxelType voxel)
+		{
+			return 1;
+		}
+	};
 
 	template< typename VolumeType>
 	class SurfaceExtractor

library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.inl

@@ -206,6 +206,8 @@ namespace PolyVox
 		VolumeType::VoxelType v011;
 		VolumeType::VoxelType v111;
 
+		ConvertToDensity<VolumeType::VoxelType> DensityConverter;
+
 		if(isPrevZAvail)
 		{
 			if(isPrevYAvail)
@@ -230,7 +232,7 @@ namespace PolyVox
 
 					iCubeIndex = iPreviousCubeIndexX | iPreviousCubeIndexY | iPreviousCubeIndexZ;
 
-					if (convertToDensity(v111) < m_tThreshold) iCubeIndex |= 128;
+					if (DensityConverter(v111) < m_tThreshold) iCubeIndex |= 128;
 				}
 				else //previous X not available
 				{
@@ -397,6 +399,8 @@ namespace PolyVox
 		Array2DInt32& m_pCurrentVertexIndicesY,
 		Array2DInt32& m_pCurrentVertexIndicesZ)
 	{
+		ConvertToMaterial<VolumeType::VoxelType> converter;
+
 		int32_t iZVolSpace = m_regSliceCurrent.getLowerCorner().getZ();
 		const uint32_t uZRegSpace = iZVolSpace - m_regSizeInVoxels.getLowerCorner().getZ();
 
@@ -443,9 +447,9 @@ namespace PolyVox
 					//Choose one of the two materials to use for the vertex (we don't interpolate as interpolation of
 					//material IDs does not make sense). We take the largest, so that if we are working on a material-only
 					//volume we get the one which is non-zero. Both materials can be non-zero if our volume has a density component.
-					uint32_t uMaterial000 = convertToMaterial(v000);
+					ConvertToMaterial<VolumeType::VoxelType>::MaterialType uMaterial000 = converter(v000);
-					uint32_t uMaterial100 = convertToMaterial(v100);
+					ConvertToMaterial<VolumeType::VoxelType>::MaterialType uMaterial100 = converter(v100);
-					uint32_t uMaterial = (std::max)(uMaterial000, uMaterial100);
+					ConvertToMaterial<VolumeType::VoxelType>::MaterialType uMaterial = (std::max)(uMaterial000, uMaterial100);
 
 					PositionMaterialNormal surfaceVertex(v3dPosition, v3dNormal, static_cast<float>(uMaterial));
 					uint32_t uLastVertexIndex = m_meshCurrent->addVertex(surfaceVertex);
@@ -469,8 +473,8 @@ namespace PolyVox
 					//Choose one of the two materials to use for the vertex (we don't interpolate as interpolation of
 					//material IDs does not make sense). We take the largest, so that if we are working on a material-only
 					//volume we get the one which is non-zero. Both materials can be non-zero if our volume has a density component.
-					uint32_t uMaterial000 = convertToMaterial(v000);
+					ConvertToMaterial<VolumeType::VoxelType>::MaterialType uMaterial000 = converter(v000);
-					uint32_t uMaterial010 = convertToMaterial(v010);
+					ConvertToMaterial<VolumeType::VoxelType>::MaterialType uMaterial010 = converter(v010);
 					uint32_t uMaterial = (std::max)(uMaterial000, uMaterial010);
 
 					PositionMaterialNormal surfaceVertex(v3dPosition, v3dNormal, static_cast<float>(uMaterial));
@@ -495,8 +499,8 @@ namespace PolyVox
 					//Choose one of the two materials to use for the vertex (we don't interpolate as interpolation of
 					//material IDs does not make sense). We take the largest, so that if we are working on a material-only
 					//volume we get the one which is non-zero. Both materials can be non-zero if our volume has a density component.
-					uint32_t uMaterial000 = convertToMaterial(v000);
+					ConvertToMaterial<VolumeType::VoxelType>::MaterialType uMaterial000 = converter(v000);
-					uint32_t uMaterial001 = convertToMaterial(v001);
+					ConvertToMaterial<VolumeType::VoxelType>::MaterialType uMaterial001 = converter(v001);
 					uint32_t uMaterial = (std::max)(uMaterial000, uMaterial001);
 
 					PositionMaterialNormal surfaceVertex(v3dPosition, v3dNormal, static_cast<float>(uMaterial));

library/PolyVoxCore/source/Density.cpp

@@ -30,4 +30,10 @@ namespace PolyVox
 	{
 		return voxel.getDensity();
 	}
+
+	//template<>
+	ConvertToDensity<Density8>::DensityType ConvertToDensity<Density8>::operator()(Density8 voxel)
+	{
+		return voxel.getDensity();
+	}
 }

library/PolyVoxCore/source/MaterialDensityPair.cpp

@@ -37,14 +37,26 @@ namespace PolyVox
 		return voxel.getDensity();
 	}
 
-	template<>
+	//template<>
-	typename VoxelTypeTraits<MaterialDensityPair44>::MaterialType convertToMaterial(MaterialDensityPair44 voxel)
+	ConvertToDensity<MaterialDensityPair44>::DensityType ConvertToDensity<MaterialDensityPair44>::operator()(MaterialDensityPair44 voxel)
+	{
+		return voxel.getDensity();
+	}
+
+	//template<>
+	ConvertToDensity<MaterialDensityPair88>::DensityType ConvertToDensity<MaterialDensityPair88>::operator()(MaterialDensityPair88 voxel)
+	{
+		return voxel.getDensity();
+	}
+
+	//template<>
+	ConvertToMaterial<MaterialDensityPair44>::MaterialType ConvertToMaterial<MaterialDensityPair44>::operator()(MaterialDensityPair44 voxel)
 	{
 		return voxel.getMaterial();
 	}
 
-	template<>
+	//template<>
-	typename VoxelTypeTraits<MaterialDensityPair88>::MaterialType convertToMaterial(MaterialDensityPair88 voxel)
+	ConvertToMaterial<MaterialDensityPair88>::MaterialType ConvertToMaterial<MaterialDensityPair88>::operator()(MaterialDensityPair88 voxel)
 	{
 		return voxel.getMaterial();
 	}