diff --git a/library/PolyVoxCore/include/PolyVoxCore/Material.h b/library/PolyVoxCore/include/PolyVoxCore/Material.h index cd22abb7..9e4d98fa 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Material.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Material.h @@ -75,11 +75,11 @@ namespace PolyVox MaterialType getMaterial() const throw() { return m_uMaterial; } void setMaterial(MaterialType uMaterial) { m_uMaterial = uMaterial; } - static bool isQuadNeeded(Material from, Material to, float& materialToUse) + static bool isQuadNeeded(Material back, Material front, float& materialToUse) { - if((from.getMaterial() > 0) && (to.getMaterial() == 0)) + if((back.getMaterial() > 0) && (front.getMaterial() == 0)) { - materialToUse = static_cast(from.getMaterial()); + materialToUse = static_cast(back.getMaterial()); return true; } else diff --git a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h index 8ce8db43..58d53659 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h +++ b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h @@ -96,11 +96,11 @@ namespace PolyVox static DensityType getMaxDensity() throw() { return (0x01 << NoOfDensityBits) - 1; } static DensityType getMinDensity() throw() { return 0; } - static bool isQuadNeeded(MaterialDensityPair from, MaterialDensityPair to, float& materialToUse) + static bool isQuadNeeded(MaterialDensityPair back, MaterialDensityPair front, float& materialToUse) { - if((from.getMaterial() > 0) && (to.getMaterial() == 0)) + if((back.getMaterial() > 0) && (front.getMaterial() == 0)) { - materialToUse = static_cast(from.getMaterial()); + materialToUse = static_cast(back.getMaterial()); return true; } else