42d2a777ac
Mark some internal variables as advanced in CMake
...
This stops them from appearing by default in cmake-gui and ccmake.
2012-07-19 19:56:40 +01:00
76180392c4
Merge branch 'develop'
2012-07-19 18:42:05 +01:00
06631b35ec
Merge branch 'feature/only-static-or-dynamic' into develop
...
This makes it so that only dynamic _or_ static libraries can be built.
It simplifies the CMake code dramatically while only removing a corner
case
2012-07-19 18:39:03 +01:00
0d1c2e178a
Build the static library as position independent
...
This allows it to be compiled into other shared libraries (like the Python
bindings) on x86_64 Linux systems.
2012-07-19 18:01:31 +01:00
ac7962b534
Update documentation for LIBRARY_TYPE
2012-07-19 17:36:01 +01:00
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
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
4916b5952b
Fix type in CMake variable.
...
It would be nice if CMake issued warnings in cases like this but it
seems that it is currently unable to.
2012-07-18 20:36:07 +01:00
b9087ec6bf
Fix a few BUILD_→ENABLE_ changes that I missed
2012-07-17 20:26:00 +01:00
5b2846f3de
Removed empty file voxel.h
2012-07-16 15:33:23 +02:00
4db31ad879
More class documentation for DefaultMarchingCubesController.
2012-07-16 00:33:10 +02:00
825f1a4555
Added some class documentation to DefaultMarchingCubesController.
2012-07-15 23:59:21 +02:00
66035c6d13
Fixes to the way the marching cubes controller is used.
2012-07-15 23:19:59 +02:00
b140e16083
Renamed MarchingCubesController to DefaultMarchingCubesController.
2012-07-15 23:07:00 +02:00
451a6019b1
Fixed a few warnings.
2012-07-15 22:50:04 +02:00
ea7404cdf9
Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
2012-07-15 22:10:17 +02:00
d7fc289035
Convert CMake variables from YES/NO to ON/OFF
2012-07-15 21:14:37 +01:00
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
00e2f37f31
Change BUILD_{STATIC,SHARED}_LIBRARIES to ENABLE_
2012-07-15 20:49:39 +01:00
6fd7079e7c
Update minimum CMake version and documentation.
2012-07-15 20:37:13 +01:00
1dd37c8a7a
Renamed parameters as 'from' is a reserved word in Python.
2012-07-15 21:27:04 +02:00
68077e2d79
Renamed parameters as 'from' is a reserved word in Python and so SWIG produced warnings.
2012-07-15 21:23:31 +02:00
ca6f98c339
Add preliminary feature_summary work
...
This uses a built-in command for displaying features.
2012-07-15 20:14:15 +01:00
4667a4cd37
Fixed some compiler warnings.
2012-07-15 18:08:25 +02:00
d178636741
Rearranged CMake file for alphabetical order.
2012-07-15 18:00:17 +02:00
9a498bad7b
Renamed SurfaceExtractionController to MarchingCubesController.
2012-07-15 17:53:37 +02:00
eceb6851c0
Added missing files from previous commit.
2012-07-15 17:51:24 +02:00
679d98735a
Renamed SurfaceExtractor to MarchingCubesSurfaceExtractor.
2012-07-15 17:40:37 +02:00
7f64bc933a
Removed unnecessary default parameter.
2012-07-15 12:53:59 +02:00
c09335dbd0
Added SWIG interface for SurfaceExtractionController
2012-07-15 11:57:23 +02:00
23145f12e1
Use SWIG's autodoc command for simple docstrings with type information
2012-07-10 11:24:31 +01:00
23fbb59af8
Added test for CustomSurfaceExtractorController.
2012-07-09 18:30:21 +02:00
1217ea1fd8
Work on custom thresholds in SurfaceExtractionController.
2012-07-09 17:24:55 +02:00
949528b07a
Making Controller a template parameter of SurfaceExtractor.
2012-07-08 11:28:31 +02:00
1aa1978de1
Removed now redundant cpp files.
...
Removed a test which we don't need any more.
2012-07-08 08:52:36 +02:00
1d361c583b
Removed remaining use of VoxelTypeTraits.
2012-07-08 08:44:54 +02:00
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
ba04cb30a1
Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
2012-07-05 14:50:27 +02:00
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
61202d6056
Fixed GCC compile error.
2012-07-05 09:40:18 +02:00
f092d64992
More consistent variable naming.
2012-07-04 16:40:49 +02:00
c488cf162e
Removed use of convertToDensity() from VolumeResampler.
2012-07-04 16:33:41 +02:00
ec8b2f374c
LowPassFilter no longer requires convertToDensity() but instead assumes voxel types define operator+=, operator/=, etc.
2012-07-04 16:06:43 +02:00
63c5d510d1
'Fix' the A* test on GCC
...
Clang is suggesting that there's are some signed/unsigned comparisons
as well as some floating point comparisons which might be causing
some problems.
2012-06-29 18:31:49 +01:00
5c888f8d03
Include the changelog in the manual
2012-06-26 17:09:20 +01:00
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
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
3a0386d360
Added initial version of changelog.
2012-06-26 15:55:30 +02:00
43b25dc20f
Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git
2012-06-26 15:02:35 +02:00
af5a351b45
Added SurfaceExtractionController and modified SurfaceExtractor to use it.
2012-06-26 15:02:07 +02:00
