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

Making Cubiquity version of PolyVox more closely match develop version.

Browse Source
This commit is contained in:
David Williams
2013-08-09 20:32:20 +02:00
parent 6a009825b5
commit fcf5b2b055
13 changed files with 28 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/PolyVoxCore/source/Impl/Utility.cpp
View File

@ -69,9 +69,4 @@ namespace PolyVox
v++;
return v;
}
float triangleFilter(float fInput)
{
return (std::max)(1.0f - (std::abs)(fInput), 0.0f);
}
}

10
library/PolyVoxCore/source/Region.cpp
View File

@ -201,7 +201,7 @@ namespace PolyVox
* \param iZ The 'z' position of the point to test.
* \param boundary The desired boundary value.
*/
bool Region::containsPoint(int32_t iX, int32_t iY, int32_t iZ, int8_t boundary) const
bool Region::containsPoint(int32_t iX, int32_t iY, int32_t iZ, uint8_t boundary) const
{
return (iX <= m_iUpperX - boundary)
&& (iY <= m_iUpperY - boundary)
@ -218,7 +218,7 @@ namespace PolyVox
* \param pos The position to test.
* \param boundary The desired boundary value.
*/
bool Region::containsPoint(const Vector3DInt32& pos, int8_t boundary) const
bool Region::containsPoint(const Vector3DInt32& pos, uint8_t boundary) const
{
return containsPoint(pos.getX(), pos.getY(), pos.getZ(), boundary);
}
@ -243,7 +243,7 @@ namespace PolyVox
* \param pos The position to test.
* \param boundary The desired boundary value.
*/
bool Region::containsPointInX(int32_t pos, int8_t boundary) const
bool Region::containsPointInX(int32_t pos, uint8_t boundary) const
{
return (pos <= m_iUpperX - boundary)
&& (pos >= m_iLowerX + boundary);
@ -269,7 +269,7 @@ namespace PolyVox
* \param pos The position to test.
* \param boundary The desired boundary value.
*/
bool Region::containsPointInY(int32_t pos, int8_t boundary) const
bool Region::containsPointInY(int32_t pos, uint8_t boundary) const
{
return (pos <= m_iUpperY - boundary)
&& (pos >= m_iLowerY + boundary);
@ -295,7 +295,7 @@ namespace PolyVox
* \param pos The position to test.
* \param boundary The desired boundary value.
*/
bool Region::containsPointInZ(int32_t pos, int8_t boundary) const
bool Region::containsPointInZ(int32_t pos, uint8_t boundary) const
{
return (pos <= m_iUpperZ - boundary)
&& (pos >= m_iLowerZ + boundary);