|
|
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 |
|
|
|
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 |
|
|
|
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.
|
2013-07-23 13:15:01 +02:00 |
|
|
|
7ee913c8a8
|
Fix the SWIG warning in the SWIG interface files
This keeps the .cpp and .h files clean.
|
2013-07-22 16:10:31 +01:00 |
|
|
|
3971e6415c
|
Added SWIG tests to stop build warning about operator<<.
|
2013-07-22 16:37:35 +02:00 |
|
|
|
63dfaa5a13
|
Enable C# bindings even if Python wasn't found.
|
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.
|
2013-07-19 16:43:59 +02:00 |
|
|
|
ef6bd31651
|
Small fixes.
|
2013-07-18 17:03:14 +02:00 |
|
|
|
88cbeb309c
|
Reimplemented eraseBlock for uncompressed blocks.
|
2013-07-18 16:08:18 +02:00 |
|
|
|
1e986f9aa6
|
Reimplemented eraseBlock for compressed blocks.
|
2013-07-17 17:00:12 +02:00 |
|
|
|
404f12a43e
|
Added typedefs to simplify code.
|
2013-07-17 16:33:46 +02:00 |
|
|
|
5b99854c02
|
Making block copy constructors and assignment operators private to prevent accidental copying.
|
2013-07-17 16:23:46 +02:00 |
|
|
|
dea7e6a4e9
|
Tidying up block classes.
|
2013-07-16 16:50:04 +02:00 |
|
|
|
b5d930062b
|
Const fixes.
|
2013-07-16 16:09:57 +02:00 |
|
|
|
3904c9aa8f
|
Tidying and renaming...
|
2013-07-16 15:59:06 +02:00 |
|
|
|
0cfb9f5196
|
Splitting 'Block into CompressedBlock and UncompressedBlock.
|
2013-07-16 14:42:43 +02:00 |
|
|
|
2acb98bdcb
|
Compile warning fixes.
|
2013-07-16 11:50:59 +02:00 |
|
|
|
a00574351f
|
Renamed Block to CompressedBlock
|
2013-07-11 16:38:28 +02:00 |
|
