From 898aa241264aa29324a0dcf68b8534431f581fd0 Mon Sep 17 00:00:00 2001
From: Daviw Williams <david@volumesoffun.com>
Date: Wed, 19 Dec 2012 11:46:44 +0100
Subject: [PATCH] Removed code which is redundant after previous commit.

---
 .../DefaultMarchingCubesController.h          | 20 -------------------
 .../PolyVoxCore/include/PolyVoxCore/Density.h | 19 ------------------
 .../include/PolyVoxCore/MaterialDensityPair.h | 14 -------------
 tests/TestSurfaceExtractor.cpp                | 10 ----------
 4 files changed, 63 deletions(-)

diff --git a/library/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h b/library/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h
index 8d5359e9..7be8dc9e 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h
@@ -78,8 +78,6 @@ namespace PolyVox
 		 */
 		DefaultMarchingCubesController(void)
 			:m_tThreshold(((std::numeric_limits<DensityType>::min)() + (std::numeric_limits<DensityType>::max)()) / 2)
-			,m_eWrapMode(WrapModes::Border)
-			,m_tBorder(VoxelType(0))
 		{			
 		}
 
@@ -105,11 +103,6 @@ namespace PolyVox
 			return 1;
 		}
 
-		VoxelType getBorderValue(void)
-		{
-			return m_tBorder;
-		}
-
 		/**
 		 * Returns the density value which was passed to the constructor.
 		 *
@@ -122,26 +115,13 @@ namespace PolyVox
 			return m_tThreshold;
 		}
 
-		WrapMode getWrapMode(void)
-		{
-			return m_eWrapMode;
-		}
-
 		void setThreshold(DensityType tThreshold)
 		{
 			m_tThreshold = tThreshold;
 		}
 
-		void setWrapMode(WrapMode eWrapMode, VoxelType tBorder = VoxelType(0))
-		{
-			m_eWrapMode = eWrapMode;
-			m_tBorder = tBorder;
-		}
-
 	private:
 		DensityType m_tThreshold;
-		WrapMode m_eWrapMode;
-		VoxelType m_tBorder;
 	};
 }
 
diff --git a/library/PolyVoxCore/include/PolyVoxCore/Density.h b/library/PolyVoxCore/include/PolyVoxCore/Density.h
index a92d23b9..4d60ad53 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Density.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Density.h
@@ -155,13 +155,11 @@ namespace PolyVox
 		{
 			// Default to a threshold value halfway between the min and max possible values.
 			m_tThreshold = (Density<Type>::getMinDensity() + Density<Type>::getMaxDensity()) / 2;
-			m_eWrapMode = WrapModes::Border;
 		}
 
 		DefaultMarchingCubesController(DensityType tThreshold)
 		{
 			m_tThreshold = tThreshold;
-			m_eWrapMode = WrapModes::Border;
 		}
 
 		DensityType convertToDensity(Density<Type> voxel)
@@ -174,35 +172,18 @@ namespace PolyVox
 			return 1;
 		}
 
-		Density<Type> getBorderValue(void)
-		{
-			return m_tBorder;
-		}
-
 		DensityType getThreshold(void)
 		{			
 			return m_tThreshold;
 		}
 
-		WrapMode getWrapMode(void)
-		{
-			return m_eWrapMode;
-		}
-
 		void setThreshold(DensityType tThreshold)
 		{
 			m_tThreshold = tThreshold;
 		}
 
-		void setWrapMode(WrapMode eWrapMode)
-		{
-			m_eWrapMode = eWrapMode;
-		}
-
 	private:
 		DensityType m_tThreshold;
-		WrapMode m_eWrapMode;
-		Density<Type> m_tBorder;
 	};
 }
 
diff --git a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
index d3df49b8..ec8fb874 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
@@ -119,13 +119,11 @@ namespace PolyVox
 		{
 			// Default to a threshold value halfway between the min and max possible values.
 			m_tThreshold = (MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits>::getMinDensity() + MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits>::getMaxDensity()) / 2;
-			m_eWrapMode = WrapModes::Border;
 		}
 
 		DefaultMarchingCubesController(DensityType tThreshold)
 		{
 			m_tThreshold = tThreshold;
-			m_eWrapMode = WrapModes::Border;
 		}
 
 		DensityType convertToDensity(MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> voxel)
@@ -148,25 +146,13 @@ namespace PolyVox
 			return m_tThreshold;
 		}
 
-		WrapMode getWrapMode(void)
-		{
-			return m_eWrapMode;
-		}
-
 		void setThreshold(DensityType tThreshold)
 		{
 			m_tThreshold = tThreshold;
 		}
 
-		void setWrapMode(WrapMode eWrapMode)
-		{
-			m_eWrapMode = eWrapMode;
-		}
-
 	private:
 		DensityType m_tThreshold;
-		WrapMode m_eWrapMode;
-		MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> m_tBorder;
 	};
 
 	typedef MaterialDensityPair<uint8_t, 4, 4> MaterialDensityPair44;
diff --git a/tests/TestSurfaceExtractor.cpp b/tests/TestSurfaceExtractor.cpp
index 6114935d..80416eb4 100644
--- a/tests/TestSurfaceExtractor.cpp
+++ b/tests/TestSurfaceExtractor.cpp
@@ -59,16 +59,6 @@ public:
 	{
 		return 50.0f;
 	}
-
-	WrapMode getWrapMode(void)
-	{
-		return WrapModes::Border;
-	}
-
-	float getBorderValue(void)
-	{
-		return 0.0f;
-	}
 };
 
 // These 'writeDensityValueToVoxel' functions provide a unified interface for writting densities to primative and class voxel types.