Merge branch 'develop' into feature/cubiquity-version

library/PolyVoxCore/include/PolyVoxCore/FilePager.h

@@ -27,6 +27,7 @@ freely, subject to the following restrictions:
 #include "PolyVoxCore/Impl/TypeDef.h"
 
 #include "PolyVoxCore/Pager.h"
+#include "PolyVoxCore/Region.h"
 
 #include <fstream>
 #include <stdexcept>
@@ -38,12 +39,12 @@ namespace PolyVox
 	 * Provides an interface for performing paging of data.
 	 */
 	template <typename VoxelType>
-	class FilePager : public Pager<typename VoxelType>
+	class FilePager : public Pager<VoxelType>
 	{
 	public:
 		/// Constructor
 		FilePager(const std::string& strFolderName)
-			:Pager()
+			:Pager<VoxelType>()
 			,m_strFolderName(strFolderName)
 		{
 		}

library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl

@@ -619,9 +619,7 @@ namespace PolyVox
 			// create the new block
 			Block<VoxelType> newBlock(m_uBlockSideLength,  m_pCompressor);
 
-			auto retVal = m_pBlocks.insert(std::make_pair(v3dBlockPos, newBlock));
-			itBlock = retVal.first;
-			POLYVOX_ASSERT(retVal.second == true, "Element was not supposed to exist!");
+			itBlock = m_pBlocks.insert(std::make_pair(v3dBlockPos, newBlock)).first;
 
 			//We have created the new block. If paging is enabled it should be used to
 			//fill in the required data. Otherwise it is just left in the default state.

library/PolyVoxCore/include/PolyVoxCore/PolyVoxForwardDeclarations.h

@@ -86,6 +86,11 @@ namespace PolyVox
 	typedef DensityU8 Density8; //Backwards compatibility
 	typedef DensityU16 Density16; //Backwards compatibility
 
+	////////////////////////////////////////////////////////////////////////////////
+	// FilePager
+	////////////////////////////////////////////////////////////////////////////////
+	template <typename VoxelType> class FilePager;
+
 	////////////////////////////////////////////////////////////////////////////////
 	// LargeVolume
 	////////////////////////////////////////////////////////////////////////////////
@@ -112,6 +117,11 @@ namespace PolyVox
 	typedef MaterialDensityPair<uint8_t, 4, 4> MaterialDensityPair44;
 	typedef MaterialDensityPair<uint16_t, 8, 8> MaterialDensityPair88;
 
+	////////////////////////////////////////////////////////////////////////////////
+	// Pager
+	////////////////////////////////////////////////////////////////////////////////
+	template <typename VoxelType> class Pager;
+
 	////////////////////////////////////////////////////////////////////////////////
 	// PositionMaterial
 	////////////////////////////////////////////////////////////////////////////////

library/bindings/FilePager.i

@@ -0,0 +1,6 @@
+%module FilePager
+%{
+#include "FilePager.h"
+%}
+
+%include "FilePager.h"

library/bindings/Pager.i

@@ -0,0 +1,6 @@
+%module Pager
+%{
+#include "Pager.h"
+%}
+
+%include "Pager.h"

library/bindings/PolyVoxCore.i

@@ -76,6 +76,8 @@ EXTRACTOR(shortname, LargeVolume)
 %include "DefaultMarchingCubesController.i"
 %include "Region.i"
 %include "Compressor.i"
+%include "Pager.i"
+%include "FilePager.i"
 %include "MinizCompressor.i"
 %include "RLECompressor.i"
 %include "BaseVolume.i"