Moved various files from PolyVoxCore to PolyVoxImpl.

This commit is contained in:
David Williams 2009-04-01 22:51:13 +00:00
parent a719aec2e7
commit bd1d2b2244
32 changed files with 33 additions and 77 deletions

View File

@ -8,7 +8,7 @@
#include "PolyVoxCore/Volume.h"
#include "PolyVoxCore/IndexedSurfacePatch.h"
#include "PolyVoxCore/SurfaceExtractors.h"
#include "PolyVoxCore/Utility.h"
#include "PolyVoxCore/PolyVoxImpl/Utility.h"
#include "OpenGLImmediateModeSupport.h"
#include "OpenGLVertexBufferObjectSupport.h"

View File

@ -1,7 +1,7 @@
#include "PolyVoxCore/Volume.h"
#include "PolyVoxCore/IndexedSurfacePatch.h"
#include "PolyVoxCore/SurfaceExtractors.h"
#include "PolyVoxCore/Utility.h"
#include "PolyVoxCore/PolyVoxImpl/Utility.h"
#include "OpenGLImmediateModeSupport.h"
#include "OpenGLVertexBufferObjectSupport.h"

View File

@ -6,32 +6,24 @@ PROJECT(PolyVoxCore)
SET(CORE_SRC_FILES
source/PolyVoxCore/GradientEstimators.cpp
source/PolyVoxCore/IndexedSurfacePatch.cpp
source/PolyVoxCore/MarchingCubesTables.cpp
source/PolyVoxCore/Region.cpp
source/PolyVoxCore/SurfaceAdjusters.cpp
source/PolyVoxCore/SurfaceExtractors.cpp
source/PolyVoxCore/SurfaceVertex.cpp
source/PolyVoxCore/Utility.cpp
source/PolyVoxCore/VoxelFilters.cpp
)
#Projects headers files
SET(CORE_INC_FILES
include/PolyVoxCore/BlockData.h
include/PolyVoxCore/BlockData.inl
include/PolyVoxCore/Constants.h
include/PolyVoxCore/Enums.h
include/PolyVoxCore/GradientEstimators.h
include/PolyVoxCore/GradientEstimators.inl
include/PolyVoxCore/IndexedSurfacePatch.h
include/PolyVoxCore/MarchingCubesTables.h
include/PolyVoxCore/PolyVoxForwardDeclarations.h
include/PolyVoxCore/Region.h
include/PolyVoxCore/SurfaceAdjusters.h
include/PolyVoxCore/SurfaceExtractors.h
include/PolyVoxCore/SurfaceVertex.h
include/PolyVoxCore/TypeDef.h
include/PolyVoxCore/Utility.h
include/PolyVoxCore/Vector.h
include/PolyVoxCore/Vector.inl
include/PolyVoxCore/Volume.h
@ -44,14 +36,21 @@ SET(CORE_INC_FILES
SET(IMPL_SRC_FILES
source/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.cpp
source/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.cpp
source/PolyVoxCore/PolyVoxImpl/MarchingCubesTables.cpp
source/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.cpp
source/PolyVoxCore/PolyVoxImpl/Utility.cpp
)
SET(IMPL_INC_FILES
include/PolyVoxCore/PolyVoxImpl/BlockData.h
include/PolyVoxCore/PolyVoxImpl/BlockData.inl
include/PolyVoxCore/PolyVoxImpl/CPlusPlusZeroXSupport.h
include/PolyVoxCore/PolyVoxImpl/DecimatedSurfaceExtractor.h
include/PolyVoxCore/PolyVoxImpl/FastSurfaceExtractor.h
include/PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h
include/PolyVoxCore/PolyVoxImpl/ReferenceSurfaceExtractor.h
include/PolyVoxCore/PolyVoxImpl/TypeDef.h
include/PolyVoxCore/PolyVoxImpl/Utility.h
)
#Projects source files

View File

@ -1,32 +0,0 @@
#pragma region License
/******************************************************************************
This file is part of the PolyVox library
Copyright (C) 2006 David Williams
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
******************************************************************************/
#pragma endregion
#ifndef __PolyVox_Constants_H__
#define __PolyVox_Constants_H__
#include "PolyVoxForwardDeclarations.h"
namespace PolyVox
{
}
#endif

View File

@ -26,10 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
#include "Constants.h"
#include "PolyVoxForwardDeclarations.h"
#include "SurfaceVertex.h"
#include "TypeDef.h"
#include "PolyVoxImpl/TypeDef.h"
namespace PolyVox
{

View File

@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __PolyVoxImpl_DecimatedSurfaceExtractor_H__
#pragma region Headers
#include "PolyVoxCore/Constants.h"
#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
#include "PolyVoxCore/TypeDef.h"
#include "PolyVoxCore/PolyVoxImpl/TypeDef.h"
#include "CPlusPlusZeroXSupport.h"
#pragma endregion

View File

@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __PolyVoxImpl_FastSurfaceExtractor_H__
#pragma region Headers
#include "PolyVoxCore/Constants.h"
#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
#include "PolyVoxCore/TypeDef.h"
#include "PolyVoxCore/PolyVoxImpl/TypeDef.h"
#include "CPlusPlusZeroXSupport.h"
#pragma endregion

View File

@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __PolyVoxImpl_ReferenceSurfaceExtractor_H__
#pragma region Headers
#include "PolyVoxCore/Constants.h"
#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
#include "PolyVoxCore/TypeDef.h"
#include "PolyVoxCore/PolyVoxImpl/TypeDef.h"
#include "CPlusPlusZeroXSupport.h"
#pragma endregion

View File

@ -22,10 +22,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef __PolyVox_Utility_H__
#define __PolyVox_Utility_H__
#include "CPlusPlusZeroXSupport.h"
#include "TypeDef.h"
#include "PolyVoxForwardDeclarations.h"
#include <cassert>
namespace PolyVox

View File

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __PolyVox_Region_H__
#pragma region Headers
#include "TypeDef.h"
#include "PolyVoxImpl/TypeDef.h"
#include "Vector.h"
#pragma endregion

View File

@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __PolyVox_SurfaceAdjusters_H__
#pragma region Headers
#include "Constants.h"
#include "PolyVoxForwardDeclarations.h"
#include "TypeDef.h"
#include "PolyVoxImpl/TypeDef.h"
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"
#pragma endregion

View File

@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __PolyVox_SurfaceExtractors_H__
#pragma region Headers
#include "Constants.h"
#include "PolyVoxForwardDeclarations.h"
#include "TypeDef.h"
#include "PolyVoxImpl/TypeDef.h"
#include "PolyVoxImpl/CPlusPlusZeroXSupport.h"

View File

@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef __PolyVox_SurfaceVertex_H__
#define __PolyVox_SurfaceVertex_H__
#include "TypeDef.h"
#include "PolyVoxImpl/TypeDef.h"
#include "Vector.h"
namespace PolyVox

View File

@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma endregion
#pragma region Headers
#include "BlockData.h"
#include "PolyVoxImpl/BlockData.h"
#include "VolumeIterator.h"
#include "Region.h"
#include "Vector.h"

View File

@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#pragma endregion
#pragma region Headers
#include "BlockData.h"
#include "PolyVoxImpl/BlockData.h"
#include "Volume.h"
#include "Vector.h"
#include "Region.h"

View File

@ -23,9 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define __PolyVox_VoxelFilters_H__
#pragma region Headers
#include "Constants.h"
#include "PolyVoxForwardDeclarations.h"
#include "TypeDef.h"
#include "PolyVoxImpl/TypeDef.h"
#pragma endregion
namespace PolyVox

View File

@ -22,10 +22,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef __PolyVox_Serialization_H__
#define __PolyVox_Serialization_H__
#include "PolyVoxCore/Constants.h"
#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
#include "PolyVoxCore/Region.h"
#include "PolyVoxCore/TypeDef.h"
#include "PolyVoxCore/PolyVoxImpl/TypeDef.h"
#include <iostream>

View File

@ -24,10 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <list>
#include "PolyVoxCore/Constants.h"
#include "PolyVoxCore/PolyVoxForwardDeclarations.h"
#include "PolyVoxCore/Region.h"
#include "PolyVoxCore/TypeDef.h"
#include "PolyVoxCore/PolyVoxImpl/TypeDef.h"
namespace PolyVox
{

View File

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "PolyVoxCore/Volume.h"
#include "PolyVoxCore/GradientEstimators.h"
#include "PolyVoxCore/IndexedSurfacePatch.h"
#include "PolyVoxCore/MarchingCubesTables.h"
#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h"
#include "PolyVoxCore/Region.h"
#include "PolyVoxCore/VolumeIterator.h"

View File

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "PolyVoxCore/VolumeIterator.h"
#include "PolyVoxCore/IndexedSurfacePatch.h"
#include "PolyVoxCore/MarchingCubesTables.h"
#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h"
#include "PolyVoxCore/SurfaceVertex.h"
namespace PolyVox

View File

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// http://local.wasp.uwa.edu.au/~pbourke/geometry/polygonise/index.html
#include "PolyVoxCore/MarchingCubesTables.h"
#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h"
namespace PolyVox
{

View File

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "PolyVoxCore/Volume.h"
#include "PolyVoxCore/VolumeIterator.h"
#include "PolyVoxCore/IndexedSurfacePatch.h"
#include "PolyVoxCore/MarchingCubesTables.h"
#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h"
#include "PolyVoxCore/Region.h"
#include "PolyVoxCore/SurfaceVertex.h"
#include "PolyVoxCore/Vector.h"

View File

@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
******************************************************************************/
#pragma endregion
#include "PolyVoxCore/Utility.h"
#include "PolyVoxCore/PolyVoxImpl/Utility.h"
#include <cassert>
#include <stdexcept>

View File

@ -3,7 +3,7 @@
#include "PolyVoxCore/VolumeIterator.h"
#include "PolyVoxCore/GradientEstimators.h"
#include "PolyVoxCore/IndexedSurfacePatch.h"
#include "PolyVoxCore/Utility.h"
#include "PolyVoxCore/PolyVoxImpl/Utility.h"
#include "PolyVoxCore/VoxelFilters.h"
#include <vector>

View File

@ -3,7 +3,7 @@
#include "PolyVoxCore/Volume.h"
#include "PolyVoxCore/GradientEstimators.h"
#include "PolyVoxCore/IndexedSurfacePatch.h"
#include "PolyVoxCore/MarchingCubesTables.h"
#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h"
#include "PolyVoxCore/Region.h"
#include "PolyVoxCore/SurfaceAdjusters.h"
#include "PolyVoxCore/VolumeIterator.h"

View File

@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <sstream>
#include "PolyVoxCore/Constants.h"
#include "PolyVoxCore/SurfaceVertex.h"
namespace PolyVox

View File

@ -2,7 +2,7 @@
#include "PolyVoxCore/Volume.h"
#include "PolyVoxCore/VolumeIterator.h"
#include "PolyVoxCore/Utility.h"
#include "PolyVoxCore/PolyVoxImpl/Utility.h"
using namespace std;

View File

@ -23,10 +23,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "PolyVoxCore/GradientEstimators.h"
#include "PolyVoxCore/IndexedSurfacePatch.h"
#include "PolyVoxCore/MarchingCubesTables.h"
#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h"
#include "PolyVoxCore/SurfaceExtractors.h"
#include "PolyVoxCore/SurfaceVertex.h"
#include "PolyVoxCore/Utility.h"
#include "PolyVoxCore/PolyVoxImpl/Utility.h"
#include "PolyVoxCore/Vector.h"
#include "PolyVoxCore/Volume.h"
#include "PolyVoxCore/VolumeIterator.h"