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

Changed a couple of 'getVoxelAt()' to 'getVoxel()'.

Browse Source
This commit is contained in:
Daviw Williams 2013-06-12 13:38:36 +02:00
parent 1f2b7e4742
commit 60d6658e1a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Paging/main.cpp
View File

@ -184,7 +184,7 @@ void createSphereInVolume(LargeVolume<MaterialDensityPair44>& volData, Vector3DF
uint8_t uDensity = MaterialDensityPair44::getMaxDensity(); uint8_t uDensity = MaterialDensityPair44::getMaxDensity();
//Get the old voxel //Get the old voxel
MaterialDensityPair44 voxel = volData.getVoxelAt(x,y,z); MaterialDensityPair44 voxel = volData.getVoxel(x,y,z);
//Modify the density //Modify the density
voxel.setDensity(uDensity); voxel.setDensity(uDensity);

4
library/PolyVoxCore/include/PolyVoxCore/Impl/Block.h
View File

@ -52,8 +52,8 @@ namespace PolyVox
Block(uint16_t uSideLength = 0); Block(uint16_t uSideLength = 0);
uint16_t getSideLength(void) const; uint16_t getSideLength(void) const;
VoxelType getVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos) const; VoxelType getVoxel(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos) const;
VoxelType getVoxelAt(const Vector3DUint16& v3dPos) const; VoxelType getVoxel(const Vector3DUint16& v3dPos) const;
void setVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos, VoxelType tValue); void setVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos, VoxelType tValue);
void setVoxelAt(const Vector3DUint16& v3dPos, VoxelType tValue); void setVoxelAt(const Vector3DUint16& v3dPos, VoxelType tValue);

6
library/PolyVoxCore/include/PolyVoxCore/Impl/Block.inl
View File

@ -58,7 +58,7 @@ namespace PolyVox
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType Block<VoxelType>::getVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos) const VoxelType Block<VoxelType>::getVoxel(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos) const
{ {
// This is internal code not directly called by the user. For efficiency we assert rather than throwing. // This is internal code not directly called by the user. For efficiency we assert rather than throwing.
POLYVOX_ASSERT(uXPos < m_uSideLength, "Supplied position is outside of the block"); POLYVOX_ASSERT(uXPos < m_uSideLength, "Supplied position is outside of the block");
@ -75,9 +75,9 @@ namespace PolyVox
} }
template <typename VoxelType> template <typename VoxelType>
VoxelType Block<VoxelType>::getVoxelAt(const Vector3DUint16& v3dPos) const VoxelType Block<VoxelType>::getVoxel(const Vector3DUint16& v3dPos) const
{ {
return getVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ()); return getVoxel(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ());
} }
template <typename VoxelType> template <typename VoxelType>

4
library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
View File

@ -216,7 +216,7 @@ namespace PolyVox
Block<VoxelType>* pUncompressedBlock = getUncompressedBlock(blockX, blockY, blockZ); Block<VoxelType>* pUncompressedBlock = getUncompressedBlock(blockX, blockY, blockZ);
return pUncompressedBlock->getVoxelAt(xOffset,yOffset,zOffset); return pUncompressedBlock->getVoxel(xOffset,yOffset,zOffset);
} }
else else
{ {
@ -804,7 +804,7 @@ namespace PolyVox
Block<VoxelType>* pUncompressedBlock = getUncompressedBlock(blockX, blockY, blockZ); Block<VoxelType>* pUncompressedBlock = getUncompressedBlock(blockX, blockY, blockZ);
return pUncompressedBlock->getVoxelAt(xOffset,yOffset,zOffset); return pUncompressedBlock->getVoxel(xOffset,yOffset,zOffset);
} }
} }