Commit Graph

1117 Commits

Author SHA1 Message Date
163e520e9f Changed he way that materials are blended by default, such that the material of the voxel with the highest density is used. 2014-03-06 16:38:57 +01:00
d8bcd09d9b Compile fixes for GCC. 2014-03-05 16:47:51 +01:00
acbfb184b8 Wrapped MarchingCubesSurfaceExtractor with functions (part of unclassing). 2014-03-05 16:30:54 +01:00
0755961750 Added support for default parameters. 2014-03-05 15:50:17 +01:00
67ec0d2db8 Initial function wrapper around CubicSurfaceExtractorWithNormals. 2014-03-05 15:41:16 +01:00
b416dc933f Merge branch 'develop' into feature/cubiquity-version
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
2014-02-27 15:40:01 +01:00
1cf5f4c899 Added comment. 2014-02-26 17:00:40 +01:00
c5780dd8e2 Brought improved blending changes across from Cubiquity branch. 2014-02-26 16:55:09 +01:00
60396a2699 Merge branch 'develop' into feature/cubiquity-version
Conflicts:
	library/PolyVoxCore/source/Impl/Utility.cpp
2014-02-25 16:55:52 +01:00
2458f94feb Eliminating some differences from the cubiquity-version branch. 2014-02-25 16:51:26 +01:00
aeefe7f938 Merge branch 'develop' into feature/cubiquity-version
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h
2014-02-25 16:35:54 +01:00
0e8973e722 Fixed minor compile errors:
- Lack of <functional> in AStarPathfinder.h
 - Lack of <cstdint> in several files (why did this compile on GCC?)
2014-02-17 15:23:44 +01:00
bc17c802bb Assume C++11 support
Remove all CMake checks for C++11 support since we now assume that we have it.
Replace all polyvox_* macros with standard C++ names.

See #48
2014-02-14 15:03:26 +00:00
376ce595d6 Merge branch 'develop' into feature/cubiquity-version 2014-01-31 21:20:04 +01:00
74be82e8cf Disabled trace stream by default.
Updated docs.
2014-01-30 23:40:50 +01:00
f2dd852bd2 More stripping down of logging macros. 2014-01-30 23:18:41 +01:00
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