e985dce075
Templatized OpenGLWidget so users can specify the version of OpenGL to support.
2015-02-24 22:17:46 +01:00
838407ba4f
Started splitting example framework into to two classes. One will be general purpose (for use in Cubiquity, etc), and the other will have PolyVox specific stuff.
2015-02-20 16:20:09 +01:00
ec80bfe740
Switched to using Qt for loading extensions, instead of GLEW.
2015-02-09 23:17:33 +01:00
c62bde0066
Work on getting the OpenGL/Qt5 support working with new header-only library.
2015-02-09 22:11:06 +01:00
d9da93b6c0
Merge branch 'develop' into feature/opengl
...
Conflicts:
examples/Basic/CMakeLists.txt
examples/Basic/OpenGLWidget.cpp
examples/Basic/OpenGLWidget.h
include/PolyVox/Impl/Timer.h
2015-02-08 20:49:25 +01:00
16a75d0606
Reoranising header structure.
2015-02-07 17:16:54 +01:00
a296807ed9
Removed PolyVoxUtil.
2015-02-07 14:59:08 +01:00
c3f2e5217e
Removed CMake code which tries to build/use PolyVoxCore as a library.
2015-02-06 23:29:35 +01:00
86357d66b7
Normalized line endings
2014-09-25 22:38:01 +02:00
e9ba998f2f
Changes to the folder organization of some files in Visual Studio (via CMake's source_group).
2014-05-28 14:03:26 +02:00
c26686476d
Use Qt's resource system to store the shader source
...
The shader source is included inside each comipled binary file. The
OpenGL example also provides its own shader files which overrides
the default. Common shader code is in the 'common' directory and
each example's custom shader is alongside the example's C++ code.
2014-05-28 10:29:05 +01:00
140cbc0fc7
Move shader code to external files rather than embedded
...
A bit of CMake code in each example copies the files to the
correct location and Qt loads them from the application's binary
directory.
2014-05-27 15:08:20 +01:00
d34fd6b3c8
Moved OpenGLWidget into common folder so it can be used by other examples.
2014-05-23 22:11:47 +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
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
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
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
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
9f0ae602b8
Increased warning level in Visual studio.
2011-07-19 22:09:24 +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
7d76a1bb69
CMake fixes for Windows.
2011-04-28 11:56:33 +01:00
ac0fb2b310
Make dynamic or static libraries optional
...
The user can choose static or dynamic libraries using
BUILD_STATIC_LIBRARIES and BUILD_DYNAMIC_LIBRARIES. By default
Windows will only build static libraries and Linux will build both.
2011-04-21 21:40:51 +02:00
ef52b906e6
Switched PoyVox to build as a static library.
2011-04-20 23:25:32 +01:00
c906e71bc3
Tidying up basic OpenGL example.
2010-07-09 21:36:29 +00:00
2818311a94
Added initial version of new basic example.
2010-07-04 20:28:58 +00:00
