David Williams
5ddc553ef2
Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
...
Conflicts:
library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
library/PolyVoxCore/include/PolyVoxCore/SimpleVolumeSampler.inl
2011-07-30 13:13:48 +01:00
David Williams
5e62d639fb
Compile fixes for g++.
2011-07-30 12:45:32 +01:00
David Williams
d1649c9323
More work on base Volume class and sampler.
...
Added new test case for creating a volume subclass.
2011-07-30 10:12:28 +01:00
David Williams
8b0eea1152
Added a bunch of 'this->' statements to fix compilation on g++.
2011-07-30 08:03:17 +01:00
David Williams
84c78f6839
More work adding base volume class.
2011-07-29 22:00:22 +01:00
David Williams
f7c511b2c6
Moved volume pointer into base sampler class.
2011-07-27 21:46:57 +01:00
David Williams
f847e6ad94
g++ compile fixes
2011-07-26 20:58:46 +01:00
David Williams
8dc1951a06
More work making volumes use a base class.
2011-07-26 21:36:17 +01:00
David Williams
80832f49c0
Compile fixes for G++
2011-07-24 20:45:23 +01:00
David Williams
8c7056d1a9
Made SimpleVolume and RawVolume derive from base Volume class.
2011-07-24 21:33:04 +01:00
David Williams
555ddc47a5
Compile fixes for G++.
2011-07-24 12:26:43 +01:00
David Williams
6f428d2e18
Base Volume class now compiles and works.
2011-07-20 23:38:16 +01:00
David Williams
9e8be282f1
Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
2011-07-20 22:34:55 +01:00
David Williams
ca8da0b0f3
Initial commit of new Volume base class, which will be a base for the other volume classes. It's not working at this point...
2011-07-20 22:34:44 +01:00
Matt Williams
d327b88c17
Remove old Volume files from CMakeLists.txt
2011-07-20 18:50:12 +02:00
David Williams
ef30a13aef
Initial work adding base volume class.
2011-07-19 23:37:37 +01:00
David Williams
36e9b8af2a
Fixed wrong include guards
2011-07-19 23:31:55 +01:00
David Williams
9f0ae602b8
Increased warning level in Visual studio.
2011-07-19 22:09:24 +01:00
David Williams
19f3a8bf6e
GCC compile fix.
2011-07-17 20:31:53 +01:00
David Williams
cb0afb17f9
Fixed incorrect header include guards in tests.
2011-07-17 00:50:02 +01:00
David Williams
c7fa6552ae
Optimisations to VolumeResampler
2011-07-16 23:15:33 +01:00
David Williams
b7cb97513d
Work on VolumeResampler and smooth LOD.
2011-07-16 22:55:49 +01:00
David Williams
834aa5d6c3
Warning fixes for GCC 4.6.
2011-07-04 22:21:27 +01:00
David Williams
46ac159ec1
More work on Smooth LOD.
2011-07-02 18:40:34 +01:00
David Williams
ccfa7db1fa
Initial commit of VolumeResampler and LOD demo.
2011-07-02 12:39:04 +01:00
David Williams
61f97bb8db
Fixes for GCC 4.6 warnings.
2011-07-01 22:48:02 +01:00
David Williams
e98e1c2a0d
Improvements and fixes to RawVolume.
2011-06-18 11:55:07 +01:00
David Williams
d4de479b7c
More cutting down of RawVolume.
2011-06-18 11:03:28 +01:00
David Williams
65bb742562
More cutting down RawVolume
2011-06-18 10:36:43 +01:00
David Williams
586a755d93
Cutting some stuff out of RawVolume.
2011-06-18 00:19:43 +01:00
David Williams
35ed5564d2
Initial version of RawVolume as copy of SimpleVolume.
2011-06-17 23:44:21 +01:00
David Williams
c86a7f58e0
Updated the TestAmbientOcclusionCalculator reference values to match those from Linux/GCC, so that tests pass on CDash.
...
For some reason Windows/VS2010 gives slightly different results - this needs investigating.
2011-06-12 13:14:19 +01:00
David Williams
659529787a
Fixing some warnings in PolyVox.
2011-06-11 18:49:56 +01:00
David Williams
ffa4fcaade
Added test for AmbientOcclusionCalculator.
2011-06-11 18:04:04 +01:00
David Williams
8b353fb5bc
Added Material16 and Material32 types.
...
Small fixes for where 8-bit material was assumed.
2011-06-08 22:25:30 +01:00
Matt Williams
acd3c3c791
Fix SWIG bindings
...
The bindings now compile and in Python a mesh can be extracted from a volume.
The only extractor currently bound is SurfaceExtractor<SimpleVolume, Material8>.
The bindings are still commented out in library/CMakeLists.txt by default.
2011-06-07 20:33:01 +02:00
David Williams
72adbaa5a7
Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
2011-06-06 20:16:38 +01:00
David Williams
2c31a7455a
Changed max no of blocks in memory and max no of compressed blocks to be 32 bit values.
2011-06-06 20:14:42 +01:00
Matt Williams
7a14b9245b
Fix compilation of bindings
...
The bindings now compile but are not complete. SWIG doesn't support
nested classes so the SimpleVolume can't be bound.
2011-05-23 22:45:50 +02:00
Matt Williams
fc3682caa6
Add 'typename' to please GCC
...
See http://stackoverflow.com/questions/610245/where-and-why-do-i-have-to-put-template-and-typename-on-dependent-names/613132#613132
2011-05-22 21:40:26 +02:00
David Williams
c03172e1af
Renamed ImprovedCubicSurfaceExtractor back to CubicSurfaceExtractor.
2011-05-18 23:10:36 +01:00
David Williams
528cb73771
Moved headers into subdirectories.
2011-05-17 22:27:46 +01:00
David Williams
1a7647027d
Tidying up ImprovedCubicSurfaceExtractor.
2011-05-14 12:30:39 +01:00
David Williams
5cca022fbe
ImprovedCubicSurfaceExtractor now removes unused vertices.
2011-05-14 12:17:20 +01:00
David Williams
180b6a1945
Small improvements to improved cubuc surface extractor.
2011-05-13 23:54:09 +01:00
David Williams
f756f764bc
Fixed a bug which allowed duplicate vertices to get through.
2011-05-13 23:30:37 +01:00
David Williams
19079e97d8
More optimisations to ImprovedCubicSurfaceExtractor.
2011-05-12 21:56:45 +01:00
David Williams
14aa5af084
Optimisation, including use of VolumeSampler.
2011-05-12 21:01:49 +01:00
David Williams
d0adeb328b
Optimisations and improvements.
2011-05-10 23:53:07 +01:00
David Williams
3e00303371
Merging now controlled by constructor parameter.
2011-05-10 22:30:41 +01:00
