From 16a75d06063112e4204b86c4d30c45f0f95c8bbf Mon Sep 17 00:00:00 2001
From: David Williams <david@volumesoffun.com>
Date: Sat, 7 Feb 2015 17:16:54 +0100
Subject: [PATCH] Reoranising header structure.

---
 examples/Basic/CMakeLists.txt                 |   3 +-
 examples/DecodeOnGPU/CMakeLists.txt           |   3 +-
 examples/OpenGL/CMakeLists.txt                |   3 +-
 examples/Paging/CMakeLists.txt                |   3 +-
 examples/SmoothLOD/CMakeLists.txt             |   3 +-
 include/CMakeLists.txt                        |  97 ++++++++++++-
 .../PolyVoxCore => }/AStarPathfinder.h        |   0
 .../PolyVoxCore => }/AStarPathfinder.inl      |   0
 .../AmbientOcclusionCalculator.h              |   0
 .../AmbientOcclusionCalculator.inl            |   0
 .../{include/PolyVoxCore => }/Array.h         |   0
 .../{include/PolyVoxCore => }/BaseVolume.h    |   0
 .../{include/PolyVoxCore => }/BaseVolume.inl  |   0
 .../PolyVoxCore => }/BaseVolumeSampler.inl    |   0
 include/PolyVoxCore/CMakeLists.txt            | 133 ------------------
 .../PolyVoxCore => }/CubicSurfaceExtractor.h  |   0
 .../CubicSurfaceExtractor.inl                 |   0
 .../PolyVoxCore => }/DefaultIsQuadNeeded.h    |   0
 .../DefaultMarchingCubesController.h          |   0
 .../{include/PolyVoxCore => }/Density.h       |   0
 .../{include/PolyVoxCore => }/FilePager.h     |   0
 .../PolyVoxCore => }/GradientEstimators.h     |   0
 .../PolyVoxCore => }/GradientEstimators.inl   |   0
 .../Impl/AStarPathfinderImpl.h                |   0
 .../{include/PolyVoxCore => }/Impl/Config.h   |   0
 .../PolyVoxCore => }/Impl/ErrorHandling.h     |   0
 .../{include/PolyVoxCore => }/Impl/Logging.h  |   0
 .../Impl/MarchingCubesTables.h                |   0
 .../PolyVoxCore => }/Impl/RandomUnitVectors.h |   0
 .../PolyVoxCore => }/Impl/RandomVectors.h     |   0
 .../{include/PolyVoxCore => }/Impl/Timer.h    |   0
 .../{include/PolyVoxCore => }/Impl/TypeDef.h  |   0
 .../{include/PolyVoxCore => }/Impl/Utility.h  |   0
 .../{include/PolyVoxCore => }/Interpolation.h |   0
 .../PolyVoxCore => }/IteratorController.h     |   0
 .../PolyVoxCore => }/IteratorController.inl   |   0
 .../{include/PolyVoxCore => }/LargeVolume.h   |   0
 .../{include/PolyVoxCore => }/LowPassFilter.h |   0
 .../PolyVoxCore => }/LowPassFilter.inl        |   0
 .../MarchingCubesSurfaceExtractor.h           |   0
 .../MarchingCubesSurfaceExtractor.inl         |   0
 .../{include/PolyVoxCore => }/Material.h      |   0
 .../PolyVoxCore => }/MaterialDensityPair.h    |   0
 .../{include/PolyVoxCore => }/Mesh.h          |   0
 .../{include/PolyVoxCore => }/Mesh.inl        |   0
 .../{include/PolyVoxCore => }/PagedVolume.h   |   0
 .../{include/PolyVoxCore => }/PagedVolume.inl |   0
 .../PolyVoxCore => }/PagedVolumeChunk.inl     |   0
 .../PolyVoxCore => }/PagedVolumeSampler.inl   |   0
 .../{include/PolyVoxCore => }/Picking.h       |   0
 .../{include/PolyVoxCore => }/Picking.inl     |   0
 .../PolyVoxForwardDeclarations.h              |   0
 .../{include/PolyVoxCore => }/RawVolume.h     |   0
 .../{include/PolyVoxCore => }/RawVolume.inl   |   0
 .../PolyVoxCore => }/RawVolumeSampler.inl     |   0
 .../{include/PolyVoxCore => }/Raycast.h       |   0
 .../{include/PolyVoxCore => }/Raycast.inl     |   0
 .../{include/PolyVoxCore => }/Region.h        |   0
 .../{include/PolyVoxCore => }/Region.inl      |   0
 .../{include/PolyVoxCore => }/SimpleVolume.h  |   0
 .../{include/PolyVoxCore => }/Vector.h        |   0
 .../{include/PolyVoxCore => }/Vector.inl      |   0
 .../{include/PolyVoxCore => }/Vertex.h        |   0
 .../PolyVoxCore => }/VolumeResampler.h        |   0
 .../PolyVoxCore => }/VolumeResampler.inl      |   0
 .../{include/PolyVoxCore => }/VoxelFilters.h  |   0
 .../PolyVoxCore => }/VoxelFilters.inl         |   0
 tests/CMakeLists.txt                          |   2 +-
 68 files changed, 101 insertions(+), 146 deletions(-)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/AStarPathfinder.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/AStarPathfinder.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/AmbientOcclusionCalculator.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/AmbientOcclusionCalculator.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Array.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/BaseVolume.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/BaseVolume.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/BaseVolumeSampler.inl (100%)
 delete mode 100644 include/PolyVoxCore/CMakeLists.txt
 rename include/PolyVoxCore/{include/PolyVoxCore => }/CubicSurfaceExtractor.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/CubicSurfaceExtractor.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/DefaultIsQuadNeeded.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/DefaultMarchingCubesController.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Density.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/FilePager.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/GradientEstimators.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/GradientEstimators.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/AStarPathfinderImpl.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/Config.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/ErrorHandling.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/Logging.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/MarchingCubesTables.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/RandomUnitVectors.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/RandomVectors.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/Timer.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/TypeDef.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Impl/Utility.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Interpolation.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/IteratorController.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/IteratorController.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/LargeVolume.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/LowPassFilter.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/LowPassFilter.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/MarchingCubesSurfaceExtractor.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/MarchingCubesSurfaceExtractor.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Material.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/MaterialDensityPair.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Mesh.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Mesh.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/PagedVolume.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/PagedVolume.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/PagedVolumeChunk.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/PagedVolumeSampler.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Picking.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Picking.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/PolyVoxForwardDeclarations.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/RawVolume.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/RawVolume.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/RawVolumeSampler.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Raycast.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Raycast.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Region.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Region.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/SimpleVolume.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Vector.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Vector.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/Vertex.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/VolumeResampler.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/VolumeResampler.inl (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/VoxelFilters.h (100%)
 rename include/PolyVoxCore/{include/PolyVoxCore => }/VoxelFilters.inl (100%)

diff --git a/examples/Basic/CMakeLists.txt b/examples/Basic/CMakeLists.txt
index 98e42789..43cd16b7 100644
--- a/examples/Basic/CMakeLists.txt
+++ b/examples/Basic/CMakeLists.txt
@@ -39,8 +39,7 @@ add_definitions(-DGLEW_STATIC)
 FIND_PACKAGE(OpenGL REQUIRED)
 
 #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location)
-INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include ${GLEW_SOURCE_DIR})
-LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR})
+INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}  ${PolyVoxHeaders_SOURCE_DIR} ${GLEW_SOURCE_DIR})
 
 #This will include the shader files inside the compiled binary
 QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc)
diff --git a/examples/DecodeOnGPU/CMakeLists.txt b/examples/DecodeOnGPU/CMakeLists.txt
index 60a3bfb5..071ba223 100644
--- a/examples/DecodeOnGPU/CMakeLists.txt
+++ b/examples/DecodeOnGPU/CMakeLists.txt
@@ -39,8 +39,7 @@ add_definitions(-DGLEW_STATIC)
 FIND_PACKAGE(OpenGL REQUIRED)
 
 #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location)
-INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include ${GLEW_SOURCE_DIR})
-LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR})
+INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxHeaders_SOURCE_DIR} ${GLEW_SOURCE_DIR})
 
 #This will include the shader files inside the compiled binary
 QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc)
diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt
index ef950a07..86770566 100644
--- a/examples/OpenGL/CMakeLists.txt
+++ b/examples/OpenGL/CMakeLists.txt
@@ -41,8 +41,7 @@ add_definitions(-DGLEW_STATIC)
 FIND_PACKAGE(OpenGL REQUIRED)
 
 #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location)
-INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include ${GLEW_SOURCE_DIR})
-LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR})
+INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxHeaders_SOURCE_DIR} ${GLEW_SOURCE_DIR})
 
 #This will include the shader files inside the compiled binary
 QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc)
