David Williams
ae87dbee77
Fixed materials in OpenGL example.
2014-05-08 16:40:27 +02:00
David Williams
b0a8ca8a64
This commit templatizes the vertex classes on voxel types. This was the main change which was made for Cubiquity and it's very messy at the moment. However, this will improve when we make more use of 'auto' to hide the template madness.
2014-05-07 23:47:18 +02:00
David Williams
4c2aea3db1
Removed CubicSurfaceExtractorWithNornals. Going forward users will be expected to compute flat normals in the fragment shader.
2014-05-06 22:00:24 +02:00
David Williams
12246d1633
The PositionMaterial class can now be removed as we're not using it.
2014-05-05 20:58:35 +02:00
David Williams
5dfa7e2562
The CubicSurfaceExtractor now generates vertices of type PositionMaterialNormal rather than PositionMaterial. The normal property is just a dummy and is not filled in, though conceptually we could put something in there in the future (average normal of surrounding faces?)
...
The point of this change is to move towards having a single vertex class with known properties (including normal). This makes it simpler to write code which uses the vertices because we always know which properties are present. This will probably be useful when working with vertex buffer objects.
2014-05-05 20:53:47 +02:00
David Williams
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
David Williams
fe3f2d589e
Fixed uninitialized variables (was causing crash on OS X).
2014-04-14 21:08:05 +02:00
Matt Williams
45302fde02
Qt is not REQUIERD. This was causing errors.
2014-03-27 10:24:29 +00:00
David Williams
d79ac03fb6
VS2012 doesn't accept these curly brackets (C++11 initializer lists?). The code seems to work without them though.
2014-03-25 23:03:18 +01:00
David Williams
7b5e1cd1d5
Unfortunately VS2012 doesn't support 'R' raw string literals . Maybe the shader code should be moved into separate files anyway.
2014-03-25 23:00:29 +01:00
David Williams
a78508a79f
Switched from QOpenGLFunctions_3_1 to QOpenGLFunctions. This seems to require not using vertex arrays, which needs further investigation.
2014-03-25 22:49:59 +01:00
David Williams
19387fd62e
I believe the correct way to use the QOpenGLFunction_3_1 class is actually to use protected inheritance, so that it's members are pulled into class scope and we can avoid the 'gl->' prefix. At least, this is the recommended approach for QOpenGLFunctions ( http://qt-project.org/doc/qt-5/qopenglfunctions.html#details )
2014-03-25 21:53:14 +01:00
David Williams
1f1cc67fb7
Revert "Remove usage of QOpenGLFunctions and use GLEW instead."
...
This reverts commit 464d713c2a
2014-03-25 21:44:01 +01:00
Matt Williams
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
Matt Williams
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
David Williams
f05d54b985
Merge branch 'develop' into feature/extractor-refactor
2014-03-17 16:07:29 +01:00
David Williams
d06650172a
Added missing header which was causing problems when compiling Cubiquity on Linux.
2014-03-16 21:13:15 +01:00
Matt Williams
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
Matt Williams
00d1b8e10c
Update required CMake version to 2.8.6
2014-03-09 17:55:14 +00:00
Matt Williams
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
David Williams
e52e9e373e
Switched test to use unclassed function.
2014-03-07 16:25:24 +01:00
David Williams
0bbb648925
Added functions around CubicSurfaceExtractor.
2014-03-07 16:08:20 +01:00
David Williams
d50b910a45
Merge branch 'develop' into feature/cubiquity-version
...
Conflicts:
library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
2014-03-06 16:54:38 +01:00
David Williams
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
David Williams
d8bcd09d9b
Compile fixes for GCC.
2014-03-05 16:47:51 +01:00
David Williams
acbfb184b8
Wrapped MarchingCubesSurfaceExtractor with functions (part of unclassing).
2014-03-05 16:30:54 +01:00
David Williams
529e97f71e
Added use of auto for determining mesh type.
2014-03-05 15:58:33 +01:00
David Williams
0755961750
Added support for default parameters.
2014-03-05 15:50:17 +01:00
David Williams
67ec0d2db8
Initial function wrapper around CubicSurfaceExtractorWithNormals.
2014-03-05 15:41:16 +01:00
Daviw Williams
b416dc933f
Merge branch 'develop' into feature/cubiquity-version
...
Conflicts:
library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
2014-02-27 15:40:01 +01:00
Daviw Williams
1cf5f4c899
Added comment.
2014-02-26 17:00:40 +01:00
Daviw Williams
c5780dd8e2
Brought improved blending changes across from Cubiquity branch.
2014-02-26 16:55:09 +01:00
Daviw Williams
60396a2699
Merge branch 'develop' into feature/cubiquity-version
...
Conflicts:
library/PolyVoxCore/source/Impl/Utility.cpp
2014-02-25 16:55:52 +01:00
Daviw Williams
2458f94feb
Eliminating some differences from the cubiquity-version branch.
2014-02-25 16:51:26 +01:00
Daviw Williams
aeefe7f938
Merge branch 'develop' into feature/cubiquity-version
...
Conflicts:
library/PolyVoxCore/include/PolyVoxCore/DefaultIsQuadNeeded.h
2014-02-25 16:35:54 +01:00
Daviw Williams
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
Matt Williams
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
David Williams
376ce595d6
Merge branch 'develop' into feature/cubiquity-version
2014-01-31 21:20:04 +01:00
David Williams
74be82e8cf
Disabled trace stream by default.
...
Updated docs.
2014-01-30 23:40:50 +01:00
David Williams
f2dd852bd2
More stripping down of logging macros.
2014-01-30 23:18:41 +01:00
David Williams
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
David Williams
248a5c3e29
Removed old logging system.
2014-01-30 22:10:52 +01:00
Daviw Williams
109bfb7e9e
Merge branch 'develop' into feature/cubiquity-version
2014-01-30 16:30:21 +01:00
Daviw Williams
af9eacef37
Changed new logging system to work on strings rather than streams.
2014-01-30 16:27:33 +01:00
David Williams
2955b35743
Merge branch 'develop' into feature/cubiquity-version
2014-01-29 21:31:36 +01:00
David Williams
f4e03cc537
Macros now call new logging system instead of the old one.
2014-01-29 21:29:00 +01:00
Daviw Williams
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
David Williams
20576d7a6f
Merge branch 'develop' into feature/cubiquity-version
...
Conflicts:
library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
2014-01-28 23:39:22 +01:00
David Williams
2ae5667986
Replaced some more logging commands with macros which can be compiled out.
2014-01-28 23:15:24 +01:00
David Williams
4c29d59430
Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into develop
2014-01-28 21:00:26 +01:00
