From f7573e76606e5d9dd8064ffe8526ac42a74589ff Mon Sep 17 00:00:00 2001
From: David Williams <david@david-williams.info>
Date: Tue, 28 Dec 2010 11:14:55 +0000
Subject: [PATCH] Work on SWIG bindings for PolyVox.

---
 library/PolyVoxCore/include/Density.h  | 6 +++---
 library/PolyVoxCore/include/Material.h | 6 +++---
 library/bindings/Material.i            | 8 ++++++++
 library/bindings/PolyVoxCore.i         | 9 ++-------
 library/bindings/Volume.i              | 7 ++++++-
 5 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 library/bindings/Material.i

diff --git a/library/PolyVoxCore/include/Density.h b/library/PolyVoxCore/include/Density.h
index cf87da46..30da0053 100644
--- a/library/PolyVoxCore/include/Density.h
+++ b/library/PolyVoxCore/include/Density.h
@@ -21,8 +21,8 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#ifndef __PolyVox_MaterialDensityPair_H__
-#define __PolyVox_MaterialDensityPair_H__
+#ifndef __PolyVox_Density_H__
+#define __PolyVox_Density_H__
 
 #include "PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
@@ -85,4 +85,4 @@ namespace PolyVox
 	typedef Density<uint8_t> Density8;
 }
 
-#endif
\ No newline at end of file
+#endif //__PolyVox_Density_H__
diff --git a/library/PolyVoxCore/include/Material.h b/library/PolyVoxCore/include/Material.h
index 3a860016..5e166568 100644
--- a/library/PolyVoxCore/include/Material.h
+++ b/library/PolyVoxCore/include/Material.h
@@ -21,8 +21,8 @@ freely, subject to the following restrictions:
     distribution. 	
 *******************************************************************************/
 
-#ifndef __PolyVox_MaterialDensityPair_H__
-#define __PolyVox_MaterialDensityPair_H__
+#ifndef __PolyVox_Material_H__
+#define __PolyVox_Material_H__
 
 #include "PolyVoxForwardDeclarations.h"
 #include "PolyVoxImpl/TypeDef.h"
@@ -100,4 +100,4 @@ namespace PolyVox
 	typedef Material<uint8_t> Material8;
 }
 
-#endif
\ No newline at end of file
+#endif //__PolyVox_Material_H__
diff --git a/library/bindings/Material.i b/library/bindings/Material.i
new file mode 100644
index 00000000..7c5ec306
--- /dev/null
+++ b/library/bindings/Material.i
@@ -0,0 +1,8 @@
+%module Material
+%{
+#include "Material.h"
+%}
+
+%include "Material.h"
+
+%template(Material8) PolyVox::Material<uint8_t>;
diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i
index 71425b23..86671ce5 100644
--- a/library/bindings/PolyVoxCore.i
+++ b/library/bindings/PolyVoxCore.i
@@ -1,15 +1,10 @@
 %module PolyVoxCore
 
 #define POLYVOX_API
-//%include <windows.i>
 
-//%include "TypeDef.i"
-//%include "Enums.i"
-//%include "PolyVoxCStdInt.i"
-//%include "Utility.i"
-//%include "PolyVoxForwardDeclarations.i" //Shouldn't be needed
-//
 %include "stdint.i"
+%include "Material.i"
+%include "Density.i"
 %include "Vector.i"
 %include "Region.i"
 %include "Volume.i"
diff --git a/library/bindings/Volume.i b/library/bindings/Volume.i
index 2a6720c9..c1b07726 100644
--- a/library/bindings/Volume.i
+++ b/library/bindings/Volume.i
@@ -1,8 +1,13 @@
 %module Volume
 %{
+#include "Material.h"
+#include "Density.h"
 #include "Volume.h"
 %}
 
+%include "Material.h"
+%include "Density.h"
 %include "Volume.h"
 
-%template(VolumeUint16) PolyVox::Volume<unsigned int>;
+%template(VolumeMaterial8) PolyVox::Volume<PolyVox::Material8>;
+%template(VolumeDensity8) PolyVox::Volume<PolyVox::Density8>;