diff --git a/examples/Paging/CMakeLists.txt b/examples/Paging/CMakeLists.txt
index cc67d64d..f6a099d5 100644
--- a/examples/Paging/CMakeLists.txt
+++ b/examples/Paging/CMakeLists.txt
@@ -41,8 +41,7 @@ add_definitions(-DGLEW_STATIC)
 FIND_PACKAGE(OpenGL REQUIRED)
 
 #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location)
-INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include ${GLEW_SOURCE_DIR})
-LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR})
+INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxHeaders_SOURCE_DIR} ${GLEW_SOURCE_DIR})
 
 #This will include the shader files inside the compiled binary
 QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc)
diff --git a/examples/SmoothLOD/CMakeLists.txt b/examples/SmoothLOD/CMakeLists.txt
index 05cf87f3..d4e32582 100644
--- a/examples/SmoothLOD/CMakeLists.txt
+++ b/examples/SmoothLOD/CMakeLists.txt
@@ -39,8 +39,7 @@ add_definitions(-DGLEW_STATIC)
 FIND_PACKAGE(OpenGL REQUIRED)
 
 #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location)
-INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include ${GLEW_SOURCE_DIR})
-LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR})
+INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR} ${PolyVoxHeaders_SOURCE_DIR} ${GLEW_SOURCE_DIR})
 
 #This will include the shader files inside the compiled binary
 QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc)
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 5e5e5e96..109d0a9e 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -22,9 +22,102 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-PROJECT(PolyVox)
+PROJECT(PolyVoxHeaders)
 
-add_subdirectory(PolyVoxCore)
+#Projects headers files
+SET(CORE_INC_FILES
+	PolyVoxCore/AmbientOcclusionCalculator.h
+	PolyVoxCore/AmbientOcclusionCalculator.inl
+	PolyVoxCore/Array.h
+	PolyVoxCore/AStarPathfinder.h
+	PolyVoxCore/AStarPathfinder.inl
+	PolyVoxCore/BaseVolume.h
+	PolyVoxCore/BaseVolume.inl
+	PolyVoxCore/BaseVolumeSampler.inl
+	PolyVoxCore/CubicSurfaceExtractor.h
+	PolyVoxCore/CubicSurfaceExtractor.inl
+	PolyVoxCore/DefaultIsQuadNeeded.h
+	PolyVoxCore/DefaultMarchingCubesController.h
+	PolyVoxCore/Density.h
+	PolyVoxCore/FilePager.h
+	PolyVoxCore/GradientEstimators.h
+	PolyVoxCore/GradientEstimators.inl
+	PolyVoxCore/Interpolation.h
+	PolyVoxCore/IteratorController.h
+	PolyVoxCore/IteratorController.inl
+	PolyVoxCore/LargeVolume.h
+	PolyVoxCore/LowPassFilter.h
+	PolyVoxCore/LowPassFilter.inl
+	PolyVoxCore/MarchingCubesSurfaceExtractor.h
+	PolyVoxCore/MarchingCubesSurfaceExtractor.inl
+	PolyVoxCore/Material.h
+	PolyVoxCore/MaterialDensityPair.h
+	PolyVoxCore/Mesh.h
+	PolyVoxCore/Mesh.inl
+	PolyVoxCore/PagedVolume.h
+	PolyVoxCore/PagedVolume.inl
+	PolyVoxCore/PagedVolumeChunk.inl
+	PolyVoxCore/PagedVolumeSampler.inl
+	PolyVoxCore/PolyVoxForwardDeclarations.h
+	PolyVoxCore/Picking.h
+	PolyVoxCore/Picking.inl
+	PolyVoxCore/RawVolume.h
+	PolyVoxCore/RawVolume.inl
+	PolyVoxCore/RawVolumeSampler.inl
+	PolyVoxCore/Raycast.h
+	PolyVoxCore/Raycast.inl
+	PolyVoxCore/Region.h
+	PolyVoxCore/Region.inl
+	PolyVoxCore/SimpleVolume.h
+	PolyVoxCore/Vector.h
+	PolyVoxCore/Vector.inl
+	PolyVoxCore/Vertex.h
+	PolyVoxCore/VolumeResampler.h
+	PolyVoxCore/VolumeResampler.inl
+	PolyVoxCore/VoxelFilters.h
+	PolyVoxCore/VoxelFilters.inl
+)
+
+SET(IMPL_INC_FILES
+	PolyVoxCore/Impl/AStarPathfinderImpl.h
+    PolyVoxCore/Impl/Config.h
+	PolyVoxCore/Impl/ErrorHandling.h
+	PolyVoxCore/Impl/Logging.h
+	PolyVoxCore/Impl/MarchingCubesTables.h
+	PolyVoxCore/Impl/RandomUnitVectors.h
+	PolyVoxCore/Impl/RandomVectors.h
+	PolyVoxCore/Impl/Timer.h
+	PolyVoxCore/Impl/TypeDef.h
+	PolyVoxCore/Impl/Utility.h
+)
+
+#NOTE: The following line should be uncommented when building shared libs.
+
+#"Sources" and "Headers" are the group names in Visual Studio.
+#They may have other uses too...
+#SOURCE_GROUP("Source Files" FILES ${CORE_SRC_FILES})
+SOURCE_GROUP("Header Files" FILES ${CORE_INC_FILES})
+
+#SOURCE_GROUP("Source Files\\Impl" FILES ${IMPL_SRC_FILES})
+SOURCE_GROUP("Header Files\\Impl" FILES ${IMPL_INC_FILES})
+
+#Tell CMake the paths
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include)
+
+#Core
+
+#Build
+# Although we don't build anything for PolyVox, we still add this custom target (which
+# doesn't do anything) so that we can browse the source code from within Visual Studio.
+ADD_CUSTOM_TARGET(PolyVoxCore SOURCES ${CORE_INC_FILES})
+
+#Install the core header files, including the ones in the Impl subfolder.
+IF(WIN32)
+	INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE)
+ELSE(WIN32)
+
+	INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE)
+ENDIF(WIN32)
 
 #Set up install paths e.g. for PolyVoxConfig.cmake
 if(WIN32)
