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

Eliminating some of the differences between this branch and 'develop'.

Browse Source
This commit is contained in:
David Williams
2012-12-29 21:48:55 +01:00
parent 9051e7558e
commit d6c4cfb9f3
2 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,8 +117,6 @@ namespace PolyVox
/// Destructor
~RawVolume();
VoxelType getInterpolatedValue(float fXPos, float fYPos, float fZPos); //Should be const
VoxelType getInterpolatedValue(const Vector3DFloat& v3dPos); //Should be const
/// Gets a voxel at the position given by <tt>x,y,z</tt> coordinates
VoxelType getVoxel(int32_t uXPos, int32_t uYPos, int32_t uZPos) const;
/// Gets a voxel at the position given by a 3D vector

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

@@ -73,45 +73,6 @@ namespace PolyVox
assert(false); // See function comment above.
}
template <typename VoxelType>
VoxelType RawVolume<VoxelType>::getInterpolatedValue(float fXPos, float fYPos, float fZPos) //Should be const
{
Sampler sampler(this);
int32_t iLowerX = roundTowardsNegInf(fXPos);
int32_t iLowerY = roundTowardsNegInf(fYPos);
int32_t iLowerZ = roundTowardsNegInf(fZPos);
float fOffsetX = fXPos - iLowerX;
float fOffsetY = fYPos - iLowerY;
float fOffsetZ = fZPos - iLowerZ;
/*int32_t iCeilX = iFloorX + 1;
int32_t iCeilY = iFloorY + 1;
int32_t iCeilZ = iFloorZ + 1;*/
sampler.setPosition(iLowerX, iLowerY, iLowerZ);
VoxelType v000 = sampler.peekVoxel0px0py0pz();
VoxelType v100 = sampler.peekVoxel1px0py0pz();
VoxelType v010 = sampler.peekVoxel0px1py0pz();
VoxelType v110 = sampler.peekVoxel1px1py0pz();
VoxelType v001 = sampler.peekVoxel0px0py1pz();
VoxelType v101 = sampler.peekVoxel1px0py1pz();
VoxelType v011 = sampler.peekVoxel0px1py1pz();
VoxelType v111 = sampler.peekVoxel1px1py1pz();
VoxelType result = trilerp(v000, v100, v010, v110, v001, v101, v011, v111, fOffsetX, fOffsetY, fOffsetZ);
return result;
}
template <typename VoxelType>
VoxelType RawVolume<VoxelType>::getInterpolatedValue(const Vector3DFloat& v3dPos) //Should be const
{
return getInterpolatedValue(v3dPos.getX(), v3dPos.getY(), v3dPos.getZ());
}
////////////////////////////////////////////////////////////////////////////////
/// \param uXPos The \c x position of the voxel
/// \param uYPos The \c y position of the voxel