From 85c5b7abf0e8ca093881633eee4bd64af8df450f Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Fri, 22 Jun 2012 00:18:04 +0100 Subject: [PATCH] Add all the Material, Density and MaterialDensityPair typedefs --- library/bindings/Material.i | 1 + library/bindings/PolyVoxCore.i | 3 ++- library/bindings/SimpleVolume.i | 14 ++++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/library/bindings/Material.i b/library/bindings/Material.i index 7c5ec306..8fa3df78 100644 --- a/library/bindings/Material.i +++ b/library/bindings/Material.i @@ -6,3 +6,4 @@ %include "Material.h" %template(Material8) PolyVox::Material; +%template(Material16) PolyVox::Material; diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i index bb44ba52..58a834f4 100644 --- a/library/bindings/PolyVoxCore.i +++ b/library/bindings/PolyVoxCore.i @@ -26,7 +26,8 @@ const char* __str__() { %include "std_vector.i" %include "Vector.i" %include "Density.i" -//%include "Material.i" +%include "Material.i" +%include "MaterialDensityPair.i" %include "Region.i" %include "SimpleVolume.i" //%include "TypeDef.i" diff --git a/library/bindings/SimpleVolume.i b/library/bindings/SimpleVolume.i index 465de208..33fa36b5 100644 --- a/library/bindings/SimpleVolume.i +++ b/library/bindings/SimpleVolume.i @@ -11,6 +11,16 @@ %include "SimpleVolume.h" %template(BaseVolumeDensity8) PolyVox::BaseVolume; +%template(SimpleVolumeDensity8) PolyVox::SimpleVolume; -//%template(SimpleVolumeMaterial8) PolyVox::SimpleVolume; -%template(SimpleVolumeDensity8) PolyVox::SimpleVolume; \ No newline at end of file +%template(BaseVolumeMaterial8) PolyVox::BaseVolume; +%template(SimpleVolumeMaterial8) PolyVox::SimpleVolume; + +%template(BaseVolumeMaterial16) PolyVox::BaseVolume; +%template(SimpleVolumeMaterial16) PolyVox::SimpleVolume; + +%template(BaseVolumeMaterialDensityPair44) PolyVox::BaseVolume; +%template(SimpleVolumeMaterialDensityPair44) PolyVox::SimpleVolume; + +%template(BaseVolumeMaterialDensityPair88) PolyVox::BaseVolume; +%template(SimpleVolumeMaterialDensityPair88) PolyVox::SimpleVolume; \ No newline at end of file