diff --git a/library/PolyVoxCore/include/SurfaceExtractor.h b/library/PolyVoxCore/include/SurfaceExtractor.h index f0650da7..a2ad9526 100644 --- a/library/PolyVoxCore/include/SurfaceExtractor.h +++ b/library/PolyVoxCore/include/SurfaceExtractor.h @@ -70,31 +70,10 @@ namespace PolyVox const Array2DInt32& m_pCurrentVertexIndicesY, const Array2DInt32& m_pCurrentVertexIndicesZ); - //Converts a position into an index for accessing scratch areas. - inline uint32_t getIndex(uint32_t x, uint32_t y) - { - return x + (y * m_uScratchPadWidth); - } - //The volume data and a sampler to access it. Volume m_volData; VolumeSampler m_sampVolume; - //Used to keep track of where generated vertices have been placed. - /*int32_t* m_pPreviousVertexIndicesX; - int32_t* m_pPreviousVertexIndicesY; - int32_t* m_pPreviousVertexIndicesZ; - int32_t* m_pCurrentVertexIndicesX; - int32_t* m_pCurrentVertexIndicesY; - int32_t* m_pCurrentVertexIndicesZ;*/ - - /*Array2DInt32 m_pPreviousVertexIndicesX; - Array2DInt32 m_pPreviousVertexIndicesY; - Array2DInt32 m_pPreviousVertexIndicesZ; - Array2DInt32 m_pCurrentVertexIndicesX; - Array2DInt32 m_pCurrentVertexIndicesY; - Array2DInt32 m_pCurrentVertexIndicesZ;*/ - //Holds a position in volume space. uint16_t uXVolSpace; uint16_t uYVolSpace; @@ -121,11 +100,7 @@ namespace PolyVox //Store the width and height because they are frequently //used and have some overhead to compute. uint16_t m_uRegionWidth; - uint16_t m_uRegionHeight; - - //These are used in several places so best stored. - uint16_t m_uScratchPadWidth; - uint16_t m_uScratchPadHeight; + uint16_t m_uRegionHeight; }; } diff --git a/library/PolyVoxCore/include/SurfaceExtractor.inl b/library/PolyVoxCore/include/SurfaceExtractor.inl index 538dfb22..7c6e9790 100644 --- a/library/PolyVoxCore/include/SurfaceExtractor.inl +++ b/library/PolyVoxCore/include/SurfaceExtractor.inl @@ -57,10 +57,7 @@ namespace PolyVox m_uRegionWidth = m_regInputCropped.width(); m_uRegionHeight = m_regInputCropped.height(); - m_uScratchPadWidth = m_uRegionWidth+1; - m_uScratchPadHeight = m_uRegionHeight+1; - - uint32_t arraySizes[2]= {m_uScratchPadWidth, m_uScratchPadHeight}; // Array dimensions + uint32_t arraySizes[2]= {m_uRegionWidth+1, m_uRegionHeight+1}; // Array dimensions //For edge indices Array2DInt32 m_pPreviousVertexIndicesX(arraySizes);