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

Compile fixes for GCC.

Browse Source
This commit is contained in:
p265186
2012-12-06 16:49:38 +01:00
parent d19f16ef64
commit 19a1f99723
7 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,12 +160,12 @@ namespace PolyVox
case WrapModes::Clamp:
{
//Perform clamping
uXPos = (std::max)(uXPos, m_regValidRegion.getLowerX());
uYPos = (std::max)(uYPos, m_regValidRegion.getLowerY());
uZPos = (std::max)(uZPos, m_regValidRegion.getLowerZ());
uXPos = (std::min)(uXPos, m_regValidRegion.getUpperX());
uYPos = (std::min)(uYPos, m_regValidRegion.getUpperY());
uZPos = (std::min)(uZPos, m_regValidRegion.getUpperZ());
uXPos = (std::max)(uXPos, this->m_regValidRegion.getLowerX());
uYPos = (std::max)(uYPos, this->m_regValidRegion.getLowerY());
uZPos = (std::max)(uZPos, this->m_regValidRegion.getLowerZ());
uXPos = (std::min)(uXPos, this->m_regValidRegion.getUpperX());
uYPos = (std::min)(uYPos, this->m_regValidRegion.getUpperY());
uZPos = (std::min)(uZPos, this->m_regValidRegion.getUpperZ());
//Get the voxel value
return getVoxel(uXPos, uYPos, uZPos);
@@ -173,7 +173,7 @@ namespace PolyVox
}
case WrapModes::Border:
{
if(m_regValidRegion.containsPoint(uXPos, uYPos, uZPos))
if(this->m_regValidRegion.containsPoint(uXPos, uYPos, uZPos))
{
return getVoxel(uXPos, uYPos, uZPos);
}