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

Changes to type usage for Density and Material classes.

Browse Source
This commit is contained in:
David Williams
2011-10-07 22:17:39 +01:00
parent f7054d8095
commit a9c15f8546
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
library/PolyVoxCore/include/PolyVoxCore/Density.h
View File

@ -42,12 +42,12 @@ namespace PolyVox
///
/// \sa Material, MaterialDensityPair
////////////////////////////////////////////////////////////////////////////////
template <typename Type>
template <typename DensityType>
class Density
{
public:
Density() : m_uDensity(0) {}
Density(Type uDensity) : m_uDensity(uDensity) {}
Density(DensityType uDensity) : m_uDensity(uDensity) {}
bool operator==(const Density& rhs) const throw()
{
@ -59,18 +59,18 @@ namespace PolyVox
return !(*this == rhs);
}
Type getDensity() const throw() { return m_uDensity; }
Type getMaterial() const throw() { return 1; }
DensityType getDensity() const throw() { return m_uDensity; }
uint32_t getMaterial() const throw() { return 1; }
void setDensity(Type uDensity) { m_uDensity = uDensity; }
void setMaterial(Type uMaterial) { assert(false); } //Cannot set material on voxel of type Density
void setDensity(DensityType uDensity) { m_uDensity = uDensity; }
void setMaterial(uint32_t uMaterial) { assert(false); } //Cannot set material on voxel of type Density
static Type getMaxDensity() throw() { return (0x01 << (sizeof(Type) * 8)) - 1; }
static Type getMinDensity() throw() { return 0; }
static Type getThreshold() throw() {return 0x01 << ((sizeof(Type) * 8) - 1);}
static DensityType getMaxDensity() throw() { return (0x01 << (sizeof(DensityType) * 8)) - 1; }
static DensityType getMinDensity() throw() { return 0; }
static DensityType getThreshold() throw() {return 0x01 << ((sizeof(DensityType) * 8) - 1);}
private:
Type m_uDensity;
DensityType m_uDensity;
};
typedef Density<uint8_t> Density8;