Commit Graph

212 Commits

Author SHA1 Message Date
db2e62d2a8 Replaced LargeVolume and SimpleVolume with PagedVolume in tests and examples. 2014-09-21 17:57:42 +02:00
880dcd8645 Fixed incorrect messages about temp files not being deleted. 2014-09-20 17:17:18 +02:00
c0a22de2df Removed a lot of compression-related code. 2014-09-13 12:20:56 +02:00
302c6e688b More work eliminating compression from inside LargeVolume. 2014-09-13 11:59:51 +02:00
bfa14a32df Split 'decode()' function into several variants so it's not so heavily overloaded. 2014-07-24 16:55:11 +02:00
31e5a6e346 Replaced 'm_region' with 'm_offset' and demonstrated its use. 2014-06-02 17:30:41 +02:00
85c5686ff9 Work on more compact version of MarchingCubesVertex. 2014-05-29 09:53:16 +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
1d8fc25cb7 Compile fixes for GCC/Linux 2014-05-26 23:14:29 +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
5a23299634 More tidying shader code. 2014-05-26 21:14:54 +02:00
fd3879faeb Tidying OpenGLExample shader code. 2014-05-26 21:10:07 +02:00
40e528d782 Added lighting to OpenGL example. 2014-05-26 17:00:26 +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
b63a09cab3 Changing the way the examples handle translation and scaling. 2014-05-25 21:29:44 +02:00
eb39f0bb4c OpenGLExample is once again rendered as multiple separate mehses (but using the example framework this time). 2014-05-25 12:28:45 +02:00
f78aad8abd Fixed colors to match previous version of the example. 2014-05-24 22:58:31 +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
6cbb2d44bf Work on making OpenGLExample work with common example framework. 2014-05-23 22:44:58 +02:00
34f57911a7 Converting OpenGLExample to use common OpenGLWidget. 2014-05-23 22:18:17 +02:00
4aae00e4a8 Renamed SurfaceMesh to just Mesh 2014-05-23 15:17:07 +02:00
573c36db87 Renamed vertex classes to the far more meaningful 'CubicVertex' and 'MarchingCubesVertex'. The old names didn't make much sense, even less so now they are templatized. 2014-05-11 15:17:59 +02:00
ae87dbee77 Fixed materials in OpenGL example. 2014-05-08 16:40:27 +02:00
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
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
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
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
4478e365c9 Removed RLECompressor as the code is now in RLEBlockCompressor.
Things are starting to get back under control. All tests pass, and all examples except PagingExample work.
2013-07-30 17:01:27 +02:00
a14de4a72e Replaced std::functions with Pager class for paging. 2013-06-16 19:48:14 +02:00
1010052ea6 Reworking the logging system. 2013-05-14 16:52:16 +02:00
1e9bb88337 Fixed compile errors in VS2008. 2013-01-02 14:13:42 +01: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
20a6095d75 Removed use of Vector deprecated operator<. 2012-12-09 14:36:22 +01: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
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
ef34c5d889 Fixed conversion warning. 2012-11-16 10:50:46 +01:00
ba6f3ac48b Updated GLEW to latest version (this fixes some compiler warnings). 2012-11-16 10:48:32 +01:00
c59a659964 Marked some parts of PolyVox as deprecated. 2012-11-09 16:12:26 +01:00
d4edc1047e Renamed 'PolyVoxImpl' to just 'Impl'. 2012-11-05 17:00:09 +01:00