AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Commit Graph

  • 16cbb94d90 Rotation is now applied by moving the camera rather than the meshes. David Williams 2014-05-22 16:51:41 +02:00
  • 7d55e00f76 More work adding support for multiple meshes. David Williams 2014-05-22 16:38:02 +02:00
  • 51e93fdabc Modifying the OpenGLWidget so that it can render multiple meshes. David Williams 2014-05-22 16:25:36 +02:00
  • 7fc954a6bf Fix SWIG include paths for C# bindings Matt Williams 2014-05-20 14:43:18 +01:00
  • ef61480c3d Merge branch 'feature/vertex-refactor' into develop David Williams 2014-05-12 23:08:27 +02:00
  • f2ba500c4c Merge branch 'develop' into feature/vertex-refactor David Williams 2014-05-12 23:04:19 +02:00
  • 1e0b8e97eb Merge branch 'feature/extractor-refactor' into develop David Williams 2014-05-12 21:13:26 +02:00
  • d69e840055 Merge branch 'develop' into feature/vertex-refactor David Williams 2014-05-11 20:45:31 +02:00
  • 5191c3c068 Merge branch 'develop' into feature/extractor-refactor David Williams 2014-05-11 20:35:44 +02:00
  • a34c106382 I accidentally merged the 'cubiquity-version' feature back into develop. It seems I can't simply reverse this commit (at least through SourceTree ) because it was a merge, so I'm having to simply revert the contents of the commit (i.e. the files). Bit of a mess! David Williams 2014-05-11 20:34:41 +02:00
  • 1bff5c207c Merge branch 'feature/cubiquity-version' of https://bitbucket.org/volumesoffun/polyvox.git into develop David Williams 2014-05-11 19:47:05 +02:00
  • 217aa93720 Test now uses free-function surface extractor. David Williams 2014-05-11 16:41:52 +02:00
  • 95a3e2e9ce Smooth LOD example now uses free function surface extractor. David Williams 2014-05-11 16:29:51 +02:00
  • 347028199c Paging example now also uses free-function surface extractor. David Williams 2014-05-11 16:27:38 +02:00
  • a51eaa4a02 Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into feature/extractor-refactor David Williams 2014-05-11 16:21:37 +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. David Williams 2014-05-11 15:17:59 +02:00
  • ae87dbee77 Fixed materials in OpenGL example. David Williams 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. David Williams 2014-05-07 23:47:18 +02:00
  • 4c2aea3db1 Removed CubicSurfaceExtractorWithNornals. Going forward users will be expected to compute flat normals in the fragment shader. David Williams 2014-05-06 22:00:24 +02:00
  • 12246d1633 The PositionMaterial class can now be removed as we're not using it. David Williams 2014-05-05 20:58:35 +02:00
  • 5dfa7e2562 The CubicSurfaceExtractor now generates vertices of type PositionMaterialNormal rather than PositionMaterial. The normal property is just a dummy and is not filled in, though conceptually we could put something in there in the future (average normal of surrounding faces?) David Williams 2014-05-05 20:53: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. David Williams 2014-05-05 20:29:52 +02:00
  • fe3f2d589e Fixed uninitialized variables (was causing crash on OS X). David Williams 2014-04-14 21:08:05 +02:00
  • 45302fde02 Qt is not REQUIERD. This was causing errors. Matt Williams 2014-03-27 10:24:29 +00:00
  • d79ac03fb6 VS2012 doesn't accept these curly brackets (C++11 initializer lists?). The code seems to work without them though. David Williams 2014-03-25 23:03:18 +01:00
  • 7b5e1cd1d5 Unfortunately VS2012 doesn't support 'R' raw string literals . Maybe the shader code should be moved into separate files anyway. David Williams 2014-03-25 23:00:29 +01:00
  • a78508a79f Switched from QOpenGLFunctions_3_1 to QOpenGLFunctions. This seems to require not using vertex arrays, which needs further investigation. David Williams 2014-03-25 22:49:59 +01:00
  • 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) David Williams 2014-03-25 21:53:14 +01:00
  • 1f1cc67fb7 Revert "Remove usage of QOpenGLFunctions and use GLEW instead." David Williams 2014-03-25 21:44:01 +01:00
  • 464d713c2a Remove usage of QOpenGLFunctions and use GLEW instead. Matt Williams 2014-03-23 12:16:02 +00:00
  • ac16dfd325 Update the BasicExample to use OpenGL 3 Matt Williams 2014-03-19 21:26:04 +00:00
  • f05d54b985 Merge branch 'develop' into feature/extractor-refactor David Williams 2014-03-17 16:07:29 +01:00
  • d06650172a Added missing header which was causing problems when compiling Cubiquity on Linux. David Williams 2014-03-16 21:13:15 +01:00
  • 868fbb84a0 Update to use Qt5 Matt Williams 2014-03-09 18:02:24 +00:00
  • 00d1b8e10c Update required CMake version to 2.8.6 Matt Williams 2014-03-09 17:55:14 +00:00
  • cec740f429 Remove search for Boost Matt Williams 2014-03-09 17:54:17 +00:00
  • e52e9e373e Switched test to use unclassed function. David Williams 2014-03-07 16:25:24 +01:00
  • 0bbb648925 Added functions around CubicSurfaceExtractor. David Williams 2014-03-07 16:08:20 +01:00
  • d50b910a45 Merge branch 'develop' into feature/cubiquity-version David Williams 2014-03-06 16:54:38 +01:00
  • 163e520e9f Changed he way that materials are blended by default, such that the material of the voxel with the highest density is used. David Williams 2014-03-06 16:38:57 +01:00
  • d8bcd09d9b Compile fixes for GCC. David Williams 2014-03-05 16:47:51 +01:00
  • acbfb184b8 Wrapped MarchingCubesSurfaceExtractor with functions (part of unclassing). David Williams 2014-03-05 16:30:54 +01:00
  • 529e97f71e Added use of auto for determining mesh type. David Williams 2014-03-05 15:58:33 +01:00
  • 0755961750 Added support for default parameters. David Williams 2014-03-05 15:50:17 +01:00
  • 67ec0d2db8 Initial function wrapper around CubicSurfaceExtractorWithNormals. David Williams 2014-03-05 15:41:16 +01:00
  • b416dc933f Merge branch 'develop' into feature/cubiquity-version Daviw Williams 2014-02-27 15:40:01 +01:00
  • 1cf5f4c899 Added comment. Daviw Williams 2014-02-26 17:00:40 +01:00
  • c5780dd8e2 Brought improved blending changes across from Cubiquity branch. Daviw Williams 2014-02-26 16:55:09 +01:00
  • 60396a2699 Merge branch 'develop' into feature/cubiquity-version Daviw Williams 2014-02-25 16:55:52 +01:00
  • 2458f94feb Eliminating some differences from the cubiquity-version branch. Daviw Williams 2014-02-25 16:51:26 +01:00
  • aeefe7f938 Merge branch 'develop' into feature/cubiquity-version Daviw Williams 2014-02-25 16:35:54 +01:00
  • 0e8973e722 Fixed minor compile errors: Daviw Williams 2014-02-17 15:23:44 +01:00
  • bc17c802bb Assume C++11 support Matt Williams 2014-02-14 14:59:53 +00:00
  • 376ce595d6 Merge branch 'develop' into feature/cubiquity-version David Williams 2014-01-31 21:20:04 +01:00
  • 74be82e8cf Disabled trace stream by default. Updated docs. David Williams 2014-01-30 23:40:50 +01:00
  • f2dd852bd2 More stripping down of logging macros. David Williams 2014-01-30 23:18:41 +01:00
  • 906d685f5f Stripped down the 'removed' version of the logging macros to minimize the chance that they have any effect on the code. David Williams 2014-01-30 23:04:37 +01:00
  • 248a5c3e29 Removed old logging system. David Williams 2014-01-30 22:10:52 +01:00
  • 109bfb7e9e Merge branch 'develop' into feature/cubiquity-version Daviw Williams 2014-01-30 16:30:21 +01:00
  • af9eacef37 Changed new logging system to work on strings rather than streams. Daviw Williams 2014-01-30 16:27:33 +01:00
  • 2955b35743 Merge branch 'develop' into feature/cubiquity-version David Williams 2014-01-29 21:31:36 +01:00
  • f4e03cc537 Macros now call new logging system instead of the old one. David Williams 2014-01-29 21:29:00 +01:00
  • 84921f4d0b The existing logging code is rather large and overwhelming. I'm starting to replace it with a simpler system that should also be easier to maintain. Daviw Williams 2014-01-29 16:53:11 +01:00
  • 20576d7a6f Merge branch 'develop' into feature/cubiquity-version David Williams 2014-01-28 23:39:22 +01:00
  • 2ae5667986 Replaced some more logging commands with macros which can be compiled out. David Williams 2014-01-28 23:15:24 +01:00
  • 4c29d59430 Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into develop David Williams 2014-01-28 21:00:26 +01:00
  • e0e860c45c Added <algorithm> David Williams 2014-01-28 20:59:55 +01:00
  • 54f0856dbe Merge branch 'develop' into feature/dualcontouring Matt Williams 2014-01-27 19:42:27 +00:00
  • 832a45013a Simplify test creation and add XML output option Matt Williams 2014-01-27 19:39:50 +00:00
  • a9238051fa Changed some logging statements to macros which can be #defined out. David Williams 2014-01-26 23:53:10 +01:00
  • 52e25f2b3d Merge branch 'develop' into feature/cubiquity-version David Williams 2014-01-26 21:34:46 +01:00
  • f58161c748 Added logging macros which can be disabled at compile time. Daviw Williams 2014-01-24 16:35:58 +01:00
  • c177891e5d Separated logging code into different .cpp/.h files. Daviw Williams 2014-01-24 15:21:59 +01:00
  • 8d5f6af7cd Compile fix for VS2012, which now builds successfully. Daviw Williams 2014-01-24 13:53:44 +01:00
  • 09d5624cc8 Pass things as const reference to the extractor Matt Williams 2014-01-16 17:36:13 +00:00
  • cc1e1e477c Extractor can now use a Controller to define voxel type and threshold Matt Williams 2014-01-11 23:57:34 +00:00
  • 4e13f0afa5 Checking for zero exactly gives better solutions to QEF Matt Williams 2014-01-11 22:23:55 +00:00
  • 81ce31432c Rearrange some things to keep definitions in sensible places Matt Williams 2014-01-11 22:23:14 +00:00
  • 6294013709 Use the C++ versions of these functions Matt Williams 2014-01-11 20:29:54 +00:00
  • 2cfaf241c8 Explicitly cast these to floats Matt Williams 2014-01-11 20:28:53 +00:00
  • 63f0def22f Require that the voxel is a signed type Matt Williams 2014-01-11 19:59:19 +00:00
  • af308cb187 Change logic for calculating whether there was an intersection Matt Williams 2014-01-11 19:55:56 +00:00
  • 1d7d66a1de Add some (commented-out) logging for timings Matt Williams 2014-01-10 19:14:01 +00:00
  • c92b933254 A few consistency tweaks Matt Williams 2014-01-10 19:13:21 +00:00
  • ac3fb84055 Calculate gradients first to reduce number of calculations Matt Williams 2014-01-10 19:12:45 +00:00
  • 20b8b8fc3d Add const. Gives a few percent performance improvement. Matt Williams 2014-01-09 23:00:25 +00:00
  • 601b2a6d21 Improved performance of Dual Contouring Matt Williams 2014-01-09 20:07:15 +00:00
  • 7877600538 Add first draft of Dual Contouring surface extractor Matt Williams 2014-01-07 17:18:01 +00:00
  • d96dcaa531 Another Mac/Clang fix. David Williams 2013-12-31 14:53:53 +01:00
  • 1cb486cb33 Fixed Clang detection. David Williams 2013-12-31 11:19:00 +01:00
  • 31b59702be We're committed to LargeVolume now, so we don't need the define to switch volume types. Daviw Williams 2013-11-18 16:57:37 +01:00
  • 15b170696c Merge branch 'develop' into feature/cubiquity-version Daviw Williams 2013-11-14 15:36:25 +01:00
  • 3db5e1b2f6 Added microsecond precision to timers. Daviw Williams 2013-11-14 15:35:41 +01:00
  • f2ecb667e8 Merge branch 'develop' into feature/cubiquity-version Daviw Williams 2013-11-13 15:24:21 +01:00
  • 5294efc473 Clear the 'last accessed block' flag before flushing the volume. Daviw Williams 2013-11-12 16:57:11 +01:00
  • 85d8bdb30c Rearranged some code to try and improve the robustness of block paging and compression. Daviw Williams 2013-11-12 16:47:57 +01:00
  • 1c5a3f7ef5 Reverted attempts to suppress GCC warnings and just removed the offending asserts instead. Daviw Williams 2013-10-25 12:44:40 +02:00
  • 2d6bb91d96 Merge branch 'develop' into feature/cubiquity-version Daviw Williams 2013-10-24 16:50:38 +02:00
  • afddb59d69 Reverted attempt to avoid warnings. Just suppressed them instead. Daviw Williams 2013-10-24 14:37:18 +02:00
  • 3fe92086f1 Attempting to work around a GCC warning. Daviw Williams 2013-10-23 16:33:42 +02:00