From e485265dd85050df6dc7afd2f7fbdf2e2a5bf9da Mon Sep 17 00:00:00 2001
From: David Williams <david@volumesoffun.com>
Date: Thu, 1 Aug 2013 16:08:44 +0200
Subject: [PATCH] Fixes to allow the SWIG/Python bindings to build again.

---
 library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl | 2 +-
 library/bindings/Block.i                                | 9 +++++++++
 library/bindings/BlockCompressor.i                      | 8 ++++++++
 library/bindings/CompressedBlock.i                      | 8 ++++++++
 library/bindings/MinizBlockCompressor.i                 | 6 ++++++
 library/bindings/MinizCompressor.i                      | 6 ------
 library/bindings/PolyVoxCore.i                          | 8 ++++++--
 library/bindings/RLEBlockCompressor.i                   | 6 ++++++
 library/bindings/RLECompressor.i                        | 6 ------
 library/bindings/UncompressedBlock.i                    | 8 ++++++++
 10 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 library/bindings/Block.i
 create mode 100644 library/bindings/BlockCompressor.i
 create mode 100644 library/bindings/CompressedBlock.i
 create mode 100644 library/bindings/MinizBlockCompressor.i
 delete mode 100644 library/bindings/MinizCompressor.i
 create mode 100644 library/bindings/RLEBlockCompressor.i
 delete mode 100644 library/bindings/RLECompressor.i
 create mode 100644 library/bindings/UncompressedBlock.i

diff --git a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
index e18568bd..c9fe8fa6 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
+++ b/library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
@@ -311,7 +311,7 @@ namespace PolyVox
 		const uint16_t zOffset = static_cast<uint16_t>(uZPos - (blockZ << m_uBlockSideLengthPower));
 
 		UncompressedBlock<VoxelType>* pUncompressedBlock = getUncompressedBlock(blockX, blockY, blockZ);
-		pUncompressedBlock->setVoxelAt(xOffset, yOffset, zOffset);
+		pUncompressedBlock->setVoxelAt(xOffset, yOffset, zOffset, tValue);
 	}
 
 	////////////////////////////////////////////////////////////////////////////////
diff --git a/library/bindings/Block.i b/library/bindings/Block.i
new file mode 100644
index 00000000..d5aa8da7
--- /dev/null
+++ b/library/bindings/Block.i
@@ -0,0 +1,9 @@
+%module Block
+%{
+#include "Block.h"
+%}
+
+%include "Block.h"
+
+VOLUMETYPES(Block) 
+ 
\ No newline at end of file
diff --git a/library/bindings/BlockCompressor.i b/library/bindings/BlockCompressor.i
new file mode 100644
index 00000000..ddb6eb41
--- /dev/null
+++ b/library/bindings/BlockCompressor.i
@@ -0,0 +1,8 @@
+%module BlockCompressor
+%{
+#include "BlockCompressor.h"
+%}
+
+%include "BlockCompressor.h"
+
+VOLUMETYPES(BlockCompressor)
\ No newline at end of file
diff --git a/library/bindings/CompressedBlock.i b/library/bindings/CompressedBlock.i
new file mode 100644
index 00000000..c27ef617
--- /dev/null
+++ b/library/bindings/CompressedBlock.i
@@ -0,0 +1,8 @@
+%module CompressedBlock
+%{
+#include "CompressedBlock.h"
+%}
+
+%include "CompressedBlock.h"
+
+VOLUMETYPES(CompressedBlock) 
diff --git a/library/bindings/MinizBlockCompressor.i b/library/bindings/MinizBlockCompressor.i
new file mode 100644
index 00000000..7f2f0c9a
--- /dev/null
+++ b/library/bindings/MinizBlockCompressor.i
@@ -0,0 +1,6 @@
+%module MinizBlockCompressor
+%{
+#include "MinizBlockCompressor.h"
+%}
+
+%include "MinizBlockCompressor.h"
diff --git a/library/bindings/MinizCompressor.i b/library/bindings/MinizCompressor.i
deleted file mode 100644
index f846265f..00000000
--- a/library/bindings/MinizCompressor.i
+++ /dev/null
@@ -1,6 +0,0 @@
-%module MinizCompressor
-%{
-#include "MinizCompressor.h"
-%}
-
-%include "MinizCompressor.h"
diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i
index 30a71407..7e6bf245 100644
--- a/library/bindings/PolyVoxCore.i
+++ b/library/bindings/PolyVoxCore.i
@@ -75,11 +75,15 @@ EXTRACTOR(shortname, LargeVolume)
 %include "Vector.i"
 %include "DefaultMarchingCubesController.i"
 %include "Region.i"
+%include "Block.i"
+%include "CompressedBlock.i"
+%include "UncompressedBlock.i"
 %include "Compressor.i"
+%include "BlockCompressor.i"
 %include "Pager.i"
 %include "FilePager.i"
-%include "MinizCompressor.i"
-%include "RLECompressor.i"
+%include "MinizBlockCompressor.i"
+%include "RLEBlockCompressor.i"
 %include "BaseVolume.i"
 %include "SimpleVolume.i"
 %include "RawVolume.i"
diff --git a/library/bindings/RLEBlockCompressor.i b/library/bindings/RLEBlockCompressor.i
new file mode 100644
index 00000000..b1ea1810
--- /dev/null
+++ b/library/bindings/RLEBlockCompressor.i
@@ -0,0 +1,6 @@
+%module RLEBlockCompressor
+%{
+#include "RLEBlockCompressor.h"
+%}
+
+%include "RLEBlockCompressor.h"
diff --git a/library/bindings/RLECompressor.i b/library/bindings/RLECompressor.i
deleted file mode 100644
index 01023c27..00000000
--- a/library/bindings/RLECompressor.i
+++ /dev/null
@@ -1,6 +0,0 @@
-%module RLECompressor
-%{
-#include "RLECompressor.h"
-%}
-
-%include "RLECompressor.h"
diff --git a/library/bindings/UncompressedBlock.i b/library/bindings/UncompressedBlock.i
new file mode 100644
index 00000000..26598f31
--- /dev/null
+++ b/library/bindings/UncompressedBlock.i
@@ -0,0 +1,8 @@
+%module UncompressedBlock
+%{
+#include "UncompressedBlock.h"
+%}
+
+%include "UncompressedBlock.h"
+
+VOLUMETYPES(UncompressedBlock)