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

Fixed compile error.

Browse Source
This commit is contained in:
David Williams
2010-08-31 21:35:33 +00:00
parent fa2ace83e3
commit 40d26b4361
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/PolyVoxCore/include/Volume.h
View File

@@ -147,7 +147,7 @@ namespace PolyVox
///Gets a voxel by <tt>x,y,z</tt> position ///Gets a voxel by <tt>x,y,z</tt> position
VoxelType getVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos) const; VoxelType getVoxelAt(uint16_t uXPos, uint16_t uYPos, uint16_t uZPos) const;
///Gets a voxel by 3D vector position ///Gets a voxel by 3D vector position
VoxelType getVoxelAt(const Vector3DUint16& v3dPos, VoxelType tDefault = VoxelType()) const; VoxelType getVoxelAt(const Vector3DUint16& v3dPos) const;
///Sets the value used for voxels which are outside the volume ///Sets the value used for voxels which are outside the volume
void setBorderValue(const VoxelType& tBorder); void setBorderValue(const VoxelType& tBorder);

6
library/PolyVoxCore/include/Volume.inl
View File

@@ -236,7 +236,6 @@ namespace PolyVox
/// \param uXPos the \c x position of the voxel /// \param uXPos the \c x position of the voxel
/// \param uYPos the \c y position of the voxel /// \param uYPos the \c y position of the voxel
/// \param uZPos the \c z position of the voxel /// \param uZPos the \c z position of the voxel
/// \param tDefault the voxel to be returned if the requested position is outside the volume
/// \return the voxel value /// \return the voxel value
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
template <typename VoxelType> template <typename VoxelType>
@@ -271,13 +270,12 @@ namespace PolyVox
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// \param v3dPos the 3D position of the voxel /// \param v3dPos the 3D position of the voxel
/// \param tDefault the voxel to be returned if the requested position is outside the volume
/// \return the voxel value /// \return the voxel value
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
template <typename VoxelType> template <typename VoxelType>
VoxelType Volume<VoxelType>::getVoxelAt(const Vector3DUint16& v3dPos, VoxelType tDefault) const VoxelType Volume<VoxelType>::getVoxelAt(const Vector3DUint16& v3dPos) const
{ {
return getVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ(), tDefault); return getVoxelAt(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ());
} }
#pragma endregion #pragma endregion