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

More consistent variable naming.

Browse Source
This commit is contained in:
unknown 2012-07-04 16:40:49 +02:00
parent c488cf162e
commit f092d64992
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h
View File

@ -30,11 +30,11 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
template< typename SrcVolumeType, typename DestVolumeType> template< typename SrcVolumeType, typename DstVolumeType>
class LowPassFilter class LowPassFilter
{ {
public: public:
LowPassFilter(SrcVolumeType* pVolSrc, Region regSrc, DestVolumeType* pVolDst, Region regDst, uint32_t uKernelSize); LowPassFilter(SrcVolumeType* pVolSrc, Region regSrc, DstVolumeType* pVolDst, Region regDst, uint32_t uKernelSize);
void execute(); void execute();
void executeSAT(); void executeSAT();
@ -45,7 +45,7 @@ namespace PolyVox
Region m_regSrc; Region m_regSrc;
//Destination data //Destination data
DestVolumeType* m_pVolDst; DstVolumeType* m_pVolDst;
Region m_regDst; Region m_regDst;
//Kernel size //Kernel size

22
library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl
View File

@ -23,8 +23,8 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
template< typename SrcVolumeType, typename DestVolumeType> template< typename SrcVolumeType, typename DstVolumeType>
LowPassFilter<SrcVolumeType, DestVolumeType>::LowPassFilter(SrcVolumeType* pVolSrc, Region regSrc, DestVolumeType* pVolDst, Region regDst, uint32_t uKernelSize) LowPassFilter<SrcVolumeType, DstVolumeType>::LowPassFilter(SrcVolumeType* pVolSrc, Region regSrc, DstVolumeType* pVolDst, Region regDst, uint32_t uKernelSize)
:m_pVolSrc(pVolSrc) :m_pVolSrc(pVolSrc)
,m_regSrc(regSrc) ,m_regSrc(regSrc)
,m_pVolDst(pVolDst) ,m_pVolDst(pVolDst)
@ -43,8 +43,8 @@ namespace PolyVox
} }
} }
template< typename SrcVolumeType, typename DestVolumeType> template< typename SrcVolumeType, typename DstVolumeType>
void LowPassFilter<SrcVolumeType, DestVolumeType>::execute() void LowPassFilter<SrcVolumeType, DstVolumeType>::execute()
{ {
int32_t iSrcMinX = m_regSrc.getLowerCorner().getX(); int32_t iSrcMinX = m_regSrc.getLowerCorner().getX();
int32_t iSrcMinY = m_regSrc.getLowerCorner().getY(); int32_t iSrcMinY = m_regSrc.getLowerCorner().getY();
@ -114,8 +114,8 @@ namespace PolyVox
} }
} }
template< typename SrcVolumeType, typename DestVolumeType> template< typename SrcVolumeType, typename DstVolumeType>
void LowPassFilter<SrcVolumeType, DestVolumeType>::executeSAT() void LowPassFilter<SrcVolumeType, DstVolumeType>::executeSAT()
{ {
const uint32_t border = (m_uKernelSize - 1) / 2; const uint32_t border = (m_uKernelSize - 1) / 2;
@ -210,17 +210,17 @@ namespace PolyVox
} }
//Now compute the average //Now compute the average
const Vector3DInt32& v3dDestLowerCorner = m_regDst.getLowerCorner(); const Vector3DInt32& v3dDstLowerCorner = m_regDst.getLowerCorner();
const Vector3DInt32& v3dDestUpperCorner = m_regDst.getUpperCorner(); const Vector3DInt32& v3dDstUpperCorner = m_regDst.getUpperCorner();
const Vector3DInt32& v3dSrcLowerCorner = m_regSrc.getLowerCorner(); const Vector3DInt32& v3dSrcLowerCorner = m_regSrc.getLowerCorner();
const Vector3DInt32& v3dSrcUpperCorner = m_regSrc.getUpperCorner(); const Vector3DInt32& v3dSrcUpperCorner = m_regSrc.getUpperCorner();
for(int32_t iDstZ = v3dDestLowerCorner.getZ(), iSrcZ = v3dSrcLowerCorner.getZ(); iDstZ <= v3dDestUpperCorner.getZ(); iDstZ++, iSrcZ++) for(int32_t iDstZ = v3dDstLowerCorner.getZ(), iSrcZ = v3dSrcLowerCorner.getZ(); iDstZ <= v3dDstUpperCorner.getZ(); iDstZ++, iSrcZ++)
{ {
for(int32_t iDstY = v3dDestLowerCorner.getY(), iSrcY = v3dSrcLowerCorner.getY(); iDstY <= v3dDestUpperCorner.getY(); iDstY++, iSrcY++) for(int32_t iDstY = v3dDstLowerCorner.getY(), iSrcY = v3dSrcLowerCorner.getY(); iDstY <= v3dDstUpperCorner.getY(); iDstY++, iSrcY++)
{ {
for(int32_t iDstX = v3dDestLowerCorner.getX(), iSrcX = v3dSrcLowerCorner.getX(); iDstX <= v3dDestUpperCorner.getX(); iDstX++, iSrcX++) for(int32_t iDstX = v3dDstLowerCorner.getX(), iSrcX = v3dSrcLowerCorner.getX(); iDstX <= v3dDstUpperCorner.getX(); iDstX++, iSrcX++)
{ {
int32_t satLowerX = iSrcX - border - 1; int32_t satLowerX = iSrcX - border - 1;
int32_t satLowerY = iSrcY - border - 1; int32_t satLowerY = iSrcY - border - 1;

4
library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h
View File

@ -152,7 +152,7 @@ namespace PolyVox
void buildConnectivityData(void); void buildConnectivityData(void);
bool attemptEdgeCollapse(uint32_t uSrc, uint32_t uDest); bool attemptEdgeCollapse(uint32_t uSrc, uint32_t uDst);
const SurfaceMesh<VertexType>* m_pInputMesh; const SurfaceMesh<VertexType>* m_pInputMesh;
SurfaceMesh<VertexType>* m_pOutputMesh; SurfaceMesh<VertexType>* m_pOutputMesh;
@ -160,7 +160,7 @@ namespace PolyVox
uint32_t performDecimationPass(float m_fMinDotProductForCollapse); uint32_t performDecimationPass(float m_fMinDotProductForCollapse);
bool isSubset(std::bitset<RFF_NO_OF_REGION_FACE_FLAGS> a, std::bitset<RFF_NO_OF_REGION_FACE_FLAGS> b); bool isSubset(std::bitset<RFF_NO_OF_REGION_FACE_FLAGS> a, std::bitset<RFF_NO_OF_REGION_FACE_FLAGS> b);
bool canCollapseEdge(uint32_t uSrc, uint32_t uDest); bool canCollapseEdge(uint32_t uSrc, uint32_t uDst);
bool canCollapseNormalEdge(uint32_t uSrc, uint32_t uDst); bool canCollapseNormalEdge(uint32_t uSrc, uint32_t uDst);
bool canCollapseRegionEdge(uint32_t uSrc, uint32_t uDst); bool canCollapseRegionEdge(uint32_t uSrc, uint32_t uDst);
bool canCollapseMaterialEdge(uint32_t uSrc, uint32_t uDst); bool canCollapseMaterialEdge(uint32_t uSrc, uint32_t uDst);

6
library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h
View File

@ -28,11 +28,11 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
template< typename SrcVolumeType, typename DestVolumeType> template< typename SrcVolumeType, typename DstVolumeType>
class VolumeResampler class VolumeResampler
{ {
public: public:
VolumeResampler(SrcVolumeType* pVolSrc, Region regSrc, DestVolumeType* pVolDst, Region regDst); VolumeResampler(SrcVolumeType* pVolSrc, Region regSrc, DstVolumeType* pVolDst, Region regDst);
void execute(); void execute();
@ -45,7 +45,7 @@ namespace PolyVox
Region m_regSrc; Region m_regSrc;
//Destination data //Destination data
DestVolumeType* m_pVolDst; DstVolumeType* m_pVolDst;
Region m_regDst; Region m_regDst;
}; };

22
library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl
View File

@ -25,8 +25,8 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
template< typename SrcVolumeType, typename DestVolumeType> template< typename SrcVolumeType, typename DstVolumeType>
VolumeResampler<SrcVolumeType, DestVolumeType>::VolumeResampler(SrcVolumeType* pVolSrc, Region regSrc, DestVolumeType* pVolDst, Region regDst) VolumeResampler<SrcVolumeType, DstVolumeType>::VolumeResampler(SrcVolumeType* pVolSrc, Region regSrc, DstVolumeType* pVolDst, Region regDst)
:m_pVolSrc(pVolSrc) :m_pVolSrc(pVolSrc)
,m_regSrc(regSrc) ,m_regSrc(regSrc)
,m_pVolDst(pVolDst) ,m_pVolDst(pVolDst)
@ -34,8 +34,8 @@ namespace PolyVox
{ {
} }
template< typename SrcVolumeType, typename DestVolumeType> template< typename SrcVolumeType, typename DstVolumeType>
void VolumeResampler<SrcVolumeType, DestVolumeType>::execute() void VolumeResampler<SrcVolumeType, DstVolumeType>::execute()
{ {
int32_t uSrcWidth = m_regSrc.getUpperCorner().getX() - m_regSrc.getLowerCorner().getX() + 1; int32_t uSrcWidth = m_regSrc.getUpperCorner().getX() - m_regSrc.getLowerCorner().getX() + 1;
int32_t uSrcHeight = m_regSrc.getUpperCorner().getY() - m_regSrc.getLowerCorner().getY() + 1; int32_t uSrcHeight = m_regSrc.getUpperCorner().getY() - m_regSrc.getLowerCorner().getY() + 1;
@ -55,8 +55,8 @@ namespace PolyVox
} }
} }
template< typename SrcVolumeType, typename DestVolumeType> template< typename SrcVolumeType, typename DstVolumeType>
void VolumeResampler<SrcVolumeType, DestVolumeType>::resampleSameSize() void VolumeResampler<SrcVolumeType, DstVolumeType>::resampleSameSize()
{ {
for(int32_t sz = m_regSrc.getLowerCorner().getZ(), dz = m_regDst.getLowerCorner().getZ(); dz <= m_regDst.getUpperCorner().getZ(); sz++, dz++) for(int32_t sz = m_regSrc.getLowerCorner().getZ(), dz = m_regDst.getLowerCorner().getZ(); dz <= m_regDst.getUpperCorner().getZ(); sz++, dz++)
{ {
@ -65,15 +65,15 @@ namespace PolyVox
for(int32_t sx = m_regSrc.getLowerCorner().getX(), dx = m_regDst.getLowerCorner().getX(); dx <= m_regDst.getUpperCorner().getX(); sx++,dx++) for(int32_t sx = m_regSrc.getLowerCorner().getX(), dx = m_regDst.getLowerCorner().getX(); dx <= m_regDst.getUpperCorner().getX(); sx++,dx++)
{ {
const typename SrcVolumeType::VoxelType& tSrcVoxel = m_pVolSrc->getVoxelAt(sx,sy,sz); const typename SrcVolumeType::VoxelType& tSrcVoxel = m_pVolSrc->getVoxelAt(sx,sy,sz);
const typename DestVolumeType::VoxelType& tDestVoxel = static_cast<DestVolumeType::VoxelType>(m_pVolSrc->getVoxelAt(sx,sy,sz)); const typename DstVolumeType::VoxelType& tDstVoxel = static_cast<DstVolumeType::VoxelType>(m_pVolSrc->getVoxelAt(sx,sy,sz));
m_pVolDst->setVoxelAt(dx,dy,dz,tDestVoxel); m_pVolDst->setVoxelAt(dx,dy,dz,tDstVoxel);
} }
} }
} }
} }
template< typename SrcVolumeType, typename DestVolumeType> template< typename SrcVolumeType, typename DstVolumeType>
void VolumeResampler<SrcVolumeType, DestVolumeType>::resampleArbitrary() void VolumeResampler<SrcVolumeType, DstVolumeType>::resampleArbitrary()
{ {
float srcWidth = m_regSrc.getUpperCorner().getX() - m_regSrc.getLowerCorner().getX(); float srcWidth = m_regSrc.getUpperCorner().getX() - m_regSrc.getLowerCorner().getX();
float srcHeight = m_regSrc.getUpperCorner().getY() - m_regSrc.getLowerCorner().getY(); float srcHeight = m_regSrc.getUpperCorner().getY() - m_regSrc.getLowerCorner().getY();
@ -121,7 +121,7 @@ namespace PolyVox
typename SrcVolumeType::VoxelType tInterpolatedValue = trilinearlyInterpolate<float>(voxel000,voxel100,voxel010,voxel110,voxel001,voxel101,voxel011,voxel111,sx,sy,sz); typename SrcVolumeType::VoxelType tInterpolatedValue = trilinearlyInterpolate<float>(voxel000,voxel100,voxel010,voxel110,voxel001,voxel101,voxel011,voxel111,sx,sy,sz);
typename DestVolumeType::VoxelType result = static_cast<DestVolumeType::VoxelType>(tInterpolatedValue); typename DstVolumeType::VoxelType result = static_cast<DstVolumeType::VoxelType>(tInterpolatedValue);
m_pVolDst->setVoxelAt(dx,dy,dz,result); m_pVolDst->setVoxelAt(dx,dy,dz,result);
} }
} }