From cb0a746b6f703e7d7708022b6e22d0844f48d264 Mon Sep 17 00:00:00 2001
From: Matt Williams <matt@miliams.com>
Date: Sun, 22 May 2011 21:32:02 +0200
Subject: [PATCH] Update include paths for bindings to new layout.

---
 library/bindings/CMakeLists.txt                     |  3 ++-
 library/bindings/CubicSurfaceExtractor.i            |  4 ++--
 library/bindings/CubicSurfaceExtractorWithNormals.i |  4 ++--
 library/bindings/PolyVoxCore.i                      |  4 ++--
 library/bindings/SimpleVolume.i                     | 13 +++++++++++++
 library/bindings/SimpleVolumeSampler.i              |  9 +++++++++
 library/bindings/SurfaceExtractor.i                 |  4 ++--
 library/bindings/Volume.i                           | 13 -------------
 library/bindings/VolumeSampler.i                    |  9 ---------
 9 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 library/bindings/SimpleVolume.i
 create mode 100644 library/bindings/SimpleVolumeSampler.i
 delete mode 100644 library/bindings/Volume.i
 delete mode 100644 library/bindings/VolumeSampler.i

diff --git a/library/bindings/CMakeLists.txt b/library/bindings/CMakeLists.txt
index dc52cba1..758929eb 100644
--- a/library/bindings/CMakeLists.txt
+++ b/library/bindings/CMakeLists.txt
@@ -4,9 +4,10 @@ if(SWIG_FOUND)
 	
 	find_package(PythonLibs)
 	include_directories(${PYTHON_INCLUDE_PATH})
