Commit Graph

1922 Commits

Author SHA1 Message Date
29bded222f Removed unnecessary error handling. 2013-10-04 13:56:31 +02:00
21001d6862 Removed wrapper for class which was removed. 2013-10-04 13:35:31 +02:00
1531e1cd00 Switched some code to size_t for compatibility with Miniz. 2013-10-04 13:30:30 +02:00
4d683627da Added some comments. 2013-10-03 16:56:14 +02:00
d17c1b404b Bit more tidying of Miniz code. 2013-10-03 16:45:46 +02:00
ef615cc838 Added missing file. 2013-10-03 16:26:43 +02:00
dcea5ccc54 Merge branch 'feature/miniz-fixes' into develop 2013-10-02 16:58:48 +02:00
498f21f63f Replaced arrays with std::vector. 2013-10-02 16:48:30 +02:00
a4e09c2481 Small fixes (including crash fix). 2013-10-02 15:36:21 +02:00
29ca1e763f Renamed functions to avoid confusion. 2013-10-02 15:09:55 +02:00
513c3a90b0 Rearranging some miniz code to simplify it a bit. 2013-10-01 16:33:39 +02:00
319a0ce352 Removed old compression classes. 2013-10-01 15:58:32 +02:00
f63bb510b3 Merged some code from MinizCompressor into MinizBlockCompressor. We don't really need two separate classes for this stuff. 2013-10-01 15:51:23 +02:00
4ee2a61a15 Added a siply wrapper .h/cpp pair to abstract away the fact that miniz in provided as a single .c file which we include directly, and to avoid linker problems. 2013-10-01 15:33:40 +02:00
f81b42747b Implement Timer for C++11
This uses std::chrono::system_clock
2013-08-22 20:40:45 +01:00
886c66d7c3 Merge branch 'develop' into feature/cubiquity-version 2013-08-19 16:28:23 +02:00
55dc066a3f Fixed bug with MinizBlockCompressor always saving out 10,000 bytes of data. 2013-08-19 16:27:52 +02:00
61e957314f Merge branch 'develop' into feature/cubiquity-version 2013-08-12 21:06:33 +02:00
07f1ca42d2 Uncompressed blocks are now flushed before compressed blocks. 2013-08-12 21:04:55 +02:00
6fb30a40f5 Bringing across Region enhancements from Cubiquity branch. 2013-08-09 20:39:17 +02:00
fcf5b2b055 Making Cubiquity version of PolyVox more closely match develop version. 2013-08-09 20:32:20 +02:00
6a009825b5 Merge branch 'develop' into feature/cubiquity-version
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
	library/PolyVoxCore/source/Region.cpp
2013-08-09 17:05:57 +02:00
b9546ddcfa Extra checks in during marching cubes to try and catch corrupt data. 2013-08-09 14:09:59 +02:00
7c74e1faff Move Timer.h to correct location
Also add a missing semi-colon.
2013-08-08 10:42:57 +01:00
2f99964606 Tidying timer. 2013-08-07 23:24:20 +02:00
9ad4c3fcf7 Initial checkin of Timer class. 2013-08-07 23:07:26 +02:00
a308102585 VS2012 compile warning fix. 2013-08-07 14:53:08 +02:00
acf5bef5e7 Merge branch 'feature/large-volume-tidying' into develop 2013-08-01 16:34:38 +02:00
e485265dd8 Fixes to allow the SWIG/Python bindings to build again. 2013-08-01 16:08:44 +02:00
dcf86a905c Split Block, CompressedBlock and UncompressedBlock into separate files. It's tidier, and maybe better for SWIG? 2013-08-01 15:32:12 +02:00
6f17e0faa6 The 'Block' class is no longer considered just to be an implementation details of LargeVolume. Users may need to interact with them directly of they implement their own paging or compression systems. 2013-08-01 15:19:10 +02:00
9503d975c1 GCC compile fixes. 2013-07-31 16:37:39 +02:00
e35b58ba18 Fixed paging example. 2013-07-31 15:49:00 +02:00
4478e365c9 Removed RLECompressor as the code is now in RLEBlockCompressor.
Things are starting to get back under control. All tests pass, and all examples except PagingExample work.
2013-07-30 17:01:27 +02:00
fa8813ba86 FilePager now cleans up after itself. 2013-07-30 16:34:40 +02:00
d1138dcdb1 Some new block compression code as I rework the previous code... 2013-07-30 16:01:03 +02:00
020ac9655a Added random prefix to filename to prevent name conflicts. 2013-07-30 15:42:51 +02:00
a4fc814a51 Rearranging and renaming some code. 2013-07-29 16:04:01 +02:00
00fab818cc Added define to switch between SimpleVolume and LargeVolume in Cubiquity. This is an abuse of Typedef.h but it's a convenient location and just for temporary testing purposes. It won't get merged back into PolyVox. 2013-07-28 16:45:08 +02:00
0c8013317e Added asserts to catch corrupt data probably resulting from multithreading. 2013-07-28 16:43:43 +02:00
a10fcf8ecc Small changes for debugging Cubiquity. 2013-07-27 15:02:16 +02:00
ef59f329b6 Reorganising compression code. 2013-07-26 16:25:50 +02:00
f54532a905 Started moving compression code into separate class. 2013-07-26 16:00:29 +02:00
c3c4ead1f3 Work on paging to files. 2013-07-26 15:38:03 +02:00
b767d9b896 Tidying up. 2013-07-25 17:07:50 +02:00
f4f85551c6 Starting some refactoring of the LargeVolume such that the uncompressed blocks are the 'main' representation, rather than the compressed block being the main version and the uncompressed blocks simply being a cached version. I hope this simplifies and improves the code. 2013-07-25 15:51:30 +02:00
cf9b54e5ab Properly deleting data (delete vs. delete[]). 2013-07-24 16:53:40 +02:00
b07dafc9fa Added code to initilise empty compressed blocks. 2013-07-24 16:39:31 +02:00
69066a068e Implemented flushExcessiveCacheEntries() 2013-07-23 13:48:04 +02:00
7c11a53484 Fixed flushOldestExcessiveBlocks(). 2013-07-23 13:31:24 +02:00