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

Made getVoxel() bounds checking optional, based on a function parameter.

Browse Source
This commit is contained in:
Daviw Williams
2013-05-17 14:32:20 +02:00
parent db1c2bf0f8
commit 617834bed4
8 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
library/PolyVoxCore/include/PolyVoxCore/RawVolume.inl
View File

@@ -80,10 +80,17 @@ namespace PolyVox
/// \return The voxel value
////////////////////////////////////////////////////////////////////////////////
template <typename VoxelType>
VoxelType RawVolume<VoxelType>::getVoxel(int32_t uXPos, int32_t uYPos, int32_t uZPos) const
VoxelType RawVolume<VoxelType>::getVoxel(int32_t uXPos, int32_t uYPos, int32_t uZPos, bool bPerformBoundsChecks) const
{
// PolyVox does not throw an exception when a voxel is out of range. Please see 'Error Handling' in the User Manual.
POLYVOX_ASSERT(this->m_regValidRegion.containsPoint(Vector3DInt32(uXPos, uYPos, uZPos)), "Position is outside valid region");
// If bounds checking is enabled then we validate the
// bounds, and throw an exception if they are violated.
if(bPerformBoundsChecks)
{
if(this->m_regValidRegion.containsPoint(Vector3DInt32(uXPos, uYPos, uZPos)) == false)
{
POLYVOX_THROW(std::out_of_range, "Position is outside valid region");
}
}
const Vector3DInt32& v3dLowerCorner = this->m_regValidRegion.getLowerCorner();
int32_t iLocalXPos = uXPos - v3dLowerCorner.getX();
@@ -103,9 +110,9 @@ namespace PolyVox
/// \return The voxel value
////////////////////////////////////////////////////////////////////////////////
template <typename VoxelType>
VoxelType RawVolume<VoxelType>::getVoxel(const Vector3DInt32& v3dPos) const
VoxelType RawVolume<VoxelType>::getVoxel(const Vector3DInt32& v3dPos, bool bPerformBoundsChecks) const
{
return getVoxel(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ());
return getVoxel(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ(), bPerformBoundsChecks);
}
////////////////////////////////////////////////////////////////////////////////