45 Commits

Author SHA1 Message Date
d544de6dd1 Removed deprecated functions. 2015-12-26 23:41:49 +00:00
e89a55d154 Applied default Visual Studio formatting to most files. This is a quick fix for the tabs vs spaces issue that messes up the formatting in any editor (esp. Linux) which handles tabs/spaces differently to Visual Studio. Some parts of the formatting look a bit worse but overall it should be better (or at least more consistent).
I didn't apply the changes to a few macro-heavy files as Visual Studio removes all indentation from macros, whereas the indentation can be handy to see nesting.
2015-12-26 23:11:27 +00:00
b3ca051878 Changed 'embedded' licenses from zlib to MIT. 2015-12-26 21:45:41 +00:00
7ac652e92b More compile fixes for GCC. Because our openGLWidget is now templatized we need to explicitly use 'this->' to access base members (and the gl...() functions are provided by the base class in Qt). See http://stackoverflow.com/a/15505043 2015-02-25 16:11:22 +01:00
f7af804ccf Compile fix for GCC. 2015-02-25 15:57:59 +01:00
1f3dc558da Added missing header. 2015-02-24 23:46:35 +01:00
2ec29e33b7 Tidying up OpenGLWidget. 2015-02-24 23:44:04 +01:00
e985dce075 Templatized OpenGLWidget so users can specify the version of OpenGL to support. 2015-02-24 22:17:46 +01:00
d3b71a92b9 Tidying up code. 2015-02-24 16:53:34 +01:00
9547824f14 Renamed matrices. I quite like names such as 'modelToWorldMatrix' and 'cameraToClipMatrix' because they were very explicit about what the transform was doing. However OpenGL uses common terms such as 'model matrix' and 'projection matrix', so other people wlil be able to follow the code more easily if we stick to these conventions. 2015-02-24 16:08:55 +01:00
7262ca313e More work splitting example framework into two pieces. 2015-02-20 16:56:03 +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
9c93c5fc36 Switched examples to use FPS-style first person perspective camera. 2015-02-20 15:28:54 +01:00
3f849e19a4 Started refactoring examples and got DecodeOnGPUExample working. 2015-02-15 12:03:31 +01:00
41498cfcb8 Removed GLEW from repository. 2015-02-09 23:22:12 +01:00
ec80bfe740 Switched to using Qt for loading extensions, instead of GLEW. 2015-02-09 23:17:33 +01:00
049a77cd0c Moved all headers from 'PolyVoxCore' to 'PolyVox', as we no longer have the core/util distinction. 2015-02-07 17:26:36 +01:00
86357d66b7 Normalized line endings 2014-09-25 22:38:01 +02:00
17ee7982d5 Added typename for GCC. 2014-08-19 21:30:37 +02:00
f1ed0c1be2 Examples now support both 16 and 32 bit indices. 2014-08-13 15:59:13 +02:00
9b19ea656b Fix commit on Linux 2014-06-03 10:37:11 +01:00
f945fd4ce4 Work on example to decode vertices on the GPU. 2014-05-29 12:38:43 +02:00
2090b0087c Vertices now carry general purpose 'data' rather than a 'material', though the data will be treated as a material in many cases. This is part of making the architecture more generic and involves some renaming. 2014-05-29 11:39:29 +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
1d8fc25cb7 Compile fixes for GCC/Linux 2014-05-26 23:14:29 +02:00
321d3eb7d4 Removed initializer which isn't supported in VS 2012. 2014-05-26 22:51:55 +02:00
ba58cff815 Removed use of 'R' raw string literals as CS 2012 doesn't support them. 2014-05-26 22:51:09 +02:00
4ae25d6b1e More commenting. 2014-05-26 16:50:13 +02:00
e9c8daa9cb Add comments and tidying. 2014-05-26 16:31:12 +02:00
2a072f9347 Rearranged some functions. 2014-05-25 23:44:37 +02:00
9e835a1110 Shader now passed by shared pointer. 2014-05-25 23:40:55 +02:00
b97bf52214 Tidying up. 2014-05-25 23:34:12 +02:00
ec08b28002 Turned off back-face culling in examples, as this makes it easier to view certain shapes such as heightmaps. 2014-05-25 21:45:28 +02:00
499db6a185 Changed default shader to use normal as RGB (more useful for debugging). 2014-05-25 21:43:37 +02:00
22869e4861 More tweaks to scaling and translation. 2014-05-25 21:36:41 +02:00
b63a09cab3 Changing the way the examples handle translation and scaling. 2014-05-25 21:29:44 +02:00
99cf75e902 Material now passed to shader as integer rather than float. 2014-05-24 22:53:10 +02:00
07b9cf05fa Changed OpenGLExample to use MaterialDensityPair88 instead of MaterialDensityPair44.
Added material to shaders.
2014-05-24 21:09:26 +02:00
aace1f2e36 Exposing normals to example framework. 2014-05-24 09:38:01 +02:00
f65edddd81 Tidying up. 2014-05-24 08:38:18 +02:00
6cbb2d44bf Work on making OpenGLExample work with common example framework. 2014-05-23 22:44:58 +02:00
d34fd6b3c8 Moved OpenGLWidget into common folder so it can be used by other examples. 2014-05-23 22:11:47 +02:00
416fdbb1d2 Moved GLEW into Examples/Common folder in Visual Studio. 2012-12-09 19:06:02 +01:00
989cd453fe Consolidate glew into one location to speed up build. 2012-11-23 23:01:50 +00:00