354 Commits

Author SHA1 Message Date
David Williams
db2e62d2a8 Replaced LargeVolume and SimpleVolume with PagedVolume in tests and examples. 2014-09-21 17:57:42 +02:00
David Williams
d6a7b83698 Moved Pager to be a nested class of PagedVolume. 2014-09-21 11:42:12 +02:00
David Williams
db9a74fdb4 Moving Chunk to be a nested class of PagedVolume. 2014-09-21 10:27:55 +02:00
David Williams
71035029d1 More renaming blocks to chunks. 2014-09-20 23:27:28 +02:00
David Williams
0ab7f27f0f More renaming of block to chunk. 2014-09-20 21:27:26 +02:00
David Williams
8d7d88a7df Renamed a bunch of stuff from using 'block' to 'chunk' 2014-09-20 17:39:12 +02:00
David Williams
ede35435a0 Renamed UncompressedBlock to Chunk. 2014-09-20 17:26:57 +02:00
David Williams
880dcd8645 Fixed incorrect messages about temp files not being deleted. 2014-09-20 17:17:18 +02:00
David Williams
b08974c197 Work on limiting memory usage. 2014-09-18 16:26:47 +02:00
David Williams
d2bbd6beba Some renaming. 2014-09-18 14:58:17 +02:00
David Williams
8dd026e095 Work on limiting maximum memory usage. 2014-09-18 14:51:43 +02:00
David Williams
5b59bc2d8c Moved paging code into block constructor/destructor. 2014-09-17 13:35:43 +02:00
David Williams
47ace554cc Making use of shared_ptr to track blocks. 2014-09-14 11:47:17 +02:00
David Williams
c0a22de2df Removed a lot of compression-related code. 2014-09-13 12:20:56 +02:00
David Williams
302c6e688b More work eliminating compression from inside LargeVolume. 2014-09-13 11:59:51 +02:00
David Williams
4781ca5c42 Work on removing compression from LargeVolume. 2014-09-12 15:36:28 +02:00
David Williams
089303f02f Fix for example. 2014-08-24 23:05:29 +02:00
DavidWilliams
17ee7982d5 Added typename for GCC. 2014-08-19 21:30:37 +02:00
David Williams
f1ed0c1be2 Examples now support both 16 and 32 bit indices. 2014-08-13 15:59:13 +02:00
David Williams
112b277452 Updated GLSL decoder for new normal packing scheme. 2014-07-24 22:38:21 +02:00
David Williams
2b7ef5b966 Reverted some changes which were just for testing the new normal encoding. 2014-07-24 22:21:53 +02:00
David Williams
bfa14a32df Split 'decode()' function into several variants so it's not so heavily overloaded. 2014-07-24 16:55:11 +02:00
David Williams
4a42535f13 Added functions to perform 'octahedral' encoding and decoding of normals.
See http://jcgt.org/published/0003/02/01/paper-lowres.pdf
2014-07-23 23:35:46 +02:00
David Williams
e6dc0716cd Merge branch 'feature/vertex-and-example-refactor' of https://bitbucket.org/volumesoffun/polyvox into feature/vertex-and-example-refactor 2014-06-03 15:36:45 +02:00
Matt Williams
9b19ea656b Fix commit on Linux 2014-06-03 10:37:11 +01:00
David Williams
31e5a6e346 Replaced 'm_region' with 'm_offset' and demonstrated its use. 2014-06-02 17:30:41 +02:00
David Williams
d7d1d99ca9 Renamed members to differentiate between encoded and decoded values. 2014-06-02 08:45:25 +02:00
David Williams
4f1863eccb Removed apparently-incorrect use of logging statements (crashing under Visual Studio). 2014-05-30 16:36:24 +02:00
David Williams
224c27de50 Got normal decoding working in shader. 2014-05-29 23:31:36 +02:00
David Williams
a6a1c4dbb7 Getting ready to decode normal. 2014-05-29 19:34:43 +02:00
David Williams
e40eb6d762 Work on GPU decoding. 2014-05-29 19:29:15 +02:00
David Williams
8604d1209e Initial version of decoding shaders. 2014-05-29 14:23:22 +02:00
David Williams
f945fd4ce4 Work on example to decode vertices on the GPU. 2014-05-29 12:38:43 +02:00
David Williams
b635e9d29d Copied BasicExample as base for new 'DecodeOnGPU' example. 2014-05-29 12:20:33 +02:00
David Williams
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
David Williams
85c5686ff9 Work on more compact version of MarchingCubesVertex. 2014-05-29 09:53:16 +02:00
David Williams
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
Matt Williams
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
David Williams
35049b7a53 Throw exception if extracted region is too large. 2014-05-27 23:23:24 +02:00
David Williams
37ba9ab338 CubicVertex now uses a more memory efficient representation which can be decoded on the CPU or GPU. 2014-05-27 23:01:38 +02:00
Matt Williams
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
David Williams
1d8fc25cb7 Compile fixes for GCC/Linux 2014-05-26 23:14:29 +02:00
David Williams
321d3eb7d4 Removed initializer which isn't supported in VS 2012. 2014-05-26 22:51:55 +02:00
David Williams
ba58cff815 Removed use of 'R' raw string literals as CS 2012 doesn't support them. 2014-05-26 22:51:09 +02:00
David Williams
5a23299634 More tidying shader code. 2014-05-26 21:14:54 +02:00
David Williams
fd3879faeb Tidying OpenGLExample shader code. 2014-05-26 21:10:07 +02:00
David Williams
40e528d782 Added lighting to OpenGL example. 2014-05-26 17:00:26 +02:00
David Williams
4ae25d6b1e More commenting. 2014-05-26 16:50:13 +02:00
David Williams
e9c8daa9cb Add comments and tidying. 2014-05-26 16:31:12 +02:00
David Williams
2a072f9347 Rearranged some functions. 2014-05-25 23:44:37 +02:00