diff --git a/library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h b/library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h index 5af6dbfb..da4a8c51 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h +++ b/library/PolyVoxCore/include/PolyVoxCore/BlockCompressor.h @@ -40,7 +40,7 @@ namespace PolyVox BlockCompressor() {}; virtual ~BlockCompressor() {}; - virtual void compress(UncompressedBlock* pSrcBlock, CompressedBlock* pDstBlock) = 0; + virtual void compressData(UncompressedBlock* pSrcBlock, CompressedBlock* pDstBlock) = 0; virtual void decompress(CompressedBlock* pSrcBlock, UncompressedBlock* pDstBlock) = 0; }; } diff --git a/library/PolyVoxCore/include/PolyVoxCore/Impl/MinizWrapper.h b/library/PolyVoxCore/include/PolyVoxCore/Impl/MinizWrapper.h index fbb52250..04659ac1 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/Impl/MinizWrapper.h +++ b/library/PolyVoxCore/include/PolyVoxCore/Impl/MinizWrapper.h @@ -33,12 +33,12 @@ freely, subject to the following restrictions: // Diable things we don't need, and in particular the zlib compatible names which // would cause conflicts if a user application is using both PolyVox and zlib. -#define MINIZ_NO_STDIO -#define MINIZ_NO_ARCHIVE_APIS -#define MINIZ_NO_TIME -#define MINIZ_NO_ZLIB_APIS -#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES -#define MINIZ_NO_MALLOC +//#define MINIZ_NO_STDIO +//#define MINIZ_NO_ARCHIVE_APIS +//#define MINIZ_NO_TIME +//#define MINIZ_NO_ZLIB_APIS +//#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES +//#define MINIZ_NO_MALLOC // Include only the declarations of the functions in miniz.c. Don't include // the actual definitions, as this 'MinizWrapper.h' may be included from multiple diff --git a/library/PolyVoxCore/include/PolyVoxCore/MinizBlockCompressor.h b/library/PolyVoxCore/include/PolyVoxCore/MinizBlockCompressor.h index fc6bdda5..f701101c 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/MinizBlockCompressor.h +++ b/library/PolyVoxCore/include/PolyVoxCore/MinizBlockCompressor.h @@ -40,10 +40,10 @@ namespace PolyVox MinizBlockCompressor(int iCompressionLevel = 6); // Miniz defines MZ_DEFAULT_LEVEL = 6 so we use the same here ~MinizBlockCompressor(); - void compress(UncompressedBlock* pSrcBlock, CompressedBlock* pDstBlock); + void compressData(UncompressedBlock* pSrcBlock, CompressedBlock* pDstBlock); void decompress(CompressedBlock* pSrcBlock, UncompressedBlock* pDstBlock); - private: + public: uint32_t getExpectedCompressedSize(uint32_t uUncompressedInputSize); uint32_t getMaxCompressedSize(uint32_t uUncompressedInputSize); uint32_t compressWithMiniz(const void* pSrcData, size_t uSrcLength, void* pDstData, size_t uDstLength); diff --git a/library/PolyVoxCore/include/PolyVoxCore/MinizBlockCompressor.inl b/library/PolyVoxCore/include/PolyVoxCore/MinizBlockCompressor.inl index 59befd51..a4e41e72 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/MinizBlockCompressor.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/MinizBlockCompressor.inl @@ -57,7 +57,7 @@ namespace PolyVox } template - void MinizBlockCompressor::compress(UncompressedBlock* pSrcBlock, CompressedBlock* pDstBlock) + void MinizBlockCompressor::compressData(UncompressedBlock* pSrcBlock, CompressedBlock* pDstBlock) { // The uncompressed data will be read straight out of the block void* pSrcData = reinterpret_cast(pSrcBlock->getData()); diff --git a/library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.h b/library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.h index ad388b6e..cb4fc38d 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.h +++ b/library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.h @@ -49,7 +49,7 @@ namespace PolyVox RLEBlockCompressor(); ~RLEBlockCompressor(); - void compress(UncompressedBlock* pSrcBlock, CompressedBlock* pDstBlock); + void compressData(UncompressedBlock* pSrcBlock, CompressedBlock* pDstBlock); void decompress(CompressedBlock* pSrcBlock, UncompressedBlock* pDstBlock); }; } diff --git a/library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.inl b/library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.inl index 369fb912..a8408059 100644 --- a/library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.inl +++ b/library/PolyVoxCore/include/PolyVoxCore/RLEBlockCompressor.inl @@ -36,7 +36,7 @@ namespace PolyVox } template - void RLEBlockCompressor::compress(UncompressedBlock* pSrcBlock, CompressedBlock* pDstBlock) + void RLEBlockCompressor::compressData(UncompressedBlock* pSrcBlock, CompressedBlock* pDstBlock) { void* pSrcData = reinterpret_cast(pSrcBlock->getData()); uint32_t uSrcLength = pSrcBlock->getDataSizeInBytes();