3facd4df41Removed commented out code.
David Williams
2015-03-21 16:27:43 +01:00
d6c708f869Merge branch 'develop' into feature/optimize-paged-volume
David Williams
2015-03-21 16:24:46 +01:00
b027cf1a0cMoved common code into function.
David Williams
2015-03-21 16:22:23 +01:00
778238d11dMoved the test for whether we are accessing the same voxel as last time.
David Williams
2015-03-21 14:57:48 +01:00
d477bec540Revert "Replaced Vector3D with integer as key to map."
David Williams
2015-03-21 14:41:15 +01:00
672c375a7aRevert "Work on using a bitfield to set up chunk key."
David Williams
2015-03-21 14:41:10 +01:00
5fc0317260Revert "Added typedef for chunk key type."
David Williams
2015-03-21 14:41:04 +01:00
92eaaae765Revert "Decided to always use a 64-bit chunk key, rather than trying to make it configurable."
David Williams
2015-03-21 14:40:57 +01:00
ceeb8f70ceRevert "Going back to building key by shifting instead of using bitfield."
David Williams
2015-03-21 14:40:49 +01:00
0c619ebec7Revert "Added typedef for ChunkKey."
David Williams
2015-03-21 14:40:30 +01:00
f574563672Revert "New, safer method of packing which makes careful use of casting to avoid problems with e.g. signed integer sign extension."
David Williams
2015-03-21 14:40:11 +01:00
fd451be2ddNew, safer method of packing which makes careful use of casting to avoid problems with e.g. signed integer sign extension.
David Williams
2015-03-21 08:48:45 +01:00
905ec27f47Added typedef for ChunkKey.
David Williams
2015-03-21 08:12:02 +01:00
0d638f9837Going back to building key by shifting instead of using bitfield.
David Williams
2015-03-21 08:05:58 +01:00
0e995b5140Fixed some compiler warnings.
David Williams
2015-03-21 07:40:32 +01:00
69f6f4ac37Decided to always use a 64-bit chunk key, rather than trying to make it configurable.
David Williams
2015-03-20 23:09:38 +01:00
6419c5827bAdded typedef for chunk key type.
David Williams
2015-03-20 16:59:25 +01:00
8bd8f8ba7aWork on using a bitfield to set up chunk key.
David Williams
2015-03-20 15:48:46 +01:00
cd48c6f611Made method const.
David Williams
2015-03-19 23:08:35 +01:00
e82d6beca1Replaced Vector3D with integer as key to map.
David Williams
2015-03-15 09:32:42 +01:00
d305038c27Replaced loop with fill.
David Williams
2015-03-11 23:47:32 +01:00
741234e4a5Small speed improvement by storing variables separately (rather than in Vector3D) to void construction/comparison overhead.
David Williams
2015-03-09 23:52:56 +01:00
99d0a226c8Tidying up.
David Williams
2015-03-08 23:48:55 +01:00
72abcd8e9cChunks are now stored with unique_ptr rather than shared_ptr.
David Williams
2015-03-08 23:30:12 +01:00
639eb6620fAdd 'this' pointer disambiguation.
Matt Williams
2015-03-08 12:51:00 +00:00
c98ad8c948Merge branch 'feature/remove-wrap-modes' into develop
David Williams
2015-03-07 21:19:21 +01:00
43c203a2c9Removed declaration of function for which we already removed the definition.
David Williams
2015-03-07 17:42:31 +01:00
aaa6b1dc15A PagedVolume must now always be provided with a Pager when it is constructed.
David Williams
2015-03-07 17:01:07 +01:00
5a5b2b3875Spotted an optimization for computing the voxel position.
David Williams
2015-03-06 23:03:38 +01:00
2c0d9cb9e7Moved contents of initialize() into constructor.
David Williams
2015-03-05 23:51:16 +01:00
c804190d84Removed the ability to set the target memory usage after construction, and this is now just done through the constructor. I don't think the functionality was useful, and this simplifies more logic.
David Williams
2015-03-05 23:42:50 +01:00
89550fcd44Fixed warnings.
David Williams
2015-03-05 00:04:22 +01:00
61bffc9783Removed some not useful functions.
David Williams
2015-03-04 23:31:24 +01:00
1213a4047aFully stripped out references to wrap modes.
David Williams
2015-03-04 23:13:37 +01:00
bd6efe8c3cStuff related to valid regions is being moved from BaseVolum to RawVolume, as PagedVolume is now infinite.
David Williams
2015-03-04 22:42:14 +01:00
d3618ca688Removed tracking of whether the PagedVolume::Sampler is currently valid.
David Williams
2015-03-01 23:32:22 +01:00
396d1cfc59Ambient occlusion test now uses RawVolume, as it need a fixed size volume to create a temporary array.
David Williams
2015-03-01 09:51:45 +01:00
e7f41b7e0fMore fixing/tidying of test, related to removing volume size limit.
David Williams
2015-03-01 08:14:30 +01:00
bfc7dfdc1bRemoved the ability to specify a region in the PagedVolume's constructor, and updated the tests and examples where required.
David Williams
2015-02-28 23:31:23 +01:00
7e03c3e05bCompile fixes and tweaks for tests.
David Williams
2015-02-28 13:43:17 +01:00
09c15173f9Simplify -std=c++0x flag logic
Matt Williams
2015-02-28 10:55:01 +00:00
41d5ea6178Move FindQt5Test logic inside tests directory
Matt Williams
2015-02-28 10:40:05 +00:00
d9dae773dcSimplify the BUILD_EXAMPLES logic
Matt Williams
2015-02-28 10:24:32 +00:00
32b07659a8Move all the examples' CMake logic into the examples directory
Matt Williams
2015-02-28 10:19:17 +00:00
969310f327Make sure we're notifiying if the docs are available
Matt Williams
2015-02-28 10:17:56 +00:00
65f966555dMove Doxygen stuff into include directory where it is actually used
Matt Williams
2015-02-28 10:06:56 +00:00
cb1cd58288Remove all mention of LIBRARY_TYPE as PolyVox is now header-only
Matt Williams
2015-02-28 09:56:12 +00:00
f262c0e8f5Revert "Removing tests which depend on wrap modes, in preparation for removing the wrap modes themselves."
David Williams
2015-02-28 09:59:28 +01:00
416ae8eb7fRevert "Removed 'AllInternal' part of function name as it is now redundant."
David Williams
2015-02-28 09:59:11 +01:00
1853a0fc4eRevert "More work on removing wrap modes."
David Williams
2015-02-28 09:58:41 +01:00
6817899e6aMore work on removing wrap modes.
David Williams
2015-02-27 15:12:11 +01:00
3ace735619Work on removing wrap modes.
David Williams
2015-02-27 13:48:31 +01:00
64d010527bRemoved old getVoxelAt()/setVoxelAt() functions. they've been flagged as deprecated for a while now, and are replaced by just getVoxel()/setVoxel().
David Williams
2015-02-27 11:07:15 +01:00
42e8b2cf44Removed 'AllInternal' part of function name as it is now redundant.
David Williams
2015-02-26 22:15:19 +01:00
917d3b8c95Removing tests which depend on wrap modes, in preparation for removing the wrap modes themselves.
David Williams
2015-02-26 17:07:00 +01:00
9ed62c2b8fMoved headers to new location required by PolyVox being header-only.
David Williams
2015-02-25 16:35:16 +01:00
58051b7480Merge branch 'develop' into feature/dualcontouring
David Williams
2015-02-25 16:32:58 +01:00
7ac652e92bMore 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
David Williams
2015-02-25 16:11:22 +01:00
f7af804ccfCompile fix for GCC.
David Williams
2015-02-25 15:57:59 +01:00
1f3dc558daAdded missing header.
David Williams
2015-02-24 23:46:35 +01:00
2ec29e33b7Tidying up OpenGLWidget.
David Williams
2015-02-24 23:44:04 +01:00
fbb7ff4728Merge branch 'feature/example-refactor' into develop
David Williams
2015-02-24 22:23:57 +01:00
e985dce075Templatized OpenGLWidget so users can specify the version of OpenGL to support.
David Williams
2015-02-24 22:17:46 +01:00
d3b71a92b9Tidying up code.
David Williams
2015-02-24 16:53:34 +01:00
9547824f14Renamed 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.
David Williams
2015-02-24 16:08:55 +01:00
7262ca313eMore work splitting example framework into two pieces.
David Williams
2015-02-20 16:56:03 +01:00
838407ba4fStarted 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.
David Williams
2015-02-20 16:20:09 +01:00
9c93c5fc36Switched examples to use FPS-style first person perspective camera.
David Williams
2015-02-20 15:28:54 +01:00
565aa21799Refactoring example code.
David Williams
2015-02-20 11:23:17 +01:00
3f849e19a4Started refactoring examples and got DecodeOnGPUExample working.
David Williams
2015-02-15 12:03:31 +01:00
92daf9a0c0Fixed CMake script for DecodeOnGPU example, though it's currently disabled due to compile errors.
David Williams
2015-02-14 09:30:59 +01:00
28c516b5adMerge branch 'feature/opengl' into develop
David Williams
2015-02-10 23:44:14 +01:00
7e19706681C++11 random number generators are consistent across platforms, but the distribution classes are not: http://stackoverflow.com/a/13589262
David Williams
2015-02-10 23:35:17 +01:00
f87966686dAnother 'typename', GCC really likes these.
David Williams
2015-02-10 21:52:05 +01:00
1cbc0605fdAdded 'typename'.
David Williams
2015-02-10 21:49:28 +01:00
feb9b6bdc6Switched to using C++11 random number generator (MT) for tests, hoping it will be consistent across platforms.
David Williams
2015-02-10 21:46:09 +01:00
41498cfcb8Removed GLEW from repository.
David Williams
2015-02-09 23:22:12 +01:00
ec80bfe740Switched to using Qt for loading extensions, instead of GLEW.
David Williams
2015-02-09 23:17:33 +01:00
f042584ed5Removed old OpengGL widget.
David Williams
2015-02-09 22:15:03 +01:00
c62bde0066Work on getting the OpenGL/Qt5 support working with new header-only library.
David Williams
2015-02-09 22:11:06 +01:00
d9da93b6c0Merge branch 'develop' into feature/opengl
David Williams
2015-02-08 20:49:25 +01:00
d875ff33ceFixed min/max related compile error on Windows.
David Williams
2015-02-08 12:41:53 +01:00
74089437b3Merge branch 'feature/header-only' into develop
David Williams
2015-02-07 23:22:00 +01:00
72be03262aFixed install to work on Windows.
David Williams
2015-02-07 23:21:25 +01:00
7946e55357Fixed install on Linux.
David Williams
2015-02-07 23:11:56 +01:00
049a77cd0cMoved all headers from 'PolyVoxCore' to 'PolyVox', as we no longer have the core/util distinction.
David Williams
2015-02-07 17:26:36 +01:00
16a75d0606Reoranising header structure.
David Williams
2015-02-07 17:16:54 +01:00
97bd3a232aRenamed 'library' folder to 'include' (as it just contains headers now).
David Williams
2015-02-07 15:21:33 +01:00
6e2004d9c5Really removed PolyVoxUtil.
David Williams
2015-02-07 15:04:34 +01:00
a296807ed9Removed PolyVoxUtil.
David Williams
2015-02-07 14:59:08 +01:00
630affbf4dMoved bindings from inside 'library' folder to root folder.
David Williams
2015-02-07 14:47:21 +01:00
c3305ea14bReinstated some of the 'install' code.
David Williams
2015-02-07 10:36:49 +01:00
5d54c881a1Added custom target (which doesn't build anything) so that our header-only library still shows up in VisualStudio for browsing the files.
David Williams
2015-02-07 06:52:47 +01:00
c3f2e5217eRemoved CMake code which tries to build/use PolyVoxCore as a library.
David Williams
2015-02-06 23:29:35 +01:00
9d9e3996a3Moved utility functions to header.
David Williams
2015-02-06 21:28:47 +01:00
07f1593561Made logging functions header only.
David Williams
2015-02-06 21:13:12 +01:00
4325ffabc4Moved error handling functions/macros to be header-only.
David Williams
2015-02-06 21:08:19 +01:00
6e8d9dfb75Windows now uses standard C++ timer. I assume we weren't using it before because it wasn't present on older versions of Visual Studio? Moved timer code to header.
David Williams
2015-02-06 16:52:21 +01:00
8cff2bb2daMoved random vectors to header files.
David Williams
2015-02-06 16:43:29 +01:00