377 Commits

Author SHA1 Message Date
David Williams
b84147f650 Replaced template 'hack' with preprocessor 'fix' to allow compilation on both GCC and Visual Studio. The previous approach was causing problems on VS2008. 2011-09-04 13:57:24 +01:00
David Williams
06cc2806dd Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git 2011-09-04 12:13:56 +01:00
David Williams
894455e35f Tidying up of headers and #includes. 2011-09-04 12:12:30 +01:00
David Williams
bdc2770cba G++ compile fixes. 2011-08-18 22:45:39 +01:00
David Williams
7515186b47 Initial checkin of IteratorController 2011-08-17 22:49:20 +01:00
David Williams
e8b3fd16e2 Initial version of IteratorController and making LowPassFilter use iterators. 2011-08-15 21:31:52 +01:00
David Williams
90063354bd Added setVoxel() funtion to volume iterators.
Fixed bugs with RawVolume iterator movement funtions.
Proper implementation of RawVolume peek...() functions.
2011-08-15 21:10:09 +01:00
David Williams
c73b45b721 Fixed bug with RawVolume always starting coordinates at (0,0,0).
Removed Filters.h/.inl
Added Summed Area Table support to LowPassFilter.
Added test for low pass filter.
2011-08-13 08:57:45 +01:00
David Williams
03e340e7dd Initial version of LowPassFilter class, which will eventually replace the smoothRegion() function. 2011-08-03 20:43:02 +01:00
David Williams
fb0a2d0dac GCC compile fixes. 2011-07-31 08:08:00 +01:00
David Williams
53ae3de413 Replaced GCC/VS2010 hacks with code that should compile on both platforms. 2011-07-31 08:58:52 +01:00
David Williams
2e27e957a7 Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
2011-07-30 14:12:51 +01:00
David Williams
b94b7e7baf Moved sampler position into base class. 2011-07-30 14:07:33 +01:00
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