AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Removed some redundant variables.

Browse Source
This commit is contained in:
David Williams 2010-08-21 17:08:40 +00:00
parent 5adabf624a
commit 854c8b6fa4
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
library/PolyVoxCore/include/SurfaceExtractor.h
View File

@ -70,31 +70,10 @@ namespace PolyVox
const Array2DInt32& m_pCurrentVertexIndicesY, const Array2DInt32& m_pCurrentVertexIndicesY,
const Array2DInt32& m_pCurrentVertexIndicesZ); 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. //The volume data and a sampler to access it.
Volume<VoxelType> m_volData; Volume<VoxelType> m_volData;
VolumeSampler<VoxelType> m_sampVolume; VolumeSampler<VoxelType> 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. //Holds a position in volume space.
uint16_t uXVolSpace; uint16_t uXVolSpace;
uint16_t uYVolSpace; uint16_t uYVolSpace;
@ -122,10 +101,6 @@ namespace PolyVox
//used and have some overhead to compute. //used and have some overhead to compute.
uint16_t m_uRegionWidth; uint16_t m_uRegionWidth;
uint16_t m_uRegionHeight; uint16_t m_uRegionHeight;
//These are used in several places so best stored.
uint16_t m_uScratchPadWidth;
uint16_t m_uScratchPadHeight;
}; };
} }

5
library/PolyVoxCore/include/SurfaceExtractor.inl
View File

@ -57,10 +57,7 @@ namespace PolyVox
m_uRegionWidth = m_regInputCropped.width(); m_uRegionWidth = m_regInputCropped.width();
m_uRegionHeight = m_regInputCropped.height(); m_uRegionHeight = m_regInputCropped.height();
m_uScratchPadWidth = m_uRegionWidth+1; uint32_t arraySizes[2]= {m_uRegionWidth+1, m_uRegionHeight+1}; // Array dimensions
m_uScratchPadHeight = m_uRegionHeight+1;
uint32_t arraySizes[2]= {m_uScratchPadWidth, m_uScratchPadHeight}; // Array dimensions
//For edge indices //For edge indices
Array2DInt32 m_pPreviousVertexIndicesX(arraySizes); Array2DInt32 m_pPreviousVertexIndicesX(arraySizes);