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

Renamed parameters as 'from' is a reserved word in Python.

Browse Source
This commit is contained in:
unknown 2012-07-15 21:27:04 +02:00
parent 68077e2d79
commit 1dd37c8a7a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/PolyVoxCore/include/PolyVoxCore/Material.h
View File

@ -75,11 +75,11 @@ namespace PolyVox
MaterialType getMaterial() const throw() { return m_uMaterial; } MaterialType getMaterial() const throw() { return m_uMaterial; }
void setMaterial(MaterialType uMaterial) { m_uMaterial = uMaterial; } void setMaterial(MaterialType uMaterial) { m_uMaterial = uMaterial; }
static bool isQuadNeeded(Material<Type> from, Material<Type> to, float& materialToUse) static bool isQuadNeeded(Material<Type> back, Material<Type> front, float& materialToUse)
{ {
if((from.getMaterial() > 0) && (to.getMaterial() == 0)) if((back.getMaterial() > 0) && (front.getMaterial() == 0))
{ {
materialToUse = static_cast<float>(from.getMaterial()); materialToUse = static_cast<float>(back.getMaterial());
return true; return true;
} }
else else

6
library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
View File

@ -96,11 +96,11 @@ namespace PolyVox
static DensityType getMaxDensity() throw() { return (0x01 << NoOfDensityBits) - 1; } static DensityType getMaxDensity() throw() { return (0x01 << NoOfDensityBits) - 1; }
static DensityType getMinDensity() throw() { return 0; } static DensityType getMinDensity() throw() { return 0; }
static bool isQuadNeeded(MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> from, MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> to, float& materialToUse) static bool isQuadNeeded(MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> back, MaterialDensityPair<Type, NoOfMaterialBits, NoOfDensityBits> front, float& materialToUse)
{ {
if((from.getMaterial() > 0) && (to.getMaterial() == 0)) if((back.getMaterial() > 0) && (front.getMaterial() == 0))
{ {
materialToUse = static_cast<float>(from.getMaterial()); materialToUse = static_cast<float>(back.getMaterial());
return true; return true;
} }
else else