Commit Graph

  • ed4bdf08c4 Added extraction test for MaterialDensityPair. David Williams 2014-08-12 16:09:56 +02:00
  • 0b5e7071ae Added double test. David Williams 2014-08-12 15:57:52 +02:00
  • ccc9a3c158 More work on surface extraction tests. David Williams 2014-08-12 15:53:30 +02:00
  • e2f43ebc5d More work on tests and surface extraction functions. David Williams 2014-08-11 23:46:01 +02:00
  • 64ba3f20f8 Work on extractor tests. David Williams 2014-08-11 16:20:11 +02:00
  • 11845c1d31 Work on tests. David Williams 2014-08-11 15:53:25 +02:00
  • 4b3c8a1648 Committing half-finished work on test so that I can work on it from elsewhere. David Williams 2014-08-11 08:46:06 +02:00
  • eaea74b7f8 Templatizing marching cubes extractor on mesh type. David Williams 2014-08-10 09:18:27 +02:00
  • 29baac9d6d Tidying mesh class. David Williams 2014-08-09 09:31:45 +02:00
  • 94d1b57b81 Tidying mesh class. David Williams 2014-08-09 09:18:30 +02:00
  • c5cf71b161 Extractors now templatised on index type. David Williams 2014-08-07 23:39:56 +02:00
  • 52dd0189d5 Simplified/removed multiple versions of functions, as we're now moving to VS2013 which supports default parameters for template functions. David Williams 2014-08-07 23:14:57 +02:00
  • 37757da98c Qualified use of abs() as it was causing problems on OS X David Williams 2014-07-30 23:43:26 +02:00
  • e1cdf0ca06 Merge branch 'feature/better-normal-encoding' into develop David Williams 2014-07-24 22:39:06 +02:00
  • 112b277452 Updated GLSL decoder for new normal packing scheme. David Williams 2014-07-24 22:38:21 +02:00
  • 2b7ef5b966 Reverted some changes which were just for testing the new normal encoding. David Williams 2014-07-24 22:21:53 +02:00
  • f9ee5a10b4 Merge branch 'develop' into feature/better-normal-encoding David Williams 2014-07-24 22:15:43 +02:00
  • 8326aa8668 Updated test (not really a useful fix but should probably think want we want from this test anyway). David Williams 2014-07-24 22:12:02 +02:00
  • bfa14a32df Split 'decode()' function into several variants so it's not so heavily overloaded. David Williams 2014-07-24 16:55:11 +02:00
  • 98e722271e More restructuring code. David Williams 2014-07-24 15:40:03 +02:00
  • 972bc3a456 Restructuring some code. David Williams 2014-07-24 15:13:08 +02:00
  • 79c62be039 Oct-encoded normal now stored as uint again. David Williams 2014-07-23 23:50:04 +02:00
  • 4a42535f13 Added functions to perform 'octahedral' encoding and decoding of normals. David Williams 2014-07-23 23:35:46 +02:00
  • dd5e34bc92 Moved normal encoding logic. David Williams 2014-07-22 23:48:18 +02:00
  • 9b84c9d07d Fixed compile error David Williams 2014-06-14 09:59:01 +02:00
  • c68a48df6b Merge remote-tracking branch 'origin/feature/vertex-and-example-refactor' into develop David Williams 2014-06-04 23:12:27 +02:00
  • b1c03c9f9c Fix to mesh declaration. David Williams 2014-06-03 21:37:22 +02:00
  • 6bedd40694 Merge branch 'feature/vertex-and-example-refactor' into develop David Williams 2014-06-03 21:22:56 +02:00
  • 70b04a055e Compile fioxes for GCC. Turns out the leading underscore was required, as otherwise GCC complains the typedef is hiding the original. David Williams 2014-06-03 21:21:04 +02:00
  • b7be2ff7ab Added some error handling. David Williams 2014-06-03 16:59:09 +02:00
  • 06540d6c97 More work to make Mesh be templatized on IndexType. This requires making the SurfaceExtractor classes be templatised on MeshType (at least for now - maybe there is a better approach when working with free functions). This has been partially done for CubicSurfaceExtractor. David Williams 2014-06-03 16:52:09 +02:00
  • ffdf606ad6 Added IndexType template parameter to Mesh class. David Williams 2014-06-03 15:58:07 +02:00
  • 5701e7a6cc It seems we don't need these leading underscores? Perhaps they were required in older versions of Visual Studio? Let's see what GCC/Clang says. David Williams 2014-06-03 15:51:42 +02:00
  • 78d750a0f2 Removed unused 'LodRecord'. David Williams 2014-06-03 15:50:30 +02:00
  • e6dc0716cd Merge branch 'feature/vertex-and-example-refactor' of https://bitbucket.org/volumesoffun/polyvox into feature/vertex-and-example-refactor David Williams 2014-06-03 15:36:45 +02:00
  • 9b19ea656b Fix commit on Linux Matt Williams 2014-06-03 10:37:11 +01:00
  • 31e5a6e346 Replaced 'm_region' with 'm_offset' and demonstrated its use. David Williams 2014-06-02 17:30:41 +02:00
  • 9fd52e3494 Removing more old stuff from the Mesh class. David Williams 2014-06-02 09:40:28 +02:00
  • 0bff22fbf5 Purged old/dead code from Mesh class. David Williams 2014-06-02 09:08:07 +02:00
  • 82f9d6ad6f Renamed VertexTypes.h to Vertex.h. David Williams 2014-06-02 08:57:30 +02:00
  • d7d1d99ca9 Renamed members to differentiate between encoded and decoded values. David Williams 2014-06-02 08:45:25 +02:00
  • 4fa2400ef2 Comments and tidying. David Williams 2014-06-02 08:25:18 +02:00
  • 80d9feb5ea Made functions inline as they are defined in headers. David Williams 2014-06-01 21:54:31 +02:00
  • b259b60de2 Tidying/commenting. David Williams 2014-06-01 17:35:00 +02:00
  • 392ccab703 Tidying decoding code. David Williams 2014-06-01 17:23:08 +02:00
  • 78ac1d12b5 The new, more compact vertex types are specific to their respective surface extractors, so they belong in the corresponding source files. David Williams 2014-06-01 17:01:36 +02:00
  • 4f1863eccb Removed apparently-incorrect use of logging statements (crashing under Visual Studio). David Williams 2014-05-30 16:36:24 +02:00
  • 224c27de50 Got normal decoding working in shader. David Williams 2014-05-29 23:31:36 +02:00
  • 2c916300ea Work on encoded marching cubes normals. David Williams 2014-05-29 21:45:26 +02:00
  • a6a1c4dbb7 Getting ready to decode normal. David Williams 2014-05-29 19:34:43 +02:00
  • e40eb6d762 Work on GPU decoding. David Williams 2014-05-29 19:29:15 +02:00
  • 8604d1209e Initial version of decoding shaders. David Williams 2014-05-29 14:23:22 +02:00
  • f945fd4ce4 Work on example to decode vertices on the GPU. David Williams 2014-05-29 12:38:43 +02:00
  • b635e9d29d Copied BasicExample as base for new 'DecodeOnGPU' example. David Williams 2014-05-29 12:20:33 +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. David Williams 2014-05-29 11:39:29 +02:00
  • 85c5686ff9 Work on more compact version of MarchingCubesVertex. David Williams 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). David Williams 2014-05-28 14:03:26 +02:00
  • c26686476d Use Qt's resource system to store the shader source Matt Williams 2014-05-28 10:29:05 +01:00
  • 35049b7a53 Throw exception if extracted region is too large. David Williams 2014-05-27 23:23:24 +02:00
  • 37ba9ab338 CubicVertex now uses a more memory efficient representation which can be decoded on the CPU or GPU. David Williams 2014-05-27 23:01:38 +02:00
  • 1790d8338f Merge branch 'feature/vertex-and-example-refactor' of https://bitbucket.org/volumesoffun/polyvox into feature/vertex-and-example-refactor David Williams 2014-05-27 17:05:46 +02:00
  • 764c9ac97c Simplified vertex types to structs with public members. Added (currently dummy) decode methods. David Williams 2014-05-27 17:05:15 +02:00
  • 140cbc0fc7 Move shader code to external files rather than embedded Matt Williams 2014-05-27 15:08:20 +01:00
  • 1d8fc25cb7 Compile fixes for GCC/Linux David Williams 2014-05-26 23:14:29 +02:00
  • 321d3eb7d4 Removed initializer which isn't supported in VS 2012. David Williams 2014-05-26 22:51:55 +02:00
  • ba58cff815 Removed use of 'R' raw string literals as CS 2012 doesn't support them. David Williams 2014-05-26 22:51:09 +02:00
  • 5a23299634 More tidying shader code. David Williams 2014-05-26 21:14:54 +02:00
  • fd3879faeb Tidying OpenGLExample shader code. David Williams 2014-05-26 21:10:07 +02:00
  • 40e528d782 Added lighting to OpenGL example. David Williams 2014-05-26 17:00:26 +02:00
  • 4ae25d6b1e More commenting. David Williams 2014-05-26 16:50:13 +02:00
  • e9c8daa9cb Add comments and tidying. David Williams 2014-05-26 16:31:12 +02:00
  • 2a072f9347 Rearranged some functions. David Williams 2014-05-25 23:44:37 +02:00
  • 9e835a1110 Shader now passed by shared pointer. David Williams 2014-05-25 23:40:55 +02:00
  • b97bf52214 Tidying up. David Williams 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. David Williams 2014-05-25 21:45:28 +02:00
  • 499db6a185 Changed default shader to use normal as RGB (more useful for debugging). David Williams 2014-05-25 21:43:37 +02:00
  • 22869e4861 More tweaks to scaling and translation. David Williams 2014-05-25 21:36:41 +02:00
  • b63a09cab3 Changing the way the examples handle translation and scaling. David Williams 2014-05-25 21:29:44 +02:00
  • 6738c4fc9e Smooth example now also uses new example OpenGLWidget. David Williams 2014-05-25 21:15:20 +02:00
  • 349dc2b0e6 Centered volume in viewport. David Williams 2014-05-25 21:06:44 +02:00
  • e80c88a5ec Paging example now uses the new example OpenGLWidget. David Williams 2014-05-25 21:03:52 +02:00
  • eb39f0bb4c OpenGLExample is once again rendered as multiple separate mehses (but using the example framework this time). David Williams 2014-05-25 12:28:45 +02:00
  • f78aad8abd Fixed colors to match previous version of the example. David Williams 2014-05-24 22:58:31 +02:00
  • 99cf75e902 Material now passed to shader as integer rather than float. David Williams 2014-05-24 22:53:10 +02:00
  • 07b9cf05fa Changed OpenGLExample to use MaterialDensityPair88 instead of MaterialDensityPair44. Added material to shaders. David Williams 2014-05-24 21:09:26 +02:00
  • aace1f2e36 Exposing normals to example framework. David Williams 2014-05-24 09:38:01 +02:00
  • f65edddd81 Tidying up. David Williams 2014-05-24 08:38:18 +02:00
  • 6cbb2d44bf Work on making OpenGLExample work with common example framework. David Williams 2014-05-23 22:44:58 +02:00
  • 34f57911a7 Converting OpenGLExample to use common OpenGLWidget. David Williams 2014-05-23 22:18:17 +02:00
  • d34fd6b3c8 Moved OpenGLWidget into common folder so it can be used by other examples. David Williams 2014-05-23 22:11:47 +02:00
  • 4f7e1e6846 Each mesh now has it's own transform matrix applied, so that our example framework can support breaking a volume into regions. David Williams 2014-05-23 22:03:57 +02:00
  • 9f5b2e1659 Better templatization of addMesh. David Williams 2014-05-23 17:02:46 +02:00
  • 37bdf8e3ac Templatised code for example mesh conversion. David Williams 2014-05-23 16:26:56 +02:00
  • 79acf814db Revert "Compile fixes for VS2012" David Williams 2014-05-23 16:11:53 +02:00
  • e8313a683b Compile fixes for VS2012 David Williams 2014-05-23 15:32:28 +02:00
  • 4aae00e4a8 Renamed SurfaceMesh to just Mesh David Williams 2014-05-23 15:17:07 +02:00
  • da8f294847 Comments David Williams 2014-05-23 14:37:35 +02:00
  • 4cec89de38 Added ability to specify the visible region so that the example framework can support different volume sizes. David Williams 2014-05-23 14:32:46 +02:00
  • ab741583e4 Renamed extractXxxSurface() to extractXxxMesh() David Williams 2014-05-22 23:26:40 +02:00
  • f8ce3a5f3d Tidying camera code. David Williams 2014-05-22 17:03:06 +02:00