Commit Graph

  • 8943822046 Added asserts to catch invalid material/density values. David Williams 2013-10-20 09:12:37 +02:00
  • 8a07d93b54 Merge branch 'develop' into feature/cubiquity-version Daviw Williams 2013-10-04 13:57:03 +02:00
  • 29bded222f Removed unnecessary error handling. Daviw Williams 2013-10-04 13:56:31 +02:00
  • 21001d6862 Removed wrapper for class which was removed. David Williams 2013-10-04 13:35:31 +02:00
  • 1531e1cd00 Switched some code to size_t for compatibility with Miniz. David Williams 2013-10-04 13:30:30 +02:00
  • 4d683627da Added some comments. Daviw Williams 2013-10-03 16:56:14 +02:00
  • d17c1b404b Bit more tidying of Miniz code. Daviw Williams 2013-10-03 16:45:46 +02:00
  • ef615cc838 Added missing file. Daviw Williams 2013-10-03 16:26:43 +02:00
  • dcea5ccc54 Merge branch 'feature/miniz-fixes' into develop Daviw Williams 2013-10-02 16:58:48 +02:00
  • 498f21f63f Replaced arrays with std::vector. Daviw Williams 2013-10-02 16:48:30 +02:00
  • a4e09c2481 Small fixes (including crash fix). Daviw Williams 2013-10-02 15:36:21 +02:00
  • 29ca1e763f Renamed functions to avoid confusion. Daviw Williams 2013-10-02 15:09:55 +02:00
  • 513c3a90b0 Rearranging some miniz code to simplify it a bit. Daviw Williams 2013-10-01 16:33:39 +02:00
  • 319a0ce352 Removed old compression classes. Daviw Williams 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. Daviw Williams 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. Daviw Williams 2013-10-01 15:33:40 +02:00
  • f81b42747b Implement Timer for C++11 Matt Williams 2013-08-22 20:40:45 +01:00
  • 886c66d7c3 Merge branch 'develop' into feature/cubiquity-version David Williams 2013-08-19 16:28:23 +02:00
  • 55dc066a3f Fixed bug with MinizBlockCompressor always saving out 10,000 bytes of data. David Williams 2013-08-19 16:27:52 +02:00
  • 61e957314f Merge branch 'develop' into feature/cubiquity-version David Williams 2013-08-12 21:06:33 +02:00
  • 07f1ca42d2 Uncompressed blocks are now flushed before compressed blocks. David Williams 2013-08-12 21:04:55 +02:00
  • 6fb30a40f5 Bringing across Region enhancements from Cubiquity branch. David Williams 2013-08-09 20:39:17 +02:00
  • fcf5b2b055 Making Cubiquity version of PolyVox more closely match develop version. David Williams 2013-08-09 20:32:20 +02:00
  • 6a009825b5 Merge branch 'develop' into feature/cubiquity-version David Williams 2013-08-09 17:05:57 +02:00
  • b9546ddcfa Extra checks in during marching cubes to try and catch corrupt data. David Williams 2013-08-09 14:09:59 +02:00
  • 7c74e1faff Move Timer.h to correct location Matt Williams 2013-08-08 10:42:57 +01:00
  • 2f99964606 Tidying timer. David Williams 2013-08-07 23:24:20 +02:00
  • 9ad4c3fcf7 Initial checkin of Timer class. David Williams 2013-08-07 23:07:26 +02:00
  • a308102585 VS2012 compile warning fix. David Williams 2013-08-07 14:53:08 +02:00
  • acf5bef5e7 Merge branch 'feature/large-volume-tidying' into develop David Williams 2013-08-01 16:34:38 +02:00
  • e485265dd8 Fixes to allow the SWIG/Python bindings to build again. David Williams 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? David Williams 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. David Williams 2013-08-01 15:19:10 +02:00
  • 9503d975c1 GCC compile fixes. David Williams 2013-07-31 16:37:39 +02:00
  • e35b58ba18 Fixed paging example. David Williams 2013-07-31 15:49:00 +02:00
  • 4478e365c9 Removed RLECompressor as the code is now in RLEBlockCompressor. David Williams 2013-07-30 17:01:27 +02:00
  • fa8813ba86 FilePager now cleans up after itself. David Williams 2013-07-30 16:34:40 +02:00
  • d1138dcdb1 Some new block compression code as I rework the previous code... David Williams 2013-07-30 16:01:03 +02:00
  • 020ac9655a Added random prefix to filename to prevent name conflicts. David Williams 2013-07-30 15:42:51 +02:00
  • a4fc814a51 Rearranging and renaming some code. David Williams 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. David Williams 2013-07-28 16:45:08 +02:00
  • 0c8013317e Added asserts to catch corrupt data probably resulting from multithreading. David Williams 2013-07-28 16:43:43 +02:00
  • a10fcf8ecc Small changes for debugging Cubiquity. David Williams 2013-07-27 15:02:16 +02:00
  • ef59f329b6 Reorganising compression code. David Williams 2013-07-26 16:25:50 +02:00
  • f54532a905 Started moving compression code into separate class. David Williams 2013-07-26 16:00:29 +02:00
  • c3c4ead1f3 Work on paging to files. David Williams 2013-07-26 15:38:03 +02:00
  • b767d9b896 Tidying up. David Williams 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. David Williams 2013-07-25 15:51:30 +02:00
  • cf9b54e5ab Properly deleting data (delete vs. delete[]). David Williams 2013-07-24 16:53:40 +02:00
  • b07dafc9fa Added code to initilise empty compressed blocks. David Williams 2013-07-24 16:39:31 +02:00
  • 69066a068e Implemented flushExcessiveCacheEntries() David Williams 2013-07-23 13:48:04 +02:00
  • 7c11a53484 Fixed flushOldestExcessiveBlocks(). David Williams 2013-07-23 13:31:24 +02:00
  • 7146b5ecdb The idea of a 'setTargetMemoryLimitInBytes' function was not really working out. It was too comp-lex and not really clear what the ideal size would be. I think user code needs to call setMaxNumberOfBlocksInMemory() and setMaxNumberOfUncompressedBlocks() directly, if they see from profiling toat too much camressing or paging is taking place. David Williams 2013-07-23 13:15:01 +02:00
  • 7ee913c8a8 Fix the SWIG warning in the SWIG interface files Matt Williams 2013-07-22 16:10:31 +01:00
  • 3971e6415c Added SWIG tests to stop build warning about operator<<. David Williams 2013-07-22 16:37:35 +02:00
  • 63dfaa5a13 Enable C# bindings even if Python wasn't found. Matt Williams 2013-07-21 10:31:24 +01:00
  • 7cd115b33d Work on code which computes how the memory should be split between compressed and uncompressed data. David Williams 2013-07-19 16:43:59 +02:00
  • ef6bd31651 Small fixes. David Williams 2013-07-18 17:03:14 +02:00
  • 88cbeb309c Reimplemented eraseBlock for uncompressed blocks. David Williams 2013-07-18 16:08:18 +02:00
  • 1e986f9aa6 Reimplemented eraseBlock for compressed blocks. David Williams 2013-07-17 17:00:12 +02:00
  • 404f12a43e Added typedefs to simplify code. David Williams 2013-07-17 16:33:46 +02:00
  • 5b99854c02 Making block copy constructors and assignment operators private to prevent accidental copying. David Williams 2013-07-17 16:23:46 +02:00
  • dea7e6a4e9 Tidying up block classes. David Williams 2013-07-16 16:50:04 +02:00
  • b5d930062b Const fixes. David Williams 2013-07-16 16:09:57 +02:00
  • 3904c9aa8f Tidying and renaming... David Williams 2013-07-16 15:59:06 +02:00
  • 0cfb9f5196 Splitting 'Block into CompressedBlock and UncompressedBlock. David Williams 2013-07-16 14:42:43 +02:00
  • 2acb98bdcb Compile warning fixes. David Williams 2013-07-16 11:50:59 +02:00
  • a00574351f Renamed Block to CompressedBlock David Williams 2013-07-11 16:38:28 +02:00
  • 00eb281990 Stripping down Block class. David Williams 2013-07-11 16:30:19 +02:00
  • 0d92bc6c8c Starting to split Block class into CompressedBlock and UncompressedBlock. David Williams 2013-07-11 16:17:48 +02:00
  • 9ff95f7061 Minor fixes. David Williams 2013-07-11 15:55:34 +02:00
  • e6cbc09e83 getUncompressedBlock now return raw pointer instead of block pointer. David Williams 2013-07-11 15:30:15 +02:00
  • 884fe04c12 Tidying up... David Williams 2013-07-11 15:01:18 +02:00
  • abd1920d80 Adding new caching mechanism. David Williams 2013-07-11 14:50:06 +02:00
  • a589c6e4ac Split come code into getCompressedBlock() function. David Williams 2013-07-11 14:26:38 +02:00
  • 056064409d Work on LargeVolume. Daviw Williams 2013-07-05 16:07:38 +02:00
  • 0c55938242 Work on the code that frees up memory in LargeVolume. Daviw Williams 2013-07-05 15:41:16 +02:00
  • 2f2475ad0c Avoid ambiguous function resolution of getVoxelImpl Matt Williams 2013-07-04 22:05:06 +01:00
  • 8027f9904d On systems that support it, raise SIGTRAP to drop into the debugger Matt Williams 2013-07-04 19:34:49 +01:00
  • 9f7f893b68 Change the types of the edgeTable and triTable Matt Williams 2013-07-03 19:14:00 +01:00
  • bd60f34bd7 Removing explicit functions to control the number of compressed and uncompressed blocks in memory, and letting the user set a memory limit instead. Daviw Williams 2013-07-04 16:23:58 +02:00
  • 26f512eba7 Fixed compile warning. Daviw Williams 2013-07-02 16:08:52 +02:00
  • c843e7e705 Remove unnecessary consts. Matt Williams 2013-07-01 12:23:21 +01:00
  • aab1149e8f Merge branch 'develop' into feature/cubiquity-version David Williams 2013-06-28 20:26:25 +02:00
  • edf1f5d665 Fix compile error caused by missing #include. Matt Williams 2013-06-28 16:47:02 +01:00
  • 059a4b9465 Reverted accidental commit of test code. Daviw Williams 2013-06-28 16:58:31 +02:00
  • e38aa3b1b9 Unit tests now test FilePager. Daviw Williams 2013-06-28 16:16:08 +02:00
  • 839f366174 Compile fixes for Linux. Added SWIG files to make bindings build. David Williams 2013-06-28 15:07:19 +02:00
  • 7cad8388b9 Merge branch 'develop' into feature/cubiquity-version David Williams 2013-06-27 21:40:10 +02:00
  • 0d839c4a51 Merge branch 'feature/paging' into develop Daviw Williams 2013-06-27 16:49:32 +02:00
  • f3ec94dd75 Reverted changes made for testing. Daviw Williams 2013-06-27 16:43:49 +02:00
  • 97a501e3da Updated changelog. Daviw Williams 2013-06-27 16:41:24 +02:00
  • 72b3cd5154 Tidying up and comments. David Williams 2013-06-26 23:39:21 +02:00
  • 885a50e781 Merge branch 'develop' into feature/paging David Williams 2013-06-26 22:49:36 +02:00
  • 56cf423bfd Added POLYVOX_THROW_IF macro to simplify error handling. David Williams 2013-06-26 22:39:15 +02:00
  • 1064ea1c47 Stripped out unused code. David Williams 2013-06-26 22:14:01 +02:00
  • acb43d54d9 Fixed paging example. David Williams 2013-06-26 22:08:49 +02:00
  • 938eea7c8e Work on tidying LargeVolume... David Williams 2013-06-26 22:01:44 +02:00
  • 44d525f591 Tidying up and refactoring LargeVolume. Daviw Williams 2013-06-26 17:02:06 +02:00
  • 8ab6d73f0a Work on LargeVolume refactoring - getting FilePager working. David Williams 2013-06-25 23:34:58 +02:00