-	include_directories(${PolyVoxCore_SOURCE_DIR}/include)
+	include_directories(${PolyVoxCore_SOURCE_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include/PolyVoxCore)
 
 	set(CMAKE_SWIG_FLAGS "")
+	add_definitions(-DSWIG)
 	set_source_files_properties(PolyVoxCore.i PROPERTIES CPLUSPLUS ON)
 	
 	swig_add_module(PolyVoxCore python PolyVoxCore.i)
diff --git a/library/bindings/CubicSurfaceExtractor.i b/library/bindings/CubicSurfaceExtractor.i
index 80569718..3a604d94 100644
--- a/library/bindings/CubicSurfaceExtractor.i
+++ b/library/bindings/CubicSurfaceExtractor.i
@@ -1,11 +1,11 @@
 %module CubicSurfaceExtractor
 %{
-#include "VolumeSampler.h"
+#include "SimpleVolume.h"
 #include "Array.h"
 #include "CubicSurfaceExtractor.h"
 %}
 
-%include "VolumeSampler.h"
+%include "SimpleVolume.h"
 %include "Array.h"
 %include "CubicSurfaceExtractor.h"
 
diff --git a/library/bindings/CubicSurfaceExtractorWithNormals.i b/library/bindings/CubicSurfaceExtractorWithNormals.i
index 7addb87c..93d778cb 100644
--- a/library/bindings/CubicSurfaceExtractorWithNormals.i
+++ b/library/bindings/CubicSurfaceExtractorWithNormals.i
@@ -1,11 +1,11 @@
 %module CubicSurfaceExtractorWithNormals
 %{
-#include "VolumeSampler.h"
+#include "SimpleVolume.h"
 //#include "CubicSurfaceExtractor.h"
 #include "CubicSurfaceExtractorWithNormals.h"
 %}
 
-%include "VolumeSampler.h"
+%include "SimpleVolume.h"
 //%include "CubicSurfaceExtractor.h"
 %include "CubicSurfaceExtractorWithNormals.h"
 
diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i
index 9876b812..a25eec1d 100644
--- a/library/bindings/PolyVoxCore.i
+++ b/library/bindings/PolyVoxCore.i
@@ -21,13 +21,13 @@
 %include "Density.i"
 %include "Vector.i"
 %include "Region.i"
-%include "Volume.i"
+%include "SimpleVolume.i"
 %include "TypeDef.i"
 //%include "SubArray.i"
 //%include "Array.i"
 %include "VertexTypes.i"
 %include "SurfaceMesh.i"
-%include "VolumeSampler.i"
+%include "SimpleVolumeSampler.i"
 %include "SurfaceExtractor.i"
 %include "CubicSurfaceExtractor.i"
 %include "CubicSurfaceExtractorWithNormals.i"
diff --git a/library/bindings/SimpleVolume.i b/library/bindings/SimpleVolume.i
new file mode 100644
index 00000000..2e2f7f2f
--- /dev/null
+++ b/library/bindings/SimpleVolume.i
@@ -0,0 +1,13 @@
+%module SimpleVolume
+%{
+#include "Material.h"
+#include "Density.h"
+#include "SimpleVolume.h"
+%}
+
+%include "Material.h"
+%include "Density.h"
+%include "SimpleVolume.h"
+
+%template(SimpleVolumeMaterial8) PolyVox::SimpleVolume<PolyVox::Material8>;
+%template(SimpleVolumeDensity8) PolyVox::SimpleVolume<PolyVox::Density8>;
\ No newline at end of file
diff --git a/library/bindings/SimpleVolumeSampler.i b/library/bindings/SimpleVolumeSampler.i
new file mode 100644
index 00000000..a48d52bf
--- /dev/null
+++ b/library/bindings/SimpleVolumeSampler.i
@@ -0,0 +1,9 @@
+%module SimpleVolumeSampler
+%{
+#include "SimpleVolume.h"
+%}
+
+%include "SimpleVolume.h"
+
+%template(SimpleVolumeSamplerMaterial8) PolyVox::SimpleVolumeSampler<PolyVox::Material8>;
+%template(SimpleVolumeSamplerDensity8) PolyVox::SimpleVolumeSampler<PolyVox::Density8>;
\ No newline at end of file
diff --git a/library/bindings/SurfaceExtractor.i b/library/bindings/SurfaceExtractor.i
index 441942eb..81ff4797 100644
--- a/library/bindings/SurfaceExtractor.i
+++ b/library/bindings/SurfaceExtractor.i
@@ -1,10 +1,10 @@
 %module SurfaceExtractor
 %{
-#include "VolumeSampler.h"
+#include "SimpleVolume.h"
 #include "SurfaceExtractor.h"
 %}
 
-%include "VolumeSampler.h"
+%include "SimpleVolume.h"
 %include "SurfaceExtractor.h"
 
 %template(SurfaceExtractorMaterial8) PolyVox::SurfaceExtractor<PolyVox::Material8>;
diff --git a/library/bindings/Volume.i b/library/bindings/Volume.i
deleted file mode 100644
index b6ac04b1..00000000
--- a/library/bindings/Volume.i
+++ /dev/null
@@ -1,13 +0,0 @@
-%module Volume
-%{
-#include "Material.h"
-#include "Density.h"
-#include "Volume.h"
-%}
-
-%include "Material.h"
-%include "Density.h"
-%include "Volume.h"
-
-%template(VolumeMaterial8) PolyVox::Volume<PolyVox::Material8>;
-%template(VolumeDensity8) PolyVox::Volume<PolyVox::Density8>;
\ No newline at end of file
diff --git a/library/bindings/VolumeSampler.i b/library/bindings/VolumeSampler.i
deleted file mode 100644
index 3e743065..00000000
--- a/library/bindings/VolumeSampler.i
+++ /dev/null
@@ -1,9 +0,0 @@
-%module VolumeSampler
-%{
-#include "VolumeSampler.h"
-%}
-
-%include "VolumeSampler.h"
-
-%template(VolumeSamplerMaterial8) PolyVox::VolumeSampler<PolyVox::Material8>;
-%template(VolumeSamplerDensity8) PolyVox::VolumeSampler<PolyVox::Density8>;
\ No newline at end of file