From 12246d163312264988278fa08326ccd16d76ada3 Mon Sep 17 00:00:00 2001 From: David Williams Date: Mon, 5 May 2014 20:58:35 +0200 Subject: [PATCH] The PositionMaterial class can now be removed as we're not using it. --- .../PolyVoxCore/PolyVoxForwardDeclarations.h | 5 --- .../include/PolyVoxCore/VertexTypes.h | 21 ----------- library/PolyVoxCore/source/VertexTypes.cpp | 35 ------------------- 3 files changed, 61 deletions(-) diff --git a/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h b/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h index 702e786a..75df4b80 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h +++ b/library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h @@ -129,11 +129,6 @@ namespace PolyVox //////////////////////////////////////////////////////////////////////////////// template class Pager; - //////////////////////////////////////////////////////////////////////////////// - // PositionMaterial - //////////////////////////////////////////////////////////////////////////////// - class PositionMaterial; - //////////////////////////////////////////////////////////////////////////////// // PositionMaterialNormal //////////////////////////////////////////////////////////////////////////////// diff --git a/library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h b/library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h index 033fad6b..e743ed32 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h +++ b/library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h @@ -33,27 +33,6 @@ freely, subject to the following restrictions: 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 class PositionMaterialNormal #else diff --git a/library/PolyVoxCore/source/VertexTypes.cpp b/library/PolyVoxCore/source/VertexTypes.cpp index db41759e..dd043554 100644 --- a/library/PolyVoxCore/source/VertexTypes.cpp +++ b/library/PolyVoxCore/source/VertexTypes.cpp @@ -72,39 +72,4 @@ namespace PolyVox { 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; - } }