From 4b3b940b910d4e37d4698cf577d1417ed1164a0a Mon Sep 17 00:00:00 2001 From: David Williams Date: Mon, 18 Aug 2014 16:29:08 +0200 Subject: [PATCH] Removed old testing code. --- tests/TestCubicSurfaceExtractor.cpp | 157 ++-------------------------- 1 file changed, 8 insertions(+), 149 deletions(-) diff --git a/tests/TestCubicSurfaceExtractor.cpp b/tests/TestCubicSurfaceExtractor.cpp index 4bafb89c..c8283af4 100644 --- a/tests/TestCubicSurfaceExtractor.cpp +++ b/tests/TestCubicSurfaceExtractor.cpp @@ -55,94 +55,6 @@ public: } }; - -// 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 MarchingCubesSurfaceExtractor. They probably shouldn't be part -// of PolyVox, but they might be useful to other tests so we cold move them into a 'Tests.h' or something in the future. -template -void writeDensityValueToVoxel(int valueToWrite, VoxelType& voxel) -{ - voxel = valueToWrite; -} - -template<> -void writeDensityValueToVoxel(int valueToWrite, Density8& voxel) -{ - voxel.setDensity(valueToWrite); -} - -template<> -void writeDensityValueToVoxel(int valueToWrite, MaterialDensityPair88& voxel) -{ - voxel.setDensity(valueToWrite); -} - -template -void writeMaterialValueToVoxel(int valueToWrite, VoxelType& voxel) -{ - //Most types don't have a material - return; -} - -template<> -void writeMaterialValueToVoxel(int valueToWrite, MaterialDensityPair88& voxel) -{ - voxel.setMaterial(valueToWrite); -} - -// Runs the surface extractor for a given type. -template -uint32_t testForType(void) -{ - const int32_t uVolumeSideLength = 256; - - //Create empty volume - SimpleVolume volData(Region(Vector3DInt32(0,0,0), Vector3DInt32(uVolumeSideLength-1, uVolumeSideLength-1, uVolumeSideLength-1)), 128); - - //Fill the volume with data - for (int32_t z = 0; z < uVolumeSideLength; z++) - { - for (int32_t y = 0; y < uVolumeSideLength; y++) - { - for (int32_t x = 0; x < uVolumeSideLength; x++) - { - if(x + y + z > uVolumeSideLength) - { - VoxelType voxelValue; - writeDensityValueToVoxel(100, voxelValue); - writeMaterialValueToVoxel(42, voxelValue); - volData.setVoxelAt(x, y, z, voxelValue); - } - } - } - } - - uint32_t uTotalVertices = 0; - uint32_t uTotalIndices = 0; - - //Run the surface extractor a number of times over differnt regions of the volume. - const int32_t uRegionSideLength = 64; - for (int32_t z = 0; z < uVolumeSideLength; z += uRegionSideLength) - { - for (int32_t y = 0; y < uVolumeSideLength; y += uRegionSideLength) - { - for (int32_t x = 0; x < uVolumeSideLength; x += uRegionSideLength) - { - Region regionToExtract(x, y, z, x + uRegionSideLength - 1, y + uRegionSideLength - 1, z + uRegionSideLength - 1); - - auto result = extractCubicMesh(&volData, regionToExtract); - - uTotalVertices += result.getNoOfVertices(); - uTotalIndices += result.getNoOfIndices(); - } - } - } - - // Just some value which is representative of the work we've done. It doesn't - // matter what it is, just that it should be the same every time we run the test. - return uTotalVertices + uTotalIndices; -} - // Runs the surface extractor for a given type. template SimpleVolume* createAndFillVolumeWithNoise(VoxelType minValue, VoxelType maxValue) @@ -181,67 +93,7 @@ SimpleVolume* createAndFillVolumeWithNoise(VoxelType minValue, VoxelT void TestCubicSurfaceExtractor::testExecute() { - /*const static uint32_t uExpectedVertices = 6624; - const static uint32_t uExpectedIndices = 9936; - const static uint32_t uMaterialToCheck = 3000; - const static float fExpectedMaterial = 42.0f; - const static uint32_t uIndexToCheck = 2000; - const static uint32_t uExpectedIndex = 1334; - - Mesh mesh;*/ - - /*testForType(mesh); - QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices); - QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices); - QCOMPARE(mesh.getVertices()[uMaterialToCheck].getMaterial(), fNoMaterial); - - testForType(mesh); - QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices); - QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices); - QCOMPARE(mesh.getVertices()[uMaterialToCheck].getMaterial(), fNoMaterial); - - testForType(mesh); - QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices); - QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices); - QCOMPARE(mesh.getVertices()[uMaterialToCheck].getMaterial(), fNoMaterial); - - testForType(mesh); - QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices); - QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices); - QCOMPARE(mesh.getVertices()[uMaterialToCheck].getMaterial(), fNoMaterial); - - testForType(mesh); - QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices); - QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices); - QCOMPARE(mesh.getVertices()[uMaterialToCheck].getMaterial(), fNoMaterial); - - testForType(mesh); - QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices); - QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices); - QCOMPARE(mesh.getVertices()[uMaterialToCheck].getMaterial(), fNoMaterial); - - testForType(mesh); - QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices); - QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices); - QCOMPARE(mesh.getVertices()[uMaterialToCheck].getMaterial(), fNoMaterial); - - testForType(mesh); - QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices); - QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices); - QCOMPARE(mesh.getVertices()[uMaterialToCheck].getMaterial(), fNoMaterial);*/ - - /*testForType(mesh); - QCOMPARE(mesh.getNoOfVertices(), uExpectedVertices); - QCOMPARE(mesh.getNoOfIndices(), uExpectedIndices); - QCOMPARE(mesh.getVertices()[uMaterialToCheck].getMaterial(), fNoMaterial);*/ - - const static uint32_t uExpectedSumOfVerticesAndIndices = 704668; - //const static uint32_t uExpectedSumOfVerticesAndIndices = 2792332; - uint32_t result = 0; - QBENCHMARK { - result = testForType(); - } - QCOMPARE(result, uExpectedSumOfVerticesAndIndices); + // Behavioural tests // Test with default mesh and contoller types. auto uint8Vol = createAndFillVolumeWithNoise(0, 2); @@ -269,6 +121,13 @@ void TestCubicSurfaceExtractor::testExecute() QCOMPARE(int32Mesh.getNoOfVertices(), uint16_t(29027)); QCOMPARE(int32Mesh.getNoOfIndices(), uint32_t(178356)); + // Performance tests + + auto emptyVol = createAndFillVolumeWithNoise(0, 0); + CubicMesh< uint32_t, uint16_t > emptyMesh; + QBENCHMARK{ extractCubicMeshCustom(emptyVol, emptyVol->getEnclosingRegion(), &emptyMesh); } + QCOMPARE(emptyMesh.getNoOfVertices(), uint16_t(0)); + } QTEST_MAIN(TestCubicSurfaceExtractor)