diff --git a/examples/Paging/main.cpp b/examples/Paging/main.cpp index 55e08b75..6d183033 100644 --- a/examples/Paging/main.cpp +++ b/examples/Paging/main.cpp @@ -84,14 +84,14 @@ class PerlinNoisePager : public PolyVox::Pager public: /// Constructor PerlinNoisePager() - :Pager() + :Pager() { } /// Destructor virtual ~PerlinNoisePager() {}; - virtual void pageIn(const Region& region, Block* pBlockData) + virtual void pageIn(const PolyVox::Region& region, Block* pBlockData) { pBlockData->createUncompressedData(); @@ -137,7 +137,7 @@ public: } } - virtual void pageOut(const Region& region, Block* pBlockData) + virtual void pageOut(const PolyVox::Region& region, Block* pBlockData) { std::cout << "warning unloading region: " << region.getLowerCorner() << " -> " << region.getUpperCorner() << std::endl; } @@ -152,7 +152,7 @@ int main(int argc, char *argv[]) RLECompressor* compressor = new RLECompressor(); PerlinNoisePager* pager = new PerlinNoisePager(); - LargeVolume volData(Region::MaxRegion, compressor, pager, 256); + LargeVolume volData(PolyVox::Region::MaxRegion, compressor, pager, 256); volData.setMaxNumberOfBlocksInMemory(4096); volData.setMaxNumberOfUncompressedBlocks(64); diff --git a/library/PolyVoxCore/include/PolyVoxCore/FilePager.h b/library/PolyVoxCore/include/PolyVoxCore/FilePager.h index e5ab35b3..fa062e18 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/FilePager.h +++ b/library/PolyVoxCore/include/PolyVoxCore/FilePager.h @@ -38,12 +38,12 @@ namespace PolyVox * Provides an interface for performing paging of data. */ template - class FilePager : public Pager + class FilePager : public Pager { public: /// Constructor FilePager(const std::string& strFolderName) - :Pager() + :Pager() ,m_strFolderName(strFolderName) { } diff --git a/library/bindings/FilePager.i b/library/bindings/FilePager.i new file mode 100644 index 00000000..c6ec6c74 --- /dev/null +++ b/library/bindings/FilePager.i @@ -0,0 +1,6 @@ +%module FilePager +%{ +#include "FilePager.h" +%} + +%include "FilePager.h" diff --git a/library/bindings/Pager.i b/library/bindings/Pager.i new file mode 100644 index 00000000..b586f9ef --- /dev/null +++ b/library/bindings/Pager.i @@ -0,0 +1,6 @@ +%module Pager +%{ +#include "Pager.h" +%} + +%include "Pager.h" diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i index bb693c47..30a71407 100644 --- a/library/bindings/PolyVoxCore.i +++ b/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"