diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 8711cc21..95f104f2 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -51,7 +51,6 @@ SET(CORE_INC_FILES include/PolyVoxCore/MeshDecimator.h include/PolyVoxCore/MeshDecimator.inl include/PolyVoxCore/PolyVoxForwardDeclarations.h - include/PolyVoxCore/PrimitiveVoxelTypes.h include/PolyVoxCore/RawVolume.h include/PolyVoxCore/RawVolume.inl include/PolyVoxCore/RawVolumeSampler.inl @@ -72,7 +71,6 @@ SET(CORE_INC_FILES include/PolyVoxCore/VertexTypes.h include/PolyVoxCore/VolumeResampler.h include/PolyVoxCore/VolumeResampler.inl - include/PolyVoxCore/Voxel.h include/PolyVoxCore/VoxelFilters.h ) diff --git a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h index f80e50f6..f18c8ec1 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h +++ b/library/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h @@ -28,7 +28,6 @@ freely, subject to the following restrictions: #include "PolyVoxImpl/TypeDef.h" #include "PolyVoxCore/Array.h" -#include "PolyVoxCore/Voxel.h" #include #include //For runtime_error diff --git a/library/PolyVoxCore/include/PolyVoxCore/Density.h b/library/PolyVoxCore/include/PolyVoxCore/Density.h index b5b8f8e2..98508fb5 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Density.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Density.h @@ -25,7 +25,6 @@ freely, subject to the following restrictions: #define __PolyVox_Density_H__ #include "PolyVoxCore/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here -#include "PolyVoxCore/Voxel.h" #include "PolyVoxImpl/TypeDef.h" diff --git a/library/PolyVoxCore/include/PolyVoxCore/Material.h b/library/PolyVoxCore/include/PolyVoxCore/Material.h index 9e4d98fa..cb7c43a8 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Material.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Material.h @@ -24,8 +24,6 @@ freely, subject to the following restrictions: #ifndef __PolyVox_Material_H__ #define __PolyVox_Material_H__ -#include "PolyVoxCore/Voxel.h" - #include "PolyVoxImpl/TypeDef.h" #include diff --git a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h index fb83b103..a59b175d 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h +++ b/library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h @@ -25,7 +25,6 @@ freely, subject to the following restrictions: #define __PolyVox_MaterialDensityPair_H__ #include "PolyVoxCore/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here -#include "PolyVoxCore/Voxel.h" #include "PolyVoxImpl/TypeDef.h" diff --git a/library/PolyVoxCore/include/PolyVoxCore/PrimitiveVoxelTypes.h b/library/PolyVoxCore/include/PolyVoxCore/PrimitiveVoxelTypes.h deleted file mode 100644 index bf1552ca..00000000 --- a/library/PolyVoxCore/include/PolyVoxCore/PrimitiveVoxelTypes.h +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* -Copyright (c) 2005-2009 David Williams - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. -*******************************************************************************/ - -#ifndef __PolyVox_PrimitiveVoxelTypes_H__ -#define __PolyVox_PrimitiveVoxelTypes_H__ - -#include "PolyVoxCore/Voxel.h" - -namespace PolyVox -{ - -} - -#endif //__PolyVox_PrimitiveVoxelTypes_H__ diff --git a/library/PolyVoxCore/include/PolyVoxCore/Voxel.h b/library/PolyVoxCore/include/PolyVoxCore/Voxel.h deleted file mode 100644 index e69de29b..00000000 diff --git a/library/bindings/Density.i b/library/bindings/Density.i index c85f61ff..58819de3 100644 --- a/library/bindings/Density.i +++ b/library/bindings/Density.i @@ -3,7 +3,6 @@ #include "Density.h" %} -%include "Voxel.h" %include "MarchingCubesSurfaceExtractor.h" %include "Density.h"