Renamed 'PolyVoxImpl' to just 'Impl'.
This commit is contained in:
parent
3c69bb651f
commit
d4edc1047e
@ -57,7 +57,7 @@ endif()
|
||||
|
||||
if(MSVC AND (MSVC_VERSION LESS 1600))
|
||||
# Require boost for older (pre-vc2010) Visual Studio compilers
|
||||
# See library/include/polyvoximpl/TypeDef.h
|
||||
# See library/include/polyvoxcore/impl/TypeDef.h
|
||||
find_package(Boost REQUIRED)
|
||||
include_directories(${Boost_INCLUDE_DIRS})
|
||||
endif()
|
||||
|
@ -31,7 +31,7 @@ freely, subject to the following restrictions:
|
||||
|
||||
#include "PolyVoxCore/LargeVolume.h"
|
||||
#include "PolyVoxCore/SurfaceMesh.h"
|
||||
#include "PolyVoxCore/PolyVoxImpl/Utility.h"
|
||||
#include "PolyVoxCore/Impl/Utility.h"
|
||||
|
||||
#include "OpenGLImmediateModeSupport.h"
|
||||
#include "OpenGLVertexBufferObjectSupport.h"
|
||||
|
@ -27,7 +27,7 @@ freely, subject to the following restrictions:
|
||||
#include "PolyVoxCore/LowPassFilter.h"
|
||||
#include "PolyVoxCore/RawVolume.h"
|
||||
#include "PolyVoxCore/SurfaceMesh.h"
|
||||
#include "PolyVoxCore/PolyVoxImpl/Utility.h"
|
||||
#include "PolyVoxCore/Impl/Utility.h"
|
||||
|
||||
#include "OpenGLImmediateModeSupport.h"
|
||||
#include "OpenGLVertexBufferObjectSupport.h"
|
||||
|
@ -97,25 +97,25 @@ SET(CORE_INC_FILES
|
||||
)
|
||||
|
||||
SET(IMPL_SRC_FILES
|
||||
source/PolyVoxImpl/MarchingCubesTables.cpp
|
||||
source/PolyVoxImpl/RandomUnitVectors.cpp
|
||||
source/PolyVoxImpl/RandomVectors.cpp
|
||||
source/PolyVoxImpl/Utility.cpp
|
||||
source/Impl/MarchingCubesTables.cpp
|
||||
source/Impl/RandomUnitVectors.cpp
|
||||
source/Impl/RandomVectors.cpp
|
||||
source/Impl/Utility.cpp
|
||||
)
|
||||
|
||||
SET(IMPL_INC_FILES
|
||||
include/PolyVoxCore/PolyVoxImpl/ArraySizesImpl.h
|
||||
include/PolyVoxCore/PolyVoxImpl/ArraySizesImpl.inl
|
||||
include/PolyVoxCore/PolyVoxImpl/AStarPathfinderImpl.h
|
||||
include/PolyVoxCore/PolyVoxImpl/Block.h
|
||||
include/PolyVoxCore/PolyVoxImpl/Block.inl
|
||||
include/PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h
|
||||
include/PolyVoxCore/PolyVoxImpl/RandomUnitVectors.h
|
||||
include/PolyVoxCore/PolyVoxImpl/RandomVectors.h
|
||||
include/PolyVoxCore/PolyVoxImpl/SubArray.h
|
||||
include/PolyVoxCore/PolyVoxImpl/SubArray.inl
|
||||
include/PolyVoxCore/PolyVoxImpl/TypeDef.h
|
||||
include/PolyVoxCore/PolyVoxImpl/Utility.h
|
||||
include/PolyVoxCore/Impl/ArraySizesImpl.h
|
||||
include/PolyVoxCore/Impl/ArraySizesImpl.inl
|
||||
include/PolyVoxCore/Impl/AStarPathfinderImpl.h
|
||||
include/PolyVoxCore/Impl/Block.h
|
||||
include/PolyVoxCore/Impl/Block.inl
|
||||
include/PolyVoxCore/Impl/MarchingCubesTables.h
|
||||
include/PolyVoxCore/Impl/RandomUnitVectors.h
|
||||
include/PolyVoxCore/Impl/RandomVectors.h
|
||||
include/PolyVoxCore/Impl/SubArray.h
|
||||
include/PolyVoxCore/Impl/SubArray.inl
|
||||
include/PolyVoxCore/Impl/TypeDef.h
|
||||
include/PolyVoxCore/Impl/Utility.h
|
||||
)
|
||||
|
||||
#NOTE: The following line should be uncommented when building shared libs.
|
||||
@ -125,8 +125,8 @@ SET(IMPL_INC_FILES
|
||||
SOURCE_GROUP("Sources" FILES ${CORE_SRC_FILES})
|
||||
SOURCE_GROUP("Headers" FILES ${CORE_INC_FILES})
|
||||
|
||||
SOURCE_GROUP("Sources\\PolyVoxImpl" FILES ${IMPL_SRC_FILES})
|
||||
SOURCE_GROUP("Headers\\PolyVoxImpl" FILES ${IMPL_INC_FILES})
|
||||
SOURCE_GROUP("Sources\\Impl" FILES ${IMPL_SRC_FILES})
|
||||
SOURCE_GROUP("Headers\\Impl" FILES ${IMPL_INC_FILES})
|
||||
|
||||
#Tell CMake the paths
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||
@ -158,7 +158,7 @@ IF(WIN32)
|
||||
ARCHIVE DESTINATION PolyVoxCore/lib COMPONENT library
|
||||
)
|
||||
|
||||
#Install the core header files, including the ones in the PolyVoxImpl subfolder.
|
||||
#Install the core header files, including the ones in the Impl subfolder.
|
||||
INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE)
|
||||
|
||||
#On windows, we also install the debug information. It's unfortunate that we have to hard-code
|
||||
@ -173,6 +173,6 @@ ELSE(WIN32)
|
||||
ARCHIVE DESTINATION lib COMPONENT library
|
||||
)
|
||||
|
||||
#Install the core header files, including the ones in the PolyVoxImpl subfolder.
|
||||
#Install the core header files, including the ones in the Impl subfolder.
|
||||
INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE)
|
||||
ENDIF(WIN32)
|
||||
|
@ -24,8 +24,8 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_AStarPathfinder_H__
|
||||
#define __PolyVox_AStarPathfinder_H__
|
||||
|
||||
#include "PolyVoxImpl/AStarPathfinderImpl.h"
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/AStarPathfinderImpl.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
#include "PolyVoxCore/Array.h"
|
||||
|
||||
|
@ -24,8 +24,8 @@ freely, subject to the following restrictions:
|
||||
#ifndef __AmbientOcclusionCalculator_H__
|
||||
#define __AmbientOcclusionCalculator_H__
|
||||
|
||||
#include "PolyVoxImpl/RandomUnitVectors.h"
|
||||
#include "PolyVoxImpl/RandomVectors.h"
|
||||
#include "Impl/RandomUnitVectors.h"
|
||||
#include "Impl/RandomVectors.h"
|
||||
|
||||
#include "PolyVoxCore/Array.h"
|
||||
#include "PolyVoxCore/Region.h"
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_Array_H__
|
||||
#define __PolyVox_Array_H__
|
||||
|
||||
#include "PolyVoxImpl/SubArray.h"
|
||||
#include "Impl/SubArray.h"
|
||||
|
||||
#include "PolyVoxCore/ArraySizes.h" //Not strictly required, but convienient
|
||||
|
||||
|
@ -24,8 +24,8 @@ distribution.
|
||||
#ifndef __PolyVox_ArraySizes_H__
|
||||
#define __PolyVox_ArraySizes_H__
|
||||
|
||||
#include "PolyVoxImpl/ArraySizesImpl.h"
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/ArraySizesImpl.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
namespace PolyVox
|
||||
{
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_CubicSurfaceExtractor_H__
|
||||
#define __PolyVox_CubicSurfaceExtractor_H__
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
#include "PolyVoxCore/Array.h"
|
||||
#include "PolyVoxCore/DefaultIsQuadNeeded.h"
|
||||
|
@ -26,7 +26,7 @@ freely, subject to the following restrictions:
|
||||
|
||||
#include "PolyVoxCore/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
#include <cassert>
|
||||
#include <limits>
|
||||
|
@ -24,7 +24,7 @@ distribution.
|
||||
#ifndef __PolyVox_ArraySizesImpl_H__
|
||||
#define __PolyVox_ArraySizesImpl_H__
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
namespace PolyVox
|
||||
{
|
||||
@ -56,6 +56,6 @@ namespace PolyVox
|
||||
};
|
||||
}//namespace PolyVox
|
||||
|
||||
#include "PolyVoxImpl/ArraySizesImpl.inl"
|
||||
#include "Impl/ArraySizesImpl.inl"
|
||||
|
||||
#endif //__PolyVox_ArraySizesImpl_H__
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_Block_H__
|
||||
#define __PolyVox_Block_H__
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
#include "PolyVoxCore/Vector.h"
|
||||
|
||||
#include <limits>
|
||||
@ -73,6 +73,6 @@ namespace PolyVox
|
||||
};
|
||||
}
|
||||
|
||||
#include "PolyVoxImpl/Block.inl"
|
||||
#include "Impl/Block.inl"
|
||||
|
||||
#endif
|
@ -21,7 +21,7 @@ freely, subject to the following restrictions:
|
||||
distribution.
|
||||
*******************************************************************************/
|
||||
|
||||
#include "PolyVoxImpl/Utility.h"
|
||||
#include "Impl/Utility.h"
|
||||
#include "PolyVoxCore/Vector.h"
|
||||
|
||||
#include <cassert>
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_MarchingCubeTables_H__
|
||||
#define __PolyVox_MarchingCubeTables_H__
|
||||
|
||||
#include "PolyVoxCore/PolyVoxImpl/TypeDef.h"
|
||||
#include "PolyVoxCore/Impl/TypeDef.h"
|
||||
|
||||
namespace PolyVox
|
||||
{
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_RandomUnitVectors_H__
|
||||
#define __PolyVox_RandomUnitVectors_H__
|
||||
|
||||
#include "PolyVoxCore/PolyVoxImpl/TypeDef.h"
|
||||
#include "PolyVoxCore/Impl/TypeDef.h"
|
||||
|
||||
#include "PolyVoxCore/Vector.h"
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_RandomVectors_H__
|
||||
#define __PolyVox_RandomVectors_H__
|
||||
|
||||
#include "PolyVoxCore/PolyVoxImpl/TypeDef.h"
|
||||
#include "PolyVoxCore/Impl/TypeDef.h"
|
||||
|
||||
#include "PolyVoxCore/Vector.h"
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_SubArray_H__
|
||||
#define __PolyVox_SubArray_H__
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
namespace PolyVox
|
||||
{
|
||||
@ -83,6 +83,6 @@ namespace PolyVox
|
||||
};
|
||||
}//namespace PolyVox
|
||||
|
||||
#include "PolyVoxImpl/SubArray.inl"
|
||||
#include "Impl/SubArray.inl"
|
||||
|
||||
#endif //__PolyVox_SubArray_H__
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_Utility_H__
|
||||
#define __PolyVox_Utility_H__
|
||||
|
||||
#include "PolyVoxCore/PolyVoxImpl/TypeDef.h"
|
||||
#include "PolyVoxCore/Impl/TypeDef.h"
|
||||
|
||||
#include <cassert>
|
||||
|
@ -25,7 +25,7 @@ freely, subject to the following restrictions:
|
||||
#define __PolyVox_LargeVolume_H__
|
||||
|
||||
#include "PolyVoxCore/BaseVolume.h"
|
||||
#include "PolyVoxImpl/Block.h"
|
||||
#include "Impl/Block.h"
|
||||
#include "PolyVoxCore/Log.h"
|
||||
#include "PolyVoxCore/Region.h"
|
||||
#include "PolyVoxCore/Vector.h"
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_Log_H__
|
||||
#define __PolyVox_Log_H__
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
|
@ -24,8 +24,8 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_SurfaceExtractor_H__
|
||||
#define __PolyVox_SurfaceExtractor_H__
|
||||
|
||||
#include "PolyVoxImpl/MarchingCubesTables.h"
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/MarchingCubesTables.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
#include "PolyVoxCore/Array.h"
|
||||
#include "PolyVoxCore/SurfaceMesh.h"
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_Material_H__
|
||||
#define __PolyVox_Material_H__
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
#include "PolyVoxCore/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type
|
||||
|
||||
|
@ -27,7 +27,7 @@ freely, subject to the following restrictions:
|
||||
#include "PolyVoxCore/DefaultIsQuadNeeded.h" //we'll specialise this function for this voxel type
|
||||
#include "PolyVoxCore/DefaultMarchingCubesController.h" //We'll specialise the controller contained in here
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
namespace PolyVox
|
||||
{
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_ForwardDeclarations_H__
|
||||
#define __PolyVox_ForwardDeclarations_H__
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
namespace PolyVox
|
||||
{
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_Region_H__
|
||||
#define __PolyVox_Region_H__
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
#include "PolyVoxCore/Vector.h"
|
||||
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_SimpleVolume_H__
|
||||
#define __PolyVox_SimpleVolume_H__
|
||||
|
||||
#include "PolyVoxImpl/Utility.h"
|
||||
#include "Impl/Utility.h"
|
||||
|
||||
#include "PolyVoxCore/BaseVolume.h"
|
||||
#include "PolyVoxCore/Log.h"
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_SurfaceMesh_H__
|
||||
#define __PolyVox_SurfaceMesh_H__
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
#include "PolyVoxCore/Region.h"
|
||||
#include "PolyVoxCore/VertexTypes.h" //Should probably do away with this on in the future...
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_Vector_H__
|
||||
#define __PolyVox_Vector_H__
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
#include <cassert>
|
||||
#include <cmath>
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_SurfaceVertex_H__
|
||||
#define __PolyVox_SurfaceVertex_H__
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
#include "PolyVoxCore/Vector.h"
|
||||
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_VoxelFilters_H__
|
||||
#define __PolyVox_VoxelFilters_H__
|
||||
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
|
||||
namespace PolyVox
|
||||
{
|
||||
|
@ -21,7 +21,7 @@ freely, subject to the following restrictions:
|
||||
distribution.
|
||||
*******************************************************************************/
|
||||
|
||||
#include "PolyVoxCore/PolyVoxImpl/TypeDef.h"
|
||||
#include "PolyVoxCore/Impl/TypeDef.h"
|
||||
|
||||
#include "PolyVoxCore/GradientEstimators.h"
|
||||
|
||||
|
@ -26,7 +26,7 @@ freely, subject to the following restrictions:
|
||||
|
||||
// http://local.wasp.uwa.edu.au/~pbourke/geometry/polygonise/index.html
|
||||
|
||||
#include "PolyVoxCore/PolyVoxImpl/MarchingCubesTables.h"
|
||||
#include "PolyVoxCore/Impl/MarchingCubesTables.h"
|
||||
|
||||
namespace PolyVox
|
||||
{
|
@ -21,7 +21,7 @@ freely, subject to the following restrictions:
|
||||
distribution.
|
||||
*******************************************************************************/
|
||||
|
||||
#include "PolyVoxCore/PolyVoxImpl/RandomUnitVectors.h"
|
||||
#include "PolyVoxCore/Impl/RandomUnitVectors.h"
|
||||
|
||||
namespace PolyVox
|
||||
{
|
@ -21,7 +21,7 @@ freely, subject to the following restrictions:
|
||||
distribution.
|
||||
*******************************************************************************/
|
||||
|
||||
#include "PolyVoxCore/PolyVoxImpl/RandomVectors.h"
|
||||
#include "PolyVoxCore/Impl/RandomVectors.h"
|
||||
|
||||
namespace PolyVox
|
||||
{
|
@ -21,7 +21,7 @@ freely, subject to the following restrictions:
|
||||
distribution.
|
||||
*******************************************************************************/
|
||||
|
||||
#include "PolyVoxCore/PolyVoxImpl/Utility.h"
|
||||
#include "PolyVoxCore/Impl/Utility.h"
|
||||
|
||||
#include <cassert>
|
||||
#include <stdexcept>
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_Serialization_H__
|
||||
#define __PolyVox_Serialization_H__
|
||||
|
||||
#include "PolyVoxImpl/Utility.h"
|
||||
#include "Impl/Utility.h"
|
||||
|
||||
#include "PolyVoxCore/Region.h"
|
||||
|
||||
|
@ -24,7 +24,7 @@ freely, subject to the following restrictions:
|
||||
#ifndef __PolyVox_VolumeChangeTracker_H__
|
||||
#define __PolyVox_VolumeChangeTracker_H__
|
||||
|
||||
#include "PolyVoxImpl/Utility.h"
|
||||
#include "Impl/Utility.h"
|
||||
|
||||
#include "PolyVoxCore/Region.h"
|
||||
#include "PolyVoxCore/SurfaceMesh.h"
|
||||
|
@ -1,4 +1,4 @@
|
||||
#include "PolyVoxCore/PolyVoxImpl/TypeDef.h"
|
||||
#include "PolyVoxCore/Impl/TypeDef.h"
|
||||
|
||||
namespace PolyVox
|
||||
{
|
||||
|
@ -1,11 +1,11 @@
|
||||
%module VertexTypes
|
||||
%{
|
||||
#include "PolyVoxImpl/TypeDef.h"
|
||||
#include "Impl/TypeDef.h"
|
||||
#include "Vector.h"
|
||||
#include "VertexTypes.h"
|
||||
%}
|
||||
|
||||
%include "PolyVoxImpl/TypeDef.h"
|
||||
%include "Impl/TypeDef.h"
|
||||
%include "Vector.h"
|
||||
%include "VertexTypes.h"
|
||||
|
||||
|
@ -27,7 +27,7 @@ freely, subject to the following restrictions:
|
||||
#include "PolyVoxCore/Raycast.h"
|
||||
#include "PolyVoxCore/SimpleVolume.h"
|
||||
|
||||
#include "PolyVoxCore/PolyVoxImpl/RandomUnitVectors.h"
|
||||
#include "PolyVoxCore/Impl/RandomUnitVectors.h"
|
||||
|
||||
#include <QtTest>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user