From 63e0298fbf46327dc363c8ef760245cd21596f67 Mon Sep 17 00:00:00 2001
From: Matt Williams <matt@milliams.com>
Date: Sat, 24 Nov 2012 14:16:52 +0000
Subject: [PATCH] Add a VOLUMETYPES macro to avoid repeating ourselves.

---
 library/bindings/BaseVolume.i   | 10 +---------
 library/bindings/PolyVoxCore.i  | 10 ++++++++++
 library/bindings/RawVolume.i    | 10 +---------
 library/bindings/SimpleVolume.i | 10 +---------
 4 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/library/bindings/BaseVolume.i b/library/bindings/BaseVolume.i
index 448c703a..3ae83f30 100644
--- a/library/bindings/BaseVolume.i
+++ b/library/bindings/BaseVolume.i
@@ -9,12 +9,4 @@
 %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>;
+VOLUMETYPES(BaseVolume, PolyVox::BaseVolume)
diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i
index 456bce9f..36461861 100644
--- a/library/bindings/PolyVoxCore.i
+++ b/library/bindings/PolyVoxCore.i
@@ -24,6 +24,16 @@ const char* __str__() {
 }
 %enddef
 
+//Centralise this to avoid repeating ourselves
+//This macro will be called in the volume interface files to define the various volume types.
+%define VOLUMETYPES(shortname, class)
+%template(shortname ## Density8) class<PolyVox::Density8>;
+%template(shortname ## Material8) class<PolyVox::Material8>;
+%template(shortname ## Material16) class<PolyVox::Material16>;
+%template(shortname ## MaterialDensityPair44) class<PolyVox::MaterialDensityPair44>;
+%template(shortname ## MaterialDensityPair88) class<PolyVox::MaterialDensityPair88>;
+%enddef
+
 %feature("autodoc", "1");
 
 //This will rename "operator=" to "assign" since Python doesn't have assignment
diff --git a/library/bindings/RawVolume.i b/library/bindings/RawVolume.i
index 0108fc1a..c7e2af49 100644
--- a/library/bindings/RawVolume.i
+++ b/library/bindings/RawVolume.i
@@ -9,12 +9,4 @@
 %include "Density.h"
 %include "RawVolume.h"
 
-%template(RawVolumeDensity8) PolyVox::RawVolume<PolyVox::Density8>;
-
-%template(RawVolumeMaterial8) PolyVox::RawVolume<PolyVox::Material8>;
-
-%template(RawVolumeMaterial16) PolyVox::RawVolume<PolyVox::Material16>;
-
-%template(RawVolumeMaterialDensityPair44) PolyVox::RawVolume<PolyVox::MaterialDensityPair44>;
-
-%template(RawVolumeMaterialDensityPair88) PolyVox::RawVolume<PolyVox::MaterialDensityPair88>;
+VOLUMETYPES(RawVolume, PolyVox::RawVolume)
diff --git a/library/bindings/SimpleVolume.i b/library/bindings/SimpleVolume.i
index dba2d247..35dfdde7 100644
--- a/library/bindings/SimpleVolume.i
+++ b/library/bindings/SimpleVolume.i
@@ -9,12 +9,4 @@
 %include "Density.h"
 %include "SimpleVolume.h"
 
-%template(SimpleVolumeDensity8) PolyVox::SimpleVolume<PolyVox::Density8>;
-
-%template(SimpleVolumeMaterial8) PolyVox::SimpleVolume<PolyVox::Material8>;
-
-%template(SimpleVolumeMaterial16) PolyVox::SimpleVolume<PolyVox::Material16>;
-
-%template(SimpleVolumeMaterialDensityPair44) PolyVox::SimpleVolume<PolyVox::MaterialDensityPair44>;
-
-%template(SimpleVolumeMaterialDensityPair88) PolyVox::SimpleVolume<PolyVox::MaterialDensityPair88>;
+VOLUMETYPES(SimpleVolume, PolyVox::SimpleVolume)