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
1f1cc67fb7
Revert "Remove usage of QOpenGLFunctions and use GLEW instead."
...
This reverts commit 464d713c2a
2014-03-25 21:44:01 +01: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
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
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
248a5c3e29
Removed old logging system.
2014-01-30 22:10:52 +01:00
9ad4c3fcf7
Initial checkin of Timer class.
2013-08-07 23:07:26 +02:00
f3ec94dd75
Reverted changes made for testing.
2013-06-27 16:43:49 +02:00
938eea7c8e
Work on tidying LargeVolume...
2013-06-26 22:01:44 +02:00
44d525f591
Tidying up and refactoring LargeVolume.
2013-06-26 17:02:06 +02:00
8ab6d73f0a
Work on LargeVolume refactoring - getting FilePager working.
2013-06-25 23:34:58 +02:00
59505d47e9
Tidying up Block and FilePager.
2013-06-23 23:17:40 +02:00
f5ea8878c2
Add a default CompilerCapabilities.h
...
This file assumes that the compiler doesn't support anything. If building
without CMake, it will be used and if you want to enable things, the file
can be edited.
When using CMake, a proper CompilerCapabilites.h will be generated and
CMake will set the include path order correctly in order to source the
correct file.
2012-12-26 12:54:52 +00:00
74f25eac23
Merge branch 'develop' into feature/cmake-cxx11-detect
...
Conflicts:
examples/Basic/CMakeLists.txt
examples/OpenGL/CMakeLists.txt
examples/Paging/CMakeLists.txt
examples/SmoothLOD/CMakeLists.txt
library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
2012-12-24 20:08:31 +00:00
312a3def68
Fix GLEW compile error on Windows.
2012-11-26 23:15:19 +00:00
989cd453fe
Consolidate glew into one location to speed up build.
2012-11-23 23:01:50 +00:00
3902e00a0f
Add a CompilerCapabilities.h.in file which is filled in by CMake
...
It will #define a each of the basic features detected by CMake which can
then be used by other headers (like TypeDef.h) to set things up for
PolyVox.
It is this file which you will have to manually edit and rename if you want
to skip using CMake.
2012-11-23 15:41:26 +00:00
7f6d952dbe
A better fix than 17a2a8e3d1 for GLEW
2012-11-19 12:05:29 +00:00
17a2a8e3d1
Fix include path for glew headers.
2012-11-19 10:44:10 +00:00
03cd1ada6d
Small changes to basic example, mostly for clarity.
2012-11-17 16:38:46 +01:00
570b633f6b
Now it's really fixed.
2012-11-17 12:37:39 +01:00
a3edb3358b
I broke all the examples when I updated GLEW, now fixed.
2012-11-17 12:34:58 +01:00
ba6f3ac48b
Updated GLEW to latest version (this fixes some compiler warnings).
2012-11-16 10:48:32 +01:00
2566f3a7d2
Examples have had their loops backwards... fortunately all the volumes were cubic so it didn't matter.
2012-11-02 13:29:58 +01:00
bc01223237
Removed some unecessary hierarchy in VS project structure.
...
Renamed the documentation targets in VS for clarity.
2012-09-28 14:07:13 +02:00
4b63c34305
Brought the manual and API docs together under the same heading in Visual Studio.
2012-09-28 13:54:27 +02:00
480c159327
Add copyright headers to all the CMake files
2012-08-24 13:20:41 +01:00
b96309f4a4
Use the CMake folder tool to help IDEs groupt targets.
...
This is done as seen in http://athile.net/library/blog/?p=288
Hopefully this works in Visual Studio as KDevelop doesn't use this feature.
2012-08-12 04:29:51 +01:00
309f270e67
Exposed 'VoxelType' in BaseVolume.
2012-04-16 16:50:41 +02:00
86b84339af
Work on CubicSurfaceExtractorWithNormals.
2012-04-16 16:14:09 +02:00
7d1d81c732
Work making CubicSurfaceExtractorWithNormals use 'isQuadNeeded'.
2012-04-16 15:23:45 +02:00
8e4135ad41
Add newlines to end of files to silence compiler warnings
2012-02-27 23:03:36 +00:00
3f56ee6f72
More refactoring of basic voxel types. Started replacing getDensity and getMaterial with free functions.
2012-02-18 12:12:38 +01:00
c483b44a41
Replaced constants with functions for type traits.
2012-02-06 17:51:37 +01:00
49b5fb3f67
Refactoring of basic voxel types.
2012-01-12 17:14:45 +01:00
462295cf8b
Switched BasicExample back to 'advanced' API (not SimpleInterface).
2011-10-16 23:03:04 +01:00
db81e1bc3f
Work on simple interface.
2011-10-15 00:01:17 +01:00
6f31898fd7
Renamed Volume base class to BaseVolume.
...
Added initial version of simple interface.
2011-10-14 23:57:10 +01:00
9f0ae602b8
Increased warning level in Visual studio.
2011-07-19 22:09:24 +01:00
834aa5d6c3
Warning fixes for GCC 4.6.
2011-07-04 22:21:27 +01:00
2da63912fb
Renamed glew.c to glew.cpp to avoid compilation warnings with '-std=c++0x'
2011-06-18 23:38:02 +01:00
528cb73771
Moved headers into subdirectories.
2011-05-17 22:27:46 +01:00
55df6324fa
Slightly more sensible mouse handling.
2011-05-09 23:02:13 +01:00
3a171e698b
Modified SurfaceExtractor to use template template parameters.
2011-04-30 23:51:04 +01:00
36a9be83db
Added template template parameters to CubicSurfaceExtractorWithNormals.
2011-04-30 22:46:45 +01:00
afbf49f626
Added initial version of SimpleVolume by duplicating LargeVolume.
2011-04-29 22:02:40 +01:00
