From 7fbe92e1e7635551a298a2090fa94f532b9c8ae8 Mon Sep 17 00:00:00 2001
From: Matt Williams <matt@milliams.com>
Date: Sat, 24 Nov 2012 14:06:31 +0000
Subject: [PATCH] Separate out the BaseVolume definitions into their own file

---
 library/bindings/BaseVolume.i   | 20 ++++++++++++++++++++
 library/bindings/PolyVoxCore.i  |  1 +
 library/bindings/SimpleVolume.i |  8 +-------
 3 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 library/bindings/BaseVolume.i

diff --git a/library/bindings/BaseVolume.i b/library/bindings/BaseVolume.i
new file mode 100644
index 00000000..448c703a
--- /dev/null
+++ b/library/bindings/BaseVolume.i
@@ -0,0 +1,20 @@
+%module SimpleVolume
+%{
+#include "Material.h"
+#include "Density.h"
+#include "BaseVolume.h"
+%}
+
+%include "Material.h"
+%include "Density.h"
+%include "BaseVolume.h"
+
+%template(BaseVolumeDensity8) PolyVox::BaseVolume<PolyVox::Density8>;
+
+%template(BaseVolumeMaterial8) PolyVox::BaseVolume<PolyVox::Material8>;
+
+%template(BaseVolumeMaterial16) PolyVox::BaseVolume<PolyVox::Material16>;
+
+%template(BaseVolumeMaterialDensityPair44) PolyVox::BaseVolume<PolyVox::MaterialDensityPair44>;
+
+%template(BaseVolumeMaterialDensityPair88) PolyVox::BaseVolume<PolyVox::MaterialDensityPair88>;
diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i
index 09fa805e..a4975938 100644
--- a/library/bindings/PolyVoxCore.i
+++ b/library/bindings/PolyVoxCore.i
@@ -37,6 +37,7 @@ const char* __str__() {
 %include "Material.i"
 %include "MaterialDensityPair.i"
 %include "Region.i"
+%include "BaseVolume.i"
 %include "SimpleVolume.i"
 //%include "TypeDef.i"
 //%include "SubArray.i"
diff --git a/library/bindings/SimpleVolume.i b/library/bindings/SimpleVolume.i
index 33fa36b5..dba2d247 100644
--- a/library/bindings/SimpleVolume.i
+++ b/library/bindings/SimpleVolume.i
@@ -5,22 +5,16 @@
 #include "SimpleVolume.h"
 %}
 
-%import "BaseVolume.h"
 %include "Material.h"
 %include "Density.h"
 %include "SimpleVolume.h"
 
-%template(BaseVolumeDensity8) PolyVox::BaseVolume<PolyVox::Density8>;
 %template(SimpleVolumeDensity8) PolyVox::SimpleVolume<PolyVox::Density8>;
 
-%template(BaseVolumeMaterial8) PolyVox::BaseVolume<PolyVox::Material8>;
 %template(SimpleVolumeMaterial8) PolyVox::SimpleVolume<PolyVox::Material8>;
 
-%template(BaseVolumeMaterial16) PolyVox::BaseVolume<PolyVox::Material16>;
 %template(SimpleVolumeMaterial16) PolyVox::SimpleVolume<PolyVox::Material16>;
 
-%template(BaseVolumeMaterialDensityPair44) PolyVox::BaseVolume<PolyVox::MaterialDensityPair44>;
 %template(SimpleVolumeMaterialDensityPair44) PolyVox::SimpleVolume<PolyVox::MaterialDensityPair44>;
 
-%template(BaseVolumeMaterialDensityPair88) PolyVox::BaseVolume<PolyVox::MaterialDensityPair88>;
-%template(SimpleVolumeMaterialDensityPair88) PolyVox::SimpleVolume<PolyVox::MaterialDensityPair88>;
\ No newline at end of file
+%template(SimpleVolumeMaterialDensityPair88) PolyVox::SimpleVolume<PolyVox::MaterialDensityPair88>;