|
|
906d685f5f
|
Stripped down the 'removed' version of the logging macros to minimize the chance that they have any effect on the code.
|
2014-01-30 23:04:37 +01:00 |
|
|
|
248a5c3e29
|
Removed old logging system.
|
2014-01-30 22:10:52 +01:00 |
|
|
|
109bfb7e9e
|
Merge branch 'develop' into feature/cubiquity-version
|
2014-01-30 16:30:21 +01:00 |
|
|
|
af9eacef37
|
Changed new logging system to work on strings rather than streams.
|
2014-01-30 16:27:33 +01:00 |
|
|
|
2955b35743
|
Merge branch 'develop' into feature/cubiquity-version
|
2014-01-29 21:31:36 +01:00 |
|
|
|
f4e03cc537
|
Macros now call new logging system instead of the old one.
|
2014-01-29 21:29:00 +01:00 |
|
|
|
84921f4d0b
|
The existing logging code is rather large and overwhelming. I'm starting to replace it with a simpler system that should also be easier to maintain.
|
2014-01-29 16:53:11 +01:00 |
|
|
|
20576d7a6f
|
Merge branch 'develop' into feature/cubiquity-version
Conflicts:
library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
|
2014-01-28 23:39:22 +01:00 |
|
|
|
2ae5667986
|
Replaced some more logging commands with macros which can be compiled out.
|
2014-01-28 23:15:24 +01:00 |
|
|
|
e0e860c45c
|
Added <algorithm>
|
2014-01-28 20:59:55 +01:00 |
|
|
|
a9238051fa
|
Changed some logging statements to macros which can be #defined out.
|
2014-01-26 23:53:10 +01:00 |
|
|
|
52e25f2b3d
|
Merge branch 'develop' into feature/cubiquity-version
|
2014-01-26 21:34:46 +01:00 |
|
|
|
f58161c748
|
Added logging macros which can be disabled at compile time.
|
2014-01-24 16:35:58 +01:00 |
|
|
|
c177891e5d
|
Separated logging code into different .cpp/.h files.
|
2014-01-24 15:21:59 +01:00 |
|
|
|
8d5f6af7cd
|
Compile fix for VS2012, which now builds successfully.
|
2014-01-24 13:53:44 +01:00 |
|
|
|
31b59702be
|
We're committed to LargeVolume now, so we don't need the define to switch volume types.
|
2013-11-18 16:57:37 +01:00 |
|
|
|
15b170696c
|
Merge branch 'develop' into feature/cubiquity-version
|
2013-11-14 15:36:25 +01:00 |
|
|
|
3db5e1b2f6
|
Added microsecond precision to timers.
|
2013-11-14 15:35:41 +01:00 |
|
|
|
f2ecb667e8
|
Merge branch 'develop' into feature/cubiquity-version
|
2013-11-13 15:24:21 +01:00 |
|
|
|
5294efc473
|
Clear the 'last accessed block' flag before flushing the volume.
|
2013-11-12 16:57:11 +01:00 |
|
|
|
85d8bdb30c
|
Rearranged some code to try and improve the robustness of block paging and compression.
|
2013-11-12 16:47:57 +01:00 |
|
|
|
1c5a3f7ef5
|
Reverted attempts to suppress GCC warnings and just removed the offending asserts instead.
Revert "Added asserts to catch invalid material/density values."
This reverts commit 8943822046.
|
2013-10-25 12:44:40 +02:00 |
|
|
|
2d6bb91d96
|
Merge branch 'develop' into feature/cubiquity-version
|
2013-10-24 16:50:38 +02:00 |
|
|
|
afddb59d69
|
Reverted attempt to avoid warnings. Just suppressed them instead.
Revert "Attempting to work around a GCC warning."
This reverts commit 3fe92086f1.
|
2013-10-24 14:37:18 +02:00 |
|
|
|
3fe92086f1
|
Attempting to work around a GCC warning.
|
2013-10-23 16:33:42 +02:00 |
|
|
|
8943822046
|
Added asserts to catch invalid material/density values.
|
2013-10-20 09:12:37 +02:00 |
|
|
|
8a07d93b54
|
Merge branch 'develop' into feature/cubiquity-version
|
2013-10-04 13:57:03 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
