Added surface extractor tests templatised on voxel type.

library/PolyVoxCore/include/PolyVoxCore/SurfaceExtractor.h

@@ -32,19 +32,6 @@ freely, subject to the following restrictions:
 
 namespace PolyVox
 {
-	template<>
-	class VoxelTypeTraits< uint8_t >	
-	{
-	public:
-		typedef uint8_t DensityType;
-		static const bool HasDensity = true;
-		static const bool HasMaterial = false;
-		static bool hasDensity() { return true; }
-		static bool hasMaterial() { return false; }
-		static uint8_t minDensity() { return 0; }
-		static uint8_t maxDensity() { return 255; }
-	};
-
 	template< template<typename> class VolumeType, typename VoxelType>
 	class SurfaceExtractor
 	{

library/PolyVoxCore/include/PolyVoxCore/Voxel.h

@@ -88,6 +88,19 @@ namespace PolyVox
 	{
 		return voxel;
 	}
+
+	template<>
+	class VoxelTypeTraits< uint8_t >	
+	{
+	public:
+		typedef uint8_t DensityType;
+		static const bool HasDensity = true;
+		static const bool HasMaterial = false;
+		static bool hasDensity() { return true; }
+		static bool hasMaterial() { return false; }
+		static uint8_t minDensity() { return 0; }
+		static uint8_t maxDensity() { return 255; }
+	};
 }
 
 #endif //__PolyVox_Voxel_H__

tests/CMakeLists.txt

@@ -63,6 +63,9 @@ ADD_TEST(MaterialTestCompile ${LATEST_TEST} testCompile)
 CREATE_TEST(TestRegion.h TestRegion.cpp TestRegion)
 ADD_TEST(RegionEqualityTest ${LATEST_TEST} testEquality)
 
+CREATE_TEST(TestSurfaceExtractor.h TestSurfaceExtractor.cpp TestSurfaceExtractor)
+ADD_TEST(SurfaceExtractorExecuteTest ${LATEST_TEST} testExecute)
+
 #Vector tests
 CREATE_TEST(testvector.h testvector.cpp testvector)
 ADD_TEST(VectorLengthTest ${LATEST_TEST} testLength)

tests/TestSurfaceExtractor.cpp

@@ -0,0 +1,132 @@
+/*******************************************************************************
+Copyright (c) 2010 Matt Williams
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source
+    distribution.
+*******************************************************************************/
+
+#include "TestSurfaceExtractor.h"
+
+#include "PolyVoxCore/Density.h"
+#include "PolyVoxCore/MaterialDensityPair.h"
+#include "PolyVoxCore/SimpleVolume.h"
+#include "PolyVoxCore/SurfaceExtractor.h"
+
+#include <QtTest>
+
+using namespace PolyVox;
+
+
+// These 'writeDensityValueToVoxel' functions provide a unified interface for writting densities to primative and class voxel types.
+// They are conceptually the inverse of the 'convertToDensity' function used by the SurfaceExtractor. They probably shouldn't be part
+// of PolyVox, but they might be usful to other tests so we cold move them into a 'Tests.h' or something in tthe future.
+template<typename VoxelType>
+void writeDensityValueToVoxel(typename VoxelTypeTraits<VoxelType>::DensityType valueToWrite, VoxelType& voxel)
+{
+	voxel = valueToWrite;
+}
+
+template<>
+void writeDensityValueToVoxel(typename VoxelTypeTraits<Density8>::DensityType valueToWrite, Density8& voxel)
+{
+	voxel.setDensity(valueToWrite);
+}
+
+template<>
+void writeDensityValueToVoxel(typename VoxelTypeTraits<MaterialDensityPair88>::DensityType valueToWrite, MaterialDensityPair88& voxel)
+{
+	voxel.setDensity(valueToWrite);
+}
+
+// Runs the surface extractor for a given type. 
+template <typename VoxelType>
+void testForType(SurfaceMesh<PositionMaterialNormal>& result)
+{
+	const int32_t uVolumeSideLength = 32;
+
+	//Create empty volume
+	SimpleVolume<VoxelType> volData(Region(Vector3DInt32(0,0,0), Vector3DInt32(uVolumeSideLength-1, uVolumeSideLength-1, uVolumeSideLength-1)));
+
+	for (int32_t z = 0; z < uVolumeSideLength; z++)
+	{
+		for (int32_t y = 0; y < uVolumeSideLength; y++)
+		{
+			for (int32_t x = 0; x < uVolumeSideLength; x++)
+			{
+				//Create a density field which changes throughout the volume.
+				VoxelType voxelValue;
+				writeDensityValueToVoxel<VoxelType>(x + y + z, voxelValue);
+				volData.setVoxelAt(x, y, z, voxelValue);
+			}
+		}
+	}
+
+	SurfaceExtractor<SimpleVolume, VoxelType > extractor(&volData, volData.getEnclosingRegion(), &result, 50);
+	extractor.execute();
+}
+
+void TestSurfaceExtractor::testExecute()
+{
+	const static uint32_t uExpectedVertices = 4731;
+	const static uint32_t uExpectedIndices = 12810;
+
+	SurfaceMesh<PositionMaterialNormal> mesh;
+
+	testForType<int8_t>(mesh);
+	QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices);
+	QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices);
+
+	testForType<uint8_t>(mesh);
+	QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices);
+	QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices);
+
+	testForType<int16_t>(mesh);
+	QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices);
+	QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices);
+
+	testForType<uint16_t>(mesh);
+	QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices);
+	QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices);
+
+	testForType<int32_t>(mesh);
+	QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices);
+	QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices);
+
+	testForType<uint32_t>(mesh);
+	QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices);
+	QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices);
+
+	testForType<float>(mesh);
+	QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices);
+	QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices);
+
+	testForType<double>(mesh);
+	QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices);
+	QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices);
+
+	testForType<Density8>(mesh);
+	QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices);
+	QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices);
+
+	testForType<MaterialDensityPair88>(mesh);
+	QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices);
+	QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices);
+}
+
+QTEST_MAIN(TestSurfaceExtractor)

tests/TestSurfaceExtractor.h

@@ -0,0 +1,37 @@
+/*******************************************************************************
+Copyright (c) 2010 Matt Williams
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+    1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+
+    2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+
+    3. This notice may not be removed or altered from any source
+    distribution.
+*******************************************************************************/
+
+#ifndef __PolyVox_TestSurfaceExtractor_H__
+#define __PolyVox_TestSurfaceExtractor_H__
+
+#include <QObject>
+
+class TestSurfaceExtractor: public QObject
+{
+	Q_OBJECT
+	
+	private slots:
+		void testExecute();
+};
+
+#endif