Commit Graph

1576 Commits

Author SHA1 Message Date
347028199c Paging example now also uses free-function surface extractor. 2014-05-11 16:27:38 +02:00
a51eaa4a02 Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into feature/extractor-refactor
Conflicts:
	examples/Basic/main.cpp
2014-05-11 16:21:37 +02:00
2da902d5f9 This change reverts PolyVox back to using Qt 4.8. This is expected to be a temporary change, required because moving to Qt 5 caused various complications on Windows which we are not yet ready to address.
For more details see here: https://bitbucket.org/volumesoffun/polyvox/issue/41/upgrade-to-qt-5
2014-05-05 20:29:52 +02:00
fe3f2d589e Fixed uninitialized variables (was causing crash on OS X). 2014-04-14 21:08:05 +02:00
45302fde02 Qt is not REQUIERD. This was causing errors. 2014-03-27 10:24:29 +00:00
464d713c2a Remove usage of QOpenGLFunctions and use GLEW instead.
Qt's OpenGL interface was causing problems on Windows since it doesn't mix
well with ANGLE.

Relates to issue #50.
2014-03-23 12:16:02 +00:00
ac16dfd325 Update the BasicExample to use OpenGL 3
The example now uses OpenGL 3 features like Vertex Array Objects and uses
no immediate mode stuff. Qt5 is used for some features like matrices and
shaders.

There is now no dependency on GLEW either.
2014-03-19 21:26:04 +00:00
f05d54b985 Merge branch 'develop' into feature/extractor-refactor 2014-03-17 16:07:29 +01:00
868fbb84a0 Update to use Qt5
The examples and tests now use Qt5. This allows some nice tidying of the
CMake files, some of which will come in future.

Closes issue #41
2014-03-09 18:02:24 +00:00
00d1b8e10c Update required CMake version to 2.8.6 2014-03-09 17:55:14 +00:00
cec740f429 Remove search for Boost
We don't use Boost anywhere any more so don't try to search for it.
2014-03-09 17:54:17 +00:00
e52e9e373e Switched test to use unclassed function. 2014-03-07 16:25:24 +01:00
0bbb648925 Added functions around CubicSurfaceExtractor. 2014-03-07 16:08:20 +01:00
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
529e97f71e Added use of auto for determining mesh type. 2014-03-05 15:58:33 +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
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
2458f94feb Eliminating some differences from the cubiquity-version branch. 2014-02-25 16:51:26 +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
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
af9eacef37 Changed new logging system to work on strings rather than streams. 2014-01-30 16:27:33 +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
2ae5667986 Replaced some more logging commands with macros which can be compiled out. 2014-01-28 23:15:24 +01:00
4c29d59430 Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into develop 2014-01-28 21:00:26 +01:00
e0e860c45c Added <algorithm> 2014-01-28 20:59:55 +01:00
832a45013a Simplify test creation and add XML output option 2014-01-27 19:39:50 +00:00
a9238051fa Changed some logging statements to macros which can be #defined out. 2014-01-26 23:53:10 +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
d96dcaa531 Another Mac/Clang fix. 2013-12-31 14:53:53 +01:00
1cb486cb33 Fixed Clang detection. 2013-12-31 11:19:00 +01:00
3db5e1b2f6 Added microsecond precision to timers. 2013-11-14 15:35:41 +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
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
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