From edf2bf87d42defae5394261007bb04a2ee8ed135 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Sat, 24 Nov 2012 14:23:52 +0000 Subject: [PATCH] Add LargeVolume binding --- .../PolyVoxCore/include/PolyVoxCore/LargeVolume.h | 2 ++ library/bindings/LargeVolume.i | 12 ++++++++++++ library/bindings/PolyVoxCore.i | 1 + 3 files changed, 15 insertions(+) create mode 100644 library/bindings/LargeVolume.i diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h index 6db673ec..9c92e5ea 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h +++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.h @@ -166,6 +166,7 @@ namespace PolyVox //in the future //typedef Volume VolumeOfVoxelType; //Workaround for GCC/VS2010 differences. //class Sampler : public VolumeOfVoxelType::template Sampler< LargeVolume > + #ifndef SWIG #if defined(_MSC_VER) class Sampler : public BaseVolume::Sampler< LargeVolume > //This line works on VS2010 #else @@ -243,6 +244,7 @@ namespace PolyVox Block block; uint32_t timestamp; }; + #endif public: /// Constructor for creating a very large paging volume. diff --git a/library/bindings/LargeVolume.i b/library/bindings/LargeVolume.i new file mode 100644 index 00000000..fb4bbffe --- /dev/null +++ b/library/bindings/LargeVolume.i @@ -0,0 +1,12 @@ +%module LargeVolume +%{ +#include "Material.h" +#include "Density.h" +#include "LargeVolume.h" +%} + +%include "Material.h" +%include "Density.h" +%include "LargeVolume.h" + +VOLUMETYPES(LargeVolume, PolyVox::LargeVolume) diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i index 36461861..55ef7371 100644 --- a/library/bindings/PolyVoxCore.i +++ b/library/bindings/PolyVoxCore.i @@ -50,6 +50,7 @@ const char* __str__() { %include "BaseVolume.i" %include "SimpleVolume.i" %include "RawVolume.i" +%include "LargeVolume.i" //%include "TypeDef.i" //%include "SubArray.i" //%include "Array.i"