diff --git a/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h b/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h index 4b9ec59c..2b4b8a7e 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h +++ b/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h @@ -30,11 +30,11 @@ freely, subject to the following restrictions: namespace PolyVox { - template< typename SrcVolumeType, typename DestVolumeType> + template< typename SrcVolumeType, typename DstVolumeType> class LowPassFilter { 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 executeSAT(); @@ -45,7 +45,7 @@ namespace PolyVox Region m_regSrc; //Destination data - DestVolumeType* m_pVolDst; + DstVolumeType* m_pVolDst; Region m_regDst; //Kernel size diff --git a/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl b/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl index 29948128..bb877bfa 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl @@ -23,8 +23,8 @@ freely, subject to the following restrictions: namespace PolyVox { - template< typename SrcVolumeType, typename DestVolumeType> - LowPassFilter::LowPassFilter(SrcVolumeType* pVolSrc, Region regSrc, DestVolumeType* pVolDst, Region regDst, uint32_t uKernelSize) + template< typename SrcVolumeType, typename DstVolumeType> + LowPassFilter::LowPassFilter(SrcVolumeType* pVolSrc, Region regSrc, DstVolumeType* pVolDst, Region regDst, uint32_t uKernelSize) :m_pVolSrc(pVolSrc) ,m_regSrc(regSrc) ,m_pVolDst(pVolDst) @@ -43,8 +43,8 @@ namespace PolyVox } } - template< typename SrcVolumeType, typename DestVolumeType> - void LowPassFilter::execute() + template< typename SrcVolumeType, typename DstVolumeType> + void LowPassFilter::execute() { int32_t iSrcMinX = m_regSrc.getLowerCorner().getX(); int32_t iSrcMinY = m_regSrc.getLowerCorner().getY(); @@ -114,8 +114,8 @@ namespace PolyVox } } - template< typename SrcVolumeType, typename DestVolumeType> - void LowPassFilter::executeSAT() + template< typename SrcVolumeType, typename DstVolumeType> + void LowPassFilter::executeSAT() { const uint32_t border = (m_uKernelSize - 1) / 2; @@ -210,17 +210,17 @@ namespace PolyVox } //Now compute the average - const Vector3DInt32& v3dDestLowerCorner = m_regDst.getLowerCorner(); - const Vector3DInt32& v3dDestUpperCorner = m_regDst.getUpperCorner(); + const Vector3DInt32& v3dDstLowerCorner = m_regDst.getLowerCorner(); + const Vector3DInt32& v3dDstUpperCorner = m_regDst.getUpperCorner(); const Vector3DInt32& v3dSrcLowerCorner = m_regSrc.getLowerCorner(); 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 satLowerY = iSrcY - border - 1; diff --git a/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h b/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h index 8c3218ad..781f2aef 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h +++ b/library/PolyVoxCore/include/PolyVoxCore/MeshDecimator.h @@ -152,7 +152,7 @@ namespace PolyVox void buildConnectivityData(void); - bool attemptEdgeCollapse(uint32_t uSrc, uint32_t uDest); + bool attemptEdgeCollapse(uint32_t uSrc, uint32_t uDst); const SurfaceMesh* m_pInputMesh; SurfaceMesh* m_pOutputMesh; @@ -160,7 +160,7 @@ namespace PolyVox uint32_t performDecimationPass(float m_fMinDotProductForCollapse); bool isSubset(std::bitset a, std::bitset 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 canCollapseRegionEdge(uint32_t uSrc, uint32_t uDst); bool canCollapseMaterialEdge(uint32_t uSrc, uint32_t uDst); diff --git a/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h b/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h index eba82625..716f4336 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h +++ b/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h @@ -28,11 +28,11 @@ freely, subject to the following restrictions: namespace PolyVox { - template< typename SrcVolumeType, typename DestVolumeType> + template< typename SrcVolumeType, typename DstVolumeType> class VolumeResampler { public: - VolumeResampler(SrcVolumeType* pVolSrc, Region regSrc, DestVolumeType* pVolDst, Region regDst); + VolumeResampler(SrcVolumeType* pVolSrc, Region regSrc, DstVolumeType* pVolDst, Region regDst); void execute(); @@ -45,7 +45,7 @@ namespace PolyVox Region m_regSrc; //Destination data - DestVolumeType* m_pVolDst; + DstVolumeType* m_pVolDst; Region m_regDst; }; diff --git a/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl b/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl index 8a3b199d..c9082a4c 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl @@ -25,8 +25,8 @@ freely, subject to the following restrictions: namespace PolyVox { - template< typename SrcVolumeType, typename DestVolumeType> - VolumeResampler::VolumeResampler(SrcVolumeType* pVolSrc, Region regSrc, DestVolumeType* pVolDst, Region regDst) + template< typename SrcVolumeType, typename DstVolumeType> + VolumeResampler::VolumeResampler(SrcVolumeType* pVolSrc, Region regSrc, DstVolumeType* pVolDst, Region regDst) :m_pVolSrc(pVolSrc) ,m_regSrc(regSrc) ,m_pVolDst(pVolDst) @@ -34,8 +34,8 @@ namespace PolyVox { } - template< typename SrcVolumeType, typename DestVolumeType> - void VolumeResampler::execute() + template< typename SrcVolumeType, typename DstVolumeType> + void VolumeResampler::execute() { int32_t uSrcWidth = m_regSrc.getUpperCorner().getX() - m_regSrc.getLowerCorner().getX() + 1; int32_t uSrcHeight = m_regSrc.getUpperCorner().getY() - m_regSrc.getLowerCorner().getY() + 1; @@ -55,8 +55,8 @@ namespace PolyVox } } - template< typename SrcVolumeType, typename DestVolumeType> - void VolumeResampler::resampleSameSize() + template< typename SrcVolumeType, typename DstVolumeType> + void VolumeResampler::resampleSameSize() { 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++) { const typename SrcVolumeType::VoxelType& tSrcVoxel = m_pVolSrc->getVoxelAt(sx,sy,sz); - const typename DestVolumeType::VoxelType& tDestVoxel = static_cast(m_pVolSrc->getVoxelAt(sx,sy,sz)); - m_pVolDst->setVoxelAt(dx,dy,dz,tDestVoxel); + const typename DstVolumeType::VoxelType& tDstVoxel = static_cast(m_pVolSrc->getVoxelAt(sx,sy,sz)); + m_pVolDst->setVoxelAt(dx,dy,dz,tDstVoxel); } } } } - template< typename SrcVolumeType, typename DestVolumeType> - void VolumeResampler::resampleArbitrary() + template< typename SrcVolumeType, typename DstVolumeType> + void VolumeResampler::resampleArbitrary() { float srcWidth = m_regSrc.getUpperCorner().getX() - m_regSrc.getLowerCorner().getX(); float srcHeight = m_regSrc.getUpperCorner().getY() - m_regSrc.getLowerCorner().getY(); @@ -121,7 +121,7 @@ namespace PolyVox typename SrcVolumeType::VoxelType tInterpolatedValue = trilinearlyInterpolate(voxel000,voxel100,voxel010,voxel110,voxel001,voxel101,voxel011,voxel111,sx,sy,sz); - typename DestVolumeType::VoxelType result = static_cast(tInterpolatedValue); + typename DstVolumeType::VoxelType result = static_cast(tInterpolatedValue); m_pVolDst->setVoxelAt(dx,dy,dz,result); } }