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

The PositionMaterial class can now be removed as we're not using it.

Browse Source
This commit is contained in:
David Williams 2014-05-05 20:58:35 +02:00
parent 5dfa7e2562
commit 12246d1633
3 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
View File

@ -129,11 +129,6 @@ namespace PolyVox
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
template <typename VoxelType> class Pager; template <typename VoxelType> class Pager;
////////////////////////////////////////////////////////////////////////////////
// PositionMaterial
////////////////////////////////////////////////////////////////////////////////
class PositionMaterial;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// PositionMaterialNormal // PositionMaterialNormal
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

21
library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h
View File

@ -33,27 +33,6 @@ freely, subject to the following restrictions:
namespace PolyVox namespace PolyVox
{ {
#ifdef SWIG
class PositionMaterial
#else
class POLYVOX_API PositionMaterial
#endif
{
public:
PositionMaterial();
PositionMaterial(Vector3DFloat positionToSet, float materialToSet);
float getMaterial(void) const;
const Vector3DFloat& getPosition(void) const;
void setMaterial(float materialToSet);
void setPosition(const Vector3DFloat& positionToSet);
public:
//Nicely fits into four floats.
Vector3DFloat position;
float material;
};
#ifdef SWIG #ifdef SWIG
class PositionMaterialNormal class PositionMaterialNormal
#else #else

35
library/PolyVoxCore/source/VertexTypes.cpp
View File

@ -72,39 +72,4 @@ namespace PolyVox
{ {
position = positionToSet; position = positionToSet;
} }
////////////////////////////////////////////////////////////////////////////////
// PositionMaterial
////////////////////////////////////////////////////////////////////////////////
PositionMaterial::PositionMaterial()
{
}
PositionMaterial::PositionMaterial(Vector3DFloat positionToSet, float materialToSet)
:position(positionToSet)
,material(materialToSet)
{
}
float PositionMaterial::getMaterial(void) const
{
return material;
}
const Vector3DFloat& PositionMaterial::getPosition(void) const
{
return position;
}
void PositionMaterial::setMaterial(float materialToSet)
{
material = materialToSet;
}
void PositionMaterial::setPosition(const Vector3DFloat& positionToSet)
{
position = positionToSet;
}
} }