Removed some old testing code.
This commit is contained in:
		| @@ -39,27 +39,6 @@ inline int32_t cantorTupleFunction(int32_t previousResult, int32_t value) | |||||||
| 	return (( previousResult + value  ) * ( previousResult + value + 1 ) + value ) / 2; | 	return (( previousResult + value  ) * ( previousResult + value + 1 ) + value ) / 2; | ||||||
| } | } | ||||||
|  |  | ||||||
| template <typename VolumeType> |  | ||||||
| VolumeType* createAndFillVolume(void) |  | ||||||
| { |  | ||||||
| 	//Create the volume |  | ||||||
| 	VolumeType* volume = new VolumeType(Region(-57, -31, 12, 64, 96, 131)); // Deliberatly awkward size |  | ||||||
|  |  | ||||||
| 	//Fill the volume with some data |  | ||||||
| 	for(int z = volume->getEnclosingRegion().getLowerZ(); z <= volume->getEnclosingRegion().getUpperZ(); z++) |  | ||||||
| 	{ |  | ||||||
| 		for(int y = volume->getEnclosingRegion().getLowerY(); y <= volume->getEnclosingRegion().getUpperY(); y++) |  | ||||||
| 		{ |  | ||||||
| 			for(int x = volume->getEnclosingRegion().getLowerX(); x <= volume->getEnclosingRegion().getUpperX(); x++) |  | ||||||
| 			{ |  | ||||||
| 				volume->setVoxelAt(x, y, z, x + y + z); |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	return volume; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| // We allow user provided offset in this function so we can test the case when all samples are inside a volume and also the case when some samples are outside. | // We allow user provided offset in this function so we can test the case when all samples are inside a volume and also the case when some samples are outside. | ||||||
| // This is important because samplers are often slower when outside the volume as they have to fall back on directly accessing the volume data. | // This is important because samplers are often slower when outside the volume as they have to fall back on directly accessing the volume data. | ||||||
| template <typename VolumeType> | template <typename VolumeType> | ||||||
| @@ -167,119 +146,6 @@ int32_t testSamplersWithWrapping(VolumeType* volume, int lowXOffset, int lowYOff | |||||||
| 	return result; | 	return result; | ||||||
| } | } | ||||||
|  |  | ||||||
| template <typename VolumeType> |  | ||||||
| int32_t complexVolumeTest(void) |  | ||||||
| { |  | ||||||
| 	VolumeType* testVolume = createAndFillVolume<VolumeType>(); |  | ||||||
|  |  | ||||||
| 	int32_t result = 0; |  | ||||||
|  |  | ||||||
| 	//Test the getVoxel function |  | ||||||
| 	for(int z = testVolume->getEnclosingRegion().getLowerZ(); z <= testVolume->getEnclosingRegion().getUpperZ(); z++) |  | ||||||
| 	{ |  | ||||||
| 		for(int y = testVolume->getEnclosingRegion().getLowerY(); y <= testVolume->getEnclosingRegion().getUpperY(); y++) |  | ||||||
| 		{ |  | ||||||
| 			for(int x = testVolume->getEnclosingRegion().getLowerX(); x <= testVolume->getEnclosingRegion().getUpperX(); x++) |  | ||||||
| 			{ |  | ||||||
| 				result = cantorTupleFunction(result, testVolume->getVoxel(x, y, z)); |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	//Test border wrap mode |  | ||||||
| 	for(int z = testVolume->getEnclosingRegion().getLowerZ(); z <= testVolume->getEnclosingRegion().getUpperZ(); z++) |  | ||||||
| 	{ |  | ||||||
| 		//Extending outside in y |  | ||||||
| 		for(int y = testVolume->getEnclosingRegion().getLowerY() - 3; y <= testVolume->getEnclosingRegion().getUpperY() + 5; y++) |  | ||||||
| 		{ |  | ||||||
| 			for(int x = testVolume->getEnclosingRegion().getLowerX(); x <= testVolume->getEnclosingRegion().getUpperX(); x++) |  | ||||||
| 			{ |  | ||||||
| 				result = cantorTupleFunction(result, testVolume->getVoxelWithWrapping(x, y, z, WrapModes::Border, 3)); |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	//Test clamp wrap mode |  | ||||||
| 	for(int z = testVolume->getEnclosingRegion().getLowerZ(); z <= testVolume->getEnclosingRegion().getUpperZ(); z++) |  | ||||||
| 	{ |  | ||||||
| 		for(int y = testVolume->getEnclosingRegion().getLowerY(); y <= testVolume->getEnclosingRegion().getUpperY(); y++) |  | ||||||
| 		{ |  | ||||||
| 			//Extending outside in x |  | ||||||
| 			for(int x = testVolume->getEnclosingRegion().getLowerX() - 2; x <= testVolume->getEnclosingRegion().getUpperX() + 4; x++) |  | ||||||
| 			{ |  | ||||||
| 				result = cantorTupleFunction(result, testVolume->getVoxelWithWrapping(x, y, z, WrapModes::Clamp)); |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	//Test the sampler setPosition |  | ||||||
| 	typename VolumeType::Sampler sampler(testVolume); |  | ||||||
| 	sampler.setWrapMode(WrapModes::Border, 1); |  | ||||||
|  |  | ||||||
| 	for(int z = testVolume->getEnclosingRegion().getLowerZ() - 2; z <= testVolume->getEnclosingRegion().getUpperZ() + 1; z++) |  | ||||||
| 	{ |  | ||||||
| 		for(int y = testVolume->getEnclosingRegion().getLowerY() - 1; y <= testVolume->getEnclosingRegion().getUpperY() + 3; y++) |  | ||||||
| 		{ |  | ||||||
| 			for(int x = testVolume->getEnclosingRegion().getLowerX() - 4; x <= testVolume->getEnclosingRegion().getUpperX() + 2; x++) |  | ||||||
| 			{ |  | ||||||
| 				sampler.setPosition(x,y,z); |  | ||||||
| 				result = cantorTupleFunction(result, sampler.getVoxel()); |  | ||||||
| 			} |  | ||||||
| 		} |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	//Test the sampler move functions |  | ||||||
| 	typename VolumeType::Sampler xSampler(testVolume); |  | ||||||
| 	typename VolumeType::Sampler ySampler(testVolume); |  | ||||||
| 	typename VolumeType::Sampler zSampler(testVolume); |  | ||||||
|  |  | ||||||
| 	xSampler.setWrapMode(WrapModes::Border, 1); |  | ||||||
| 	ySampler.setWrapMode(WrapModes::Clamp, 1); |  | ||||||
| 	zSampler.setWrapMode(WrapModes::Border, -3); |  | ||||||
|  |  | ||||||
| 	zSampler.setPosition(testVolume->getEnclosingRegion().getLowerX() - 4, testVolume->getEnclosingRegion().getLowerY() - 1, testVolume->getEnclosingRegion().getLowerZ() - 2); |  | ||||||
| 	for(int z = testVolume->getEnclosingRegion().getLowerZ() - 2; z <= testVolume->getEnclosingRegion().getUpperZ() + 1; z++) |  | ||||||
| 	{ |  | ||||||
| 		ySampler = zSampler; |  | ||||||
| 		for(int y = testVolume->getEnclosingRegion().getLowerY() - 1; y <= testVolume->getEnclosingRegion().getUpperY() + 3; y++) |  | ||||||
| 		{ |  | ||||||
| 			xSampler = ySampler; |  | ||||||
| 			for(int x = testVolume->getEnclosingRegion().getLowerX() - 4; x <= testVolume->getEnclosingRegion().getUpperX() + 2; x++) |  | ||||||
| 			{ |  | ||||||
| 				result = cantorTupleFunction(result, xSampler.getVoxel()); |  | ||||||
| 				xSampler.movePositiveX(); |  | ||||||
| 			} |  | ||||||
| 			ySampler.movePositiveY(); |  | ||||||
| 		} |  | ||||||
| 		zSampler.movePositiveZ(); |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	xSampler.setWrapMode(WrapModes::Clamp); |  | ||||||
| 	ySampler.setWrapMode(WrapModes::Border, 1); |  | ||||||
| 	zSampler.setWrapMode(WrapModes::Clamp, -1); |  | ||||||
|  |  | ||||||
| 	zSampler.setPosition(testVolume->getEnclosingRegion().getUpperX() + 2, testVolume->getEnclosingRegion().getUpperY() + 3, testVolume->getEnclosingRegion().getUpperZ() + 1); |  | ||||||
| 	for(int z = 0; z < testVolume->getEnclosingRegion().getDepthInVoxels() + 8; z++) |  | ||||||
| 	{ |  | ||||||
| 		ySampler = zSampler; |  | ||||||
| 		for(int y = 0; y < testVolume->getEnclosingRegion().getHeightInVoxels() + 3; y++) |  | ||||||
| 		{ |  | ||||||
| 			xSampler = ySampler; |  | ||||||
| 			for(int x = 0; x < testVolume->getEnclosingRegion().getWidthInVoxels() + 5; x++) |  | ||||||
| 			{ |  | ||||||
| 				result = cantorTupleFunction(result, xSampler.getVoxel()); |  | ||||||
| 				xSampler.moveNegativeX(); |  | ||||||
| 			} |  | ||||||
| 			ySampler.moveNegativeY(); |  | ||||||
| 		} |  | ||||||
| 		zSampler.moveNegativeZ(); |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	delete testVolume; |  | ||||||
|  |  | ||||||
| 	return result; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| TestVolume::TestVolume() | TestVolume::TestVolume() | ||||||
| { | { | ||||||
| 	Region region(-57, -31, 12, 64, 96, 131); // Deliberatly awkward size | 	Region region(-57, -31, 12, 64, 96, 131); // Deliberatly awkward size | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user