29 Commits

Author SHA1 Message Date
David Williams
fcf5b2b055 Making Cubiquity version of PolyVox more closely match develop version. 2013-08-09 20:32:20 +02:00
David Williams
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
Matt Williams
7c74e1faff Move Timer.h to correct location
Also add a missing semi-colon.
2013-08-08 10:42:57 +01:00
David Williams
2f99964606 Tidying timer. 2013-08-07 23:24:20 +02:00
David Williams
9ad4c3fcf7 Initial checkin of Timer class. 2013-08-07 23:07:26 +02:00
Matt Williams
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
David Williams
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
Daviw Williams
a56005478d Fix for Linux compile error. 2013-05-27 12:59:19 +02:00
Daviw Williams
2b3e9ca206 Merge branch 'develop' into feature/cubiquity-version 2013-05-24 16:01:11 +02:00
Daviw Williams
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
Daviw Williams
fcb38f0796 Merge branch 'develop' into feature/cubiquity-version 2013-05-24 13:52:21 +02:00
Daviw Williams
c1461e7582 Added a null stream to suppress logging. 2013-05-24 13:51:52 +02:00
Daviw Williams
d7d3df2197 Merge branch 'develop' into feature/cubiquity-version 2013-05-24 13:30:04 +02:00
Daviw Williams
b12e6d045c Added additional logging streams. 2013-05-24 13:26:26 +02:00
Daviw Williams
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
Daviw Williams
f3b0183013 Switching to a stream-based interface for logging. 2013-05-22 14:21:50 +02:00
Daviw Williams
c806da9bb7 Compile fixes brought across from Cubiquity. 2013-05-16 16:17:01 +02:00
Daviw Williams
618b09df46 Fixed compile errors. 2013-05-16 16:14:05 +02:00
Daviw Williams
fa29a83ebd Merge branch 'develop' into feature/cubiquity-version 2013-05-16 16:06:53 +02:00
Daviw Williams
2203e30f39 Added documentation on error handling.
Default log handler now suppresses LogLevels::Debug messages.
2013-05-15 17:01:57 +02:00
Daviw Williams
a1355f6d50 More work on improved logging. 2013-05-15 15:55:39 +02:00
Daviw Williams
1010052ea6 Reworking the logging system. 2013-05-14 16:52:16 +02:00
David Williams
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
David Williams
f76be64d6b Work on VolumeResampler (using real convolution). 2013-01-27 22:02:13 +01:00
David Williams
575f4824cc Added 'upperPowerOfTwo' function. 2013-01-03 00:05:28 +01:00
David Williams
2b70f81a9a Added missing .cpp file... thought I did this already?! 2012-12-29 20:32:21 +00:00
David Williams
9c970bd11a Added missing .cpp file to cubiquity version of PolyVox. 2012-12-29 21:16:36 +01:00
David Williams
4f7a6256a9 The throwing of exceptions can now be disabled, and in this case a handler function is called instead. 2012-12-29 00:11:23 +00:00
unknown
d4edc1047e Renamed 'PolyVoxImpl' to just 'Impl'. 2012-11-05 17:00:09 +01:00