diff --git a/include/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h b/include/PolyVoxCore/AStarPathfinder.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.h
rename to include/PolyVoxCore/AStarPathfinder.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl b/include/PolyVoxCore/AStarPathfinder.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/AStarPathfinder.inl
rename to include/PolyVoxCore/AStarPathfinder.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h b/include/PolyVoxCore/AmbientOcclusionCalculator.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.h
rename to include/PolyVoxCore/AmbientOcclusionCalculator.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl b/include/PolyVoxCore/AmbientOcclusionCalculator.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/AmbientOcclusionCalculator.inl
rename to include/PolyVoxCore/AmbientOcclusionCalculator.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Array.h b/include/PolyVoxCore/Array.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Array.h
rename to include/PolyVoxCore/Array.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/BaseVolume.h b/include/PolyVoxCore/BaseVolume.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/BaseVolume.h
rename to include/PolyVoxCore/BaseVolume.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/BaseVolume.inl b/include/PolyVoxCore/BaseVolume.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/BaseVolume.inl
rename to include/PolyVoxCore/BaseVolume.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/BaseVolumeSampler.inl b/include/PolyVoxCore/BaseVolumeSampler.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/BaseVolumeSampler.inl
rename to include/PolyVoxCore/BaseVolumeSampler.inl
diff --git a/include/PolyVoxCore/CMakeLists.txt b/include/PolyVoxCore/CMakeLists.txt
deleted file mode 100644
index d3e66eef..00000000
--- a/include/PolyVoxCore/CMakeLists.txt
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright (c) 2008-2012 Matt Williams
-# Copyright (c) 2008-2012 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.
-
-PROJECT(PolyVoxCore)
-
-#Projects source files
-SET(CORE_SRC_FILES
-	#source/AStarPathfinder.cpp
-)
-
-#Projects headers files
-SET(CORE_INC_FILES
-	include/PolyVoxCore/AmbientOcclusionCalculator.h
-	include/PolyVoxCore/AmbientOcclusionCalculator.inl
-	include/PolyVoxCore/Array.h
-	include/PolyVoxCore/AStarPathfinder.h
-	include/PolyVoxCore/AStarPathfinder.inl
-	include/PolyVoxCore/BaseVolume.h
-	include/PolyVoxCore/BaseVolume.inl
-	include/PolyVoxCore/BaseVolumeSampler.inl
-	include/PolyVoxCore/CubicSurfaceExtractor.h
-	include/PolyVoxCore/CubicSurfaceExtractor.inl
-	include/PolyVoxCore/DefaultIsQuadNeeded.h
-	include/PolyVoxCore/DefaultMarchingCubesController.h
-	include/PolyVoxCore/Density.h
-	include/PolyVoxCore/FilePager.h
-	include/PolyVoxCore/GradientEstimators.h
-	include/PolyVoxCore/GradientEstimators.inl
-	include/PolyVoxCore/Interpolation.h
-	include/PolyVoxCore/IteratorController.h
-	include/PolyVoxCore/IteratorController.inl
-	include/PolyVoxCore/LargeVolume.h
-	include/PolyVoxCore/LowPassFilter.h
-	include/PolyVoxCore/LowPassFilter.inl
-	include/PolyVoxCore/MarchingCubesSurfaceExtractor.h
-	include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
-	include/PolyVoxCore/Material.h
-	include/PolyVoxCore/MaterialDensityPair.h
-	include/PolyVoxCore/Mesh.h
-	include/PolyVoxCore/Mesh.inl
-	include/PolyVoxCore/PagedVolume.h
-	include/PolyVoxCore/PagedVolume.inl
-	include/PolyVoxCore/PagedVolumeChunk.inl
-	include/PolyVoxCore/PagedVolumeSampler.inl
-	include/PolyVoxCore/PolyVoxForwardDeclarations.h
-	include/PolyVoxCore/Picking.h
-	include/PolyVoxCore/Picking.inl
-	include/PolyVoxCore/RawVolume.h
-	include/PolyVoxCore/RawVolume.inl
-	include/PolyVoxCore/RawVolumeSampler.inl
-	include/PolyVoxCore/Raycast.h
-	include/PolyVoxCore/Raycast.inl
-	include/PolyVoxCore/Region.h
-	include/PolyVoxCore/Region.inl
-	include/PolyVoxCore/SimpleVolume.h
-	include/PolyVoxCore/Vector.h
-	include/PolyVoxCore/Vector.inl
-	include/PolyVoxCore/Vertex.h
-	include/PolyVoxCore/VolumeResampler.h
-	include/PolyVoxCore/VolumeResampler.inl
-	include/PolyVoxCore/VoxelFilters.h
-	include/PolyVoxCore/VoxelFilters.inl
-)
-
-SET(IMPL_SRC_FILES
-	#source/Impl/ErrorHandling.cpp
-	#source/Impl/Logging.cpp
-	#source/Impl/MarchingCubesTables.cpp
-	#source/Impl/RandomUnitVectors.cpp
-	#source/Impl/RandomVectors.cpp
-	#source/Impl/Timer.cpp
-	#source/Impl/Utility.cpp
-)
-
-SET(IMPL_INC_FILES
-	include/PolyVoxCore/Impl/AStarPathfinderImpl.h
-    include/PolyVoxCore/Impl/Config.h
-	include/PolyVoxCore/Impl/ErrorHandling.h
-	include/PolyVoxCore/Impl/Logging.h
-	include/PolyVoxCore/Impl/MarchingCubesTables.h
-	include/PolyVoxCore/Impl/RandomUnitVectors.h
-	include/PolyVoxCore/Impl/RandomVectors.h
-	include/PolyVoxCore/Impl/Timer.h
-	include/PolyVoxCore/Impl/TypeDef.h
-	include/PolyVoxCore/Impl/Utility.h
-)
-
-#NOTE: The following line should be uncommented when building shared libs.
-
-#"Sources" and "Headers" are the group names in Visual Studio.
-#They may have other uses too...
-#SOURCE_GROUP("Source Files" FILES ${CORE_SRC_FILES})
-SOURCE_GROUP("Header Files" FILES ${CORE_INC_FILES})
-
-#SOURCE_GROUP("Source Files\\Impl" FILES ${IMPL_SRC_FILES})
-SOURCE_GROUP("Header Files\\Impl" FILES ${IMPL_INC_FILES})
-
-#Tell CMake the paths
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-#Core
-
-#Build
-# Although we don't build anything for PolyVox, we still add this custom target (which
-# doesn't do anything) so that we can browse the source code from within Visual Studio.
-ADD_CUSTOM_TARGET(PolyVoxCore SOURCES ${CORE_INC_FILES})
-
-#Install the core header files, including the ones in the Impl subfolder.
-IF(WIN32)
-	INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE)
-ELSE(WIN32)
-
-	INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE)
-ENDIF(WIN32)
diff --git a/include/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h b/include/PolyVoxCore/CubicSurfaceExtractor.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h
rename to include/PolyVoxCore/CubicSurfaceExtractor.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl b/include/PolyVoxCore/CubicSurfaceExtractor.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
rename to include/PolyVoxCore/CubicSurfaceExtractor.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h b/include/PolyVoxCore/DefaultIsQuadNeeded.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h
rename to include/PolyVoxCore/DefaultIsQuadNeeded.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h b/include/PolyVoxCore/DefaultMarchingCubesController.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/DefaultMarchingCubesController.h
rename to include/PolyVoxCore/DefaultMarchingCubesController.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Density.h b/include/PolyVoxCore/Density.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Density.h
rename to include/PolyVoxCore/Density.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/FilePager.h b/include/PolyVoxCore/FilePager.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/FilePager.h
rename to include/PolyVoxCore/FilePager.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h b/include/PolyVoxCore/GradientEstimators.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/GradientEstimators.h
rename to include/PolyVoxCore/GradientEstimators.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl b/include/PolyVoxCore/GradientEstimators.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/GradientEstimators.inl
rename to include/PolyVoxCore/GradientEstimators.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/AStarPathfinderImpl.h b/include/PolyVoxCore/Impl/AStarPathfinderImpl.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Impl/AStarPathfinderImpl.h
rename to include/PolyVoxCore/Impl/AStarPathfinderImpl.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/Config.h b/include/PolyVoxCore/Impl/Config.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Impl/Config.h
rename to include/PolyVoxCore/Impl/Config.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h b/include/PolyVoxCore/Impl/ErrorHandling.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h
rename to include/PolyVoxCore/Impl/ErrorHandling.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h b/include/PolyVoxCore/Impl/Logging.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Impl/Logging.h
rename to include/PolyVoxCore/Impl/Logging.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h b/include/PolyVoxCore/Impl/MarchingCubesTables.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Impl/MarchingCubesTables.h
rename to include/PolyVoxCore/Impl/MarchingCubesTables.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h b/include/PolyVoxCore/Impl/RandomUnitVectors.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Impl/RandomUnitVectors.h
rename to include/PolyVoxCore/Impl/RandomUnitVectors.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h b/include/PolyVoxCore/Impl/RandomVectors.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Impl/RandomVectors.h
rename to include/PolyVoxCore/Impl/RandomVectors.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h b/include/PolyVoxCore/Impl/Timer.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Impl/Timer.h
rename to include/PolyVoxCore/Impl/Timer.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h b/include/PolyVoxCore/Impl/TypeDef.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
rename to include/PolyVoxCore/Impl/TypeDef.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h b/include/PolyVoxCore/Impl/Utility.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Impl/Utility.h
rename to include/PolyVoxCore/Impl/Utility.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Interpolation.h b/include/PolyVoxCore/Interpolation.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Interpolation.h
rename to include/PolyVoxCore/Interpolation.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/IteratorController.h b/include/PolyVoxCore/IteratorController.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/IteratorController.h
rename to include/PolyVoxCore/IteratorController.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/IteratorController.inl b/include/PolyVoxCore/IteratorController.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/IteratorController.inl
rename to include/PolyVoxCore/IteratorController.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/LargeVolume.h b/include/PolyVoxCore/LargeVolume.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/LargeVolume.h
rename to include/PolyVoxCore/LargeVolume.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h b/include/PolyVoxCore/LowPassFilter.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/LowPassFilter.h
rename to include/PolyVoxCore/LowPassFilter.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl b/include/PolyVoxCore/LowPassFilter.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/LowPassFilter.inl
rename to include/PolyVoxCore/LowPassFilter.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h b/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h
rename to include/PolyVoxCore/MarchingCubesSurfaceExtractor.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl b/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
rename to include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Material.h b/include/PolyVoxCore/Material.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Material.h
rename to include/PolyVoxCore/Material.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h b/include/PolyVoxCore/MaterialDensityPair.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
rename to include/PolyVoxCore/MaterialDensityPair.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Mesh.h b/include/PolyVoxCore/Mesh.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Mesh.h
rename to include/PolyVoxCore/Mesh.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Mesh.inl b/include/PolyVoxCore/Mesh.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Mesh.inl
rename to include/PolyVoxCore/Mesh.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/PagedVolume.h b/include/PolyVoxCore/PagedVolume.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/PagedVolume.h
rename to include/PolyVoxCore/PagedVolume.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl b/include/PolyVoxCore/PagedVolume.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/PagedVolume.inl
rename to include/PolyVoxCore/PagedVolume.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/PagedVolumeChunk.inl b/include/PolyVoxCore/PagedVolumeChunk.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/PagedVolumeChunk.inl
rename to include/PolyVoxCore/PagedVolumeChunk.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/PagedVolumeSampler.inl b/include/PolyVoxCore/PagedVolumeSampler.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/PagedVolumeSampler.inl
rename to include/PolyVoxCore/PagedVolumeSampler.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Picking.h b/include/PolyVoxCore/Picking.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Picking.h
rename to include/PolyVoxCore/Picking.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Picking.inl b/include/PolyVoxCore/Picking.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Picking.inl
rename to include/PolyVoxCore/Picking.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h b/include/PolyVoxCore/PolyVoxForwardDeclarations.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h
rename to include/PolyVoxCore/PolyVoxForwardDeclarations.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/RawVolume.h b/include/PolyVoxCore/RawVolume.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/RawVolume.h
rename to include/PolyVoxCore/RawVolume.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/RawVolume.inl b/include/PolyVoxCore/RawVolume.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/RawVolume.inl
rename to include/PolyVoxCore/RawVolume.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl b/include/PolyVoxCore/RawVolumeSampler.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
rename to include/PolyVoxCore/RawVolumeSampler.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Raycast.h b/include/PolyVoxCore/Raycast.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Raycast.h
rename to include/PolyVoxCore/Raycast.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Raycast.inl b/include/PolyVoxCore/Raycast.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Raycast.inl
rename to include/PolyVoxCore/Raycast.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Region.h b/include/PolyVoxCore/Region.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Region.h
rename to include/PolyVoxCore/Region.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Region.inl b/include/PolyVoxCore/Region.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Region.inl
rename to include/PolyVoxCore/Region.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h b/include/PolyVoxCore/SimpleVolume.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
rename to include/PolyVoxCore/SimpleVolume.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Vector.h b/include/PolyVoxCore/Vector.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Vector.h
rename to include/PolyVoxCore/Vector.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Vector.inl b/include/PolyVoxCore/Vector.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Vector.inl
rename to include/PolyVoxCore/Vector.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/Vertex.h b/include/PolyVoxCore/Vertex.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/Vertex.h
rename to include/PolyVoxCore/Vertex.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h b/include/PolyVoxCore/VolumeResampler.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/VolumeResampler.h
rename to include/PolyVoxCore/VolumeResampler.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl b/include/PolyVoxCore/VolumeResampler.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/VolumeResampler.inl
rename to include/PolyVoxCore/VolumeResampler.inl
diff --git a/include/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h b/include/PolyVoxCore/VoxelFilters.h
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/VoxelFilters.h
rename to include/PolyVoxCore/VoxelFilters.h
diff --git a/include/PolyVoxCore/include/PolyVoxCore/VoxelFilters.inl b/include/PolyVoxCore/VoxelFilters.inl
similarity index 100%
rename from include/PolyVoxCore/include/PolyVoxCore/VoxelFilters.inl
rename to include/PolyVoxCore/VoxelFilters.inl
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 02bdee0b..bccadd75 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -44,7 +44,7 @@ MACRO(CREATE_TEST headerfile sourcefile executablename)
 	ENDIF()
 ENDMACRO(CREATE_TEST)
 
-INCLUDE_DIRECTORIES(${PolyVoxCore_BINARY_DIR}/include ${PolyVox_SOURCE_DIR}/PolyVoxCore/include ${CMAKE_CURRENT_BINARY_DIR})
+INCLUDE_DIRECTORIES(${PolyVoxHeaders_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 REMOVE_DEFINITIONS(-DQT_GUI_LIB) #Make sure the tests don't link to the QtGui
 
 # Test Template. Copy and paste this template for consistant naming.