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

Removed IntegralVector3.h

Browse Source
This commit is contained in:
David Williams
2008-02-11 19:54:57 +00:00
parent e180f67bae
commit cc4902b4d7
9 changed files with 14 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/PolyVoxSceneManager.cpp
View File

@ -685,7 +685,7 @@ namespace PolyVox
uint8_t PolyVoxSceneManager::getMaterialIndexAt(uint16_t uX, uint16_t uY, uint16_t uZ)
{
if(volumeData->containsPoint(IntVector3(uX,uY,uZ),0))
if(volumeData->containsPoint(Vector3DInt32(uX,uY,uZ),0))
{
VolumeIterator volIter(*volumeData);
return volIter.getVoxelAt(uX,uY,uZ);
@ -706,7 +706,7 @@ namespace PolyVox
return volumeData->containsPoint(pos, boundary);
}
bool PolyVoxSceneManager::containsPoint(IntVector3 pos, uint16_t boundary)
bool PolyVoxSceneManager::containsPoint(Vector3DInt32 pos, uint16_t boundary)
{
return volumeData->containsPoint(pos, boundary);
}

15
source/Volume.cpp
View File

@ -17,7 +17,6 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
******************************************************************************/
#include "IntegralVector3.h"
#include "Volume.h"
#include "VolumeIterator.h"
@ -148,14 +147,14 @@ namespace PolyVox
&& (pos.z() > boundary);
}
bool Volume::containsPoint(IntVector3 pos, uint16_t boundary)
bool Volume::containsPoint(Vector3DInt32 pos, uint16_t boundary)
{
return (pos.x < OGRE_VOLUME_SIDE_LENGTH - 1 - boundary)
&& (pos.y < OGRE_VOLUME_SIDE_LENGTH - 1 - boundary)
&& (pos.z < OGRE_VOLUME_SIDE_LENGTH - 1 - boundary)
&& (pos.x > boundary)
&& (pos.y > boundary)
&& (pos.z > boundary);
return (pos.x() < OGRE_VOLUME_SIDE_LENGTH - 1 - boundary)
&& (pos.y() < OGRE_VOLUME_SIDE_LENGTH - 1 - boundary)
&& (pos.z() < OGRE_VOLUME_SIDE_LENGTH - 1 - boundary)
&& (pos.x() > boundary)
&& (pos.y() > boundary)
&& (pos.z() > boundary);
}
bool Volume::loadFromFile(const std::string& sFilename)