8a07d93b54
Merge branch 'develop' into feature/cubiquity-version
2013-10-04 13:57:03 +02:00
4d683627da
Added some comments.
2013-10-03 16:56:14 +02:00
ef615cc838
Added missing file.
2013-10-03 16:26:43 +02:00
319a0ce352
Removed old compression classes.
2013-10-01 15:58:32 +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
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
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
acf5bef5e7
Merge branch 'feature/large-volume-tidying' into develop
2013-08-01 16:34:38 +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
b5d930062b
Const fixes.
2013-07-16 16:09:57 +02:00
9f7f893b68
Change the types of the edgeTable and triTable
...
The range on values in these tables is much less than needs an int so
making them specific width types packs them smaller.
I measure a 5% decrease in the size of the .so file created at -O3.
2013-07-04 19:35:09 +01:00
7cad8388b9
Merge branch 'develop' into feature/cubiquity-version
...
Conflicts:
library/PolyVoxCore/include/PolyVoxCore/Region.h
library/PolyVoxCore/source/Region.cpp
2013-06-27 21:40:10 +02:00
288b448b9f
Brought across Region operator<< from Cubiquity branch.
2013-06-22 10:16:16 +02:00
869f5f6c49
Added function to check whether one region is inside of another.
2013-05-27 14:01:55 +02:00
a56005478d
Fix for Linux compile error.
2013-05-27 12:59:19 +02:00
2b3e9ca206
Merge branch 'develop' into feature/cubiquity-version
2013-05-24 16:01:11 +02:00
d12a81d345
Log messages now automatically have std::endl applied, and work/behave similar to Qt logging functions.
2013-05-24 16:00:19 +02:00
fcb38f0796
Merge branch 'develop' into feature/cubiquity-version
2013-05-24 13:52:21 +02:00
c1461e7582
Added a null stream to suppress logging.
2013-05-24 13:51:52 +02:00
d7d3df2197
Merge branch 'develop' into feature/cubiquity-version
2013-05-24 13:30:04 +02:00
b12e6d045c
Added additional logging streams.
2013-05-24 13:26:26 +02:00
b50d3a299b
Merge branch 'develop' into feature/cubiquity-version
...
Conflicts:
library/PolyVoxCore/include/PolyVoxCore/Impl/ErrorHandling.h
library/PolyVoxCore/source/Impl/ErrorHandling.cpp
2013-05-22 15:38:16 +02:00
f3b0183013
Switching to a stream-based interface for logging.
2013-05-22 14:21:50 +02:00
c806da9bb7
Compile fixes brought across from Cubiquity.
2013-05-16 16:17:01 +02:00
618b09df46
Fixed compile errors.
2013-05-16 16:14:05 +02:00
fa29a83ebd
Merge branch 'develop' into feature/cubiquity-version
2013-05-16 16:06:53 +02:00
2203e30f39
Added documentation on error handling.
...
Default log handler now suppresses LogLevels::Debug messages.
2013-05-15 17:01:57 +02:00
a1355f6d50
More work on improved logging.
2013-05-15 15:55:39 +02:00
1010052ea6
Reworking the logging system.
2013-05-14 16:52:16 +02:00
ee299a45f0
Work on error handling. I replaced some asserts with exceptions and also added basic error handling documentation.
2013-05-11 10:05:08 +02:00
2a839e583d
Added stream serialisation to Region.
2013-05-07 15:41:26 +02:00
fcdb175f1c
Merge branch 'develop' into feature/cubiquity-version
...
Conflicts:
library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h
library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
2013-03-04 21:05:51 +01:00
df5c339f64
Just remembered that we settled on a different formatting for the API docs so that it gets highlighted better in KDE.
2013-03-04 15:36:11 +01:00
b4fcb3daf8
Added API documentation regarding compression.
2013-03-04 15:17:19 +01:00
d12db9906f
Updated note about why we #include the miniz.c file.
2013-03-01 16:33:31 +01:00
a7e49a1394
Still trying to get rid of the warnings on the CDash machine. It's tricky because I'm not seeing the locally and the warning supression seems to vary bewteen vesions of GCC (See: http://dbp-consulting.com/tutorials/SuppressingGCCWarnings.html ).
2013-03-01 16:07:50 +01:00
c28fa9a0ca
It seems that GCC 4.3.5 (on the CDash machine) doesn't recognise ignoring the 'enum-compare' warning. This commit should switch of all warnings instead (just for this file).
2013-02-28 13:42:02 +01:00
7e50dcbd93
It seems push/pop of diagnostic pragmas is only supported on GCC >= 4.6. I've just disabled the warning for the whole file instead.
2013-02-27 14:25:10 +01:00
80025eaa46
Attempting to disable GCC compiler warnings in miniz.c (as I don't want to modify external code).
2013-02-26 10:49:01 +01:00
62370868c8
Reverted accidental changes to tests.
...
Updated comments in compression code.
2013-02-25 17:06:12 +01:00
c42270f165
Possible Linux fix? I didn't reproduce the error myself so I'm just being guided by the CDash messages.
2013-02-25 16:51:57 +01:00
e770baeb05
Added assert for buffer size.
2013-02-25 16:46:04 +01:00
f70498e806
Removed old code.
2013-02-25 16:34:21 +01:00
34671130fb
Tidying up Miniz compression code.
2013-02-25 16:33:39 +01:00
