Removed redundant comparison operators from VoxelTypes.
This commit is contained in:
parent
03b690673a
commit
ba6cd1c872
@ -58,16 +58,6 @@ namespace PolyVox
|
|||||||
return !(*this == rhs);
|
return !(*this == rhs);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator<(const Density& rhs) const throw()
|
|
||||||
{
|
|
||||||
if (m_uDensity < rhs.m_uDensity)
|
|
||||||
return true;
|
|
||||||
if (rhs.m_uDensity < m_uDensity)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Type getDensity() const throw() { return m_uDensity; }
|
Type getDensity() const throw() { return m_uDensity; }
|
||||||
Type getMaterial() const throw() { return 1; }
|
Type getMaterial() const throw() { return 1; }
|
||||||
|
|
||||||
|
@ -61,16 +61,6 @@ namespace PolyVox
|
|||||||
return !(*this == rhs);
|
return !(*this == rhs);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator<(const Material& rhs) const throw()
|
|
||||||
{
|
|
||||||
if (m_uMaterial < rhs.m_uMaterial)
|
|
||||||
return true;
|
|
||||||
if (rhs.m_uMaterial < m_uMaterial)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Type getDensity() const throw()
|
Type getDensity() const throw()
|
||||||
{
|
{
|
||||||
//We don't actually have a density, so make one up based on the material.
|
//We don't actually have a density, so make one up based on the material.
|
||||||
|
@ -60,20 +60,6 @@ namespace PolyVox
|
|||||||
return !(*this == rhs);
|
return !(*this == rhs);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator<(const MaterialDensityPair& rhs) const throw()
|
|
||||||
{
|
|
||||||
if (m_uMaterial < rhs.m_uMaterial)
|
|
||||||
return true;
|
|
||||||
if (rhs.m_uMaterial < m_uMaterial)
|
|
||||||
return false;
|
|
||||||
if (m_uDensity < rhs.m_uDensity)
|
|
||||||
return true;
|
|
||||||
if (rhs.m_uDensity < m_uDensity)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
Type getDensity() const throw() { return m_uDensity; }
|
Type getDensity() const throw() { return m_uDensity; }
|
||||||
Type getMaterial() const throw() { return m_uMaterial; }
|
Type getMaterial() const throw() { return m_uMaterial; }
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user