Matt Williams
f11b4e17c1
Build only one of static or shared libraries
...
As discussed on the forums, to simplify the CMake code and avoid having to
manually specify dependencies this removes the hack to allow both static
and shared libraries to be built at the same time.
It introduces the new variable LIBRARY_TYPE which can be either STATIC or
DYNAMIC.
See: http://www.volumesoffun.com/phpBB3/viewtopic.php?p=3203#p3203
2012-07-19 17:33:34 +01:00
Matt Williams
5d93eef5ac
Add dependencies to SWIG bindings
...
Due to the hack in which we enable the building of both static and
shared libraries CMake's automatic dependency sorting isn't working.
Manually specifying the dependency seems to solve the problem of
components building out of order.
2012-07-18 20:36:55 +01:00
unknown
5b2846f3de
Removed empty file voxel.h
2012-07-16 15:33:23 +02:00
unknown
4db31ad879
More class documentation for DefaultMarchingCubesController.
2012-07-16 00:33:10 +02:00
unknown
825f1a4555
Added some class documentation to DefaultMarchingCubesController.
2012-07-15 23:59:21 +02:00
unknown
66035c6d13
Fixes to the way the marching cubes controller is used.
2012-07-15 23:19:59 +02:00
unknown
b140e16083
Renamed MarchingCubesController to DefaultMarchingCubesController.
2012-07-15 23:07:00 +02:00
unknown
451a6019b1
Fixed a few warnings.
2012-07-15 22:50:04 +02:00
unknown
ea7404cdf9
Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
2012-07-15 22:10:17 +02:00
Matt Williams
d7fc289035
Convert CMake variables from YES/NO to ON/OFF
2012-07-15 21:14:37 +01:00
Matt Williams
2b5024591e
Move some feature_summary stuff around
...
Move set_package_properties and add_feature_info calls around to more
sensible ordering and positions.
2012-07-15 21:10:31 +01:00
Matt Williams
00e2f37f31
Change BUILD_{STATIC,SHARED}_LIBRARIES to ENABLE_
2012-07-15 20:49:39 +01:00
unknown
1dd37c8a7a
Renamed parameters as 'from' is a reserved word in Python.
2012-07-15 21:27:04 +02:00
unknown
68077e2d79
Renamed parameters as 'from' is a reserved word in Python and so SWIG produced warnings.
2012-07-15 21:23:31 +02:00
unknown
4667a4cd37
Fixed some compiler warnings.
2012-07-15 18:08:25 +02:00
unknown
d178636741
Rearranged CMake file for alphabetical order.
2012-07-15 18:00:17 +02:00
unknown
9a498bad7b
Renamed SurfaceExtractionController to MarchingCubesController.
2012-07-15 17:53:37 +02:00
unknown
eceb6851c0
Added missing files from previous commit.
2012-07-15 17:51:24 +02:00
unknown
679d98735a
Renamed SurfaceExtractor to MarchingCubesSurfaceExtractor.
2012-07-15 17:40:37 +02:00
unknown
7f64bc933a
Removed unnecessary default parameter.
2012-07-15 12:53:59 +02:00
unknown
c09335dbd0
Added SWIG interface for SurfaceExtractionController
2012-07-15 11:57:23 +02:00
Matt Williams
23145f12e1
Use SWIG's autodoc command for simple docstrings with type information
2012-07-10 11:24:31 +01:00
unknown
1217ea1fd8
Work on custom thresholds in SurfaceExtractionController.
2012-07-09 17:24:55 +02:00
David Williams
949528b07a
Making Controller a template parameter of SurfaceExtractor.
2012-07-08 11:28:31 +02:00
David Williams
1aa1978de1
Removed now redundant cpp files.
...
Removed a test which we don't need any more.
2012-07-08 08:52:36 +02:00
David Williams
1d361c583b
Removed remaining use of VoxelTypeTraits.
2012-07-08 08:44:54 +02:00
David Williams
34b134ab0a
Fixed typo in CMake file. See http://www.volumesoffun.com/phpBB3/viewtopic.php?p=3182#p3182
2012-07-07 08:55:14 +02:00
unknown
ba04cb30a1
Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
2012-07-05 14:50:27 +02:00
unknown
777b631f88
Mostly removed use of VoxelTypeTraits. It's a bit messy because I'm committing halfway through, as I'm away fro my development machine for the next week and want to pick this up from my laptop.
...
SurfaceExtractor test is currently broken due to custom threshold support not curretly working.
2012-07-05 14:49:51 +02:00
p265186
61202d6056
Fixed GCC compile error.
2012-07-05 09:40:18 +02:00
unknown
f092d64992
More consistent variable naming.
2012-07-04 16:40:49 +02:00
unknown
c488cf162e
Removed use of convertToDensity() from VolumeResampler.
2012-07-04 16:33:41 +02:00
unknown
ec8b2f374c
LowPassFilter no longer requires convertToDensity() but instead assumes voxel types define operator+=, operator/=, etc.
2012-07-04 16:06:43 +02:00
Matt Williams
11685a1874
Rename BUILD_TESTING to ENABLE_TESTS and WITH_BINDINGS to ENABLE_BINDINGS
...
This is for future consistency where ENABLE_ variables will denote optional
components of PolyVox and WITH_ variables denote optionally using features
provided by external libraries (e.g. OGRE compatibility).
2012-06-26 17:08:44 +01:00
unknown
ffa14c6f39
Removed SurfaceExtractorController from Material as it doesn't really make sense to use the marching cubes surface extractor on this type.
2012-06-26 17:01:40 +02:00
unknown
43b25dc20f
Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
2012-06-26 15:02:35 +02:00
unknown
af5a351b45
Added SurfaceExtractionController and modified SurfaceExtractor to use it.
2012-06-26 15:02:07 +02:00
Matt Williams
49ea2e8809
Add missing file for MaterialDensityPair bindings
2012-06-22 16:50:28 +01:00
Matt Williams
85c5b7abf0
Add all the Material, Density and MaterialDensityPair typedefs
2012-06-22 00:18:04 +01:00
Matt Williams
869d1a8d6a
Re-enable more of the bindings
...
This should enable enough of the bindings to be able to extract a surface
mesh.
2012-06-21 22:24:04 +01:00
Matt Williams
d79b1006f3
Remove deprecated constructor
2012-06-21 22:19:44 +01:00
Matt Williams
c681fac66a
Add option to disable building the bindings.
...
If you want to disable them, even if SWIG and Python were both found, set
WITH_BINDINGS to NO with -DWITH_BINDINGS=NO or in the CMake GUI.
2012-06-21 20:31:04 +01:00
Matt Williams
11f91fbbc4
Fix some compiler warnings about initialisation order.
2012-06-20 23:56:37 +01:00
p265186
9fdc30643a
Linux compile fixes.
2012-06-15 17:29:39 +02:00
unknown
c11b02f354
Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
2012-06-15 16:34:58 +02:00
unknown
7f38e87ade
New 'ConvertToDensity' class for use in the SurfaceExtractor.
2012-06-15 16:34:37 +02:00
Matt Williams
5985aa5ec2
Re-enable SWIG compilation
...
For now only enable Vector, although some other
may work but will need testing.
2012-06-15 00:19:49 +02:00
Matt Williams
06439a71bd
Add 'typename' where necessary
...
This fixes the compilation on Linux after the
template template parameter removals.
2012-06-14 23:07:42 +02:00
unknown
71b884e97b
Removed remaining uses of template template parameters.
2012-06-12 16:38:51 +02:00
unknown
fcefe27192
Removed use of template template parameters from VolumeResampler.
2012-06-07 16:56:54 +02:00
