ef4cb38fbe
Merge branch 'develop' of https://bitbucket.org/volumesoffun/polyvox into develop
2012-12-24 20:20:52 +00:00
74f25eac23
Merge branch 'develop' into feature/cmake-cxx11-detect
...
Conflicts:
examples/Basic/CMakeLists.txt
examples/OpenGL/CMakeLists.txt
examples/Paging/CMakeLists.txt
examples/SmoothLOD/CMakeLists.txt
library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
2012-12-24 20:08:31 +00:00
fc74ec5f0f
The static_assert() methods are now not bound in SWIG
...
The ReducedStorageType here is to work around a bug in SWIG.
2012-12-24 15:51:40 +00:00
79cc521666
Remove Density and Material tyes from bindings
...
We now only have the bindings for (u)int{8,16,32}_t and float. This will
hopefully simplify things.
2012-11-26 13:58:51 +00:00
3ed3ac6998
Start Python bindings for Raycast
...
This is only beginning of the bindings here. It's starting to get more
complicated due to the use of callbacks. To be able to define a callback
function in Python which is then called by a C++ algorithm requires quite a
bit of wrapping boilerplate.
The class PyCallback here will wrap a Python callable and call it with the
density value of the voxel. It's not very generic and at present it can't
pass the sampler itself since it's not available in the Python bindings.
Regardless, the new test added here (TestRaycast.py) works as expected and
hopefully we will be able to build up from here.
2012-11-25 18:07:12 +00:00
fd3ce69187
Wrap the correct class..but disable it since it needs more work.
2012-11-25 10:30:58 +00:00
e048f7c2f6
Clean up in interface files and CubicExtractor bindings
2012-11-24 15:42:02 +00:00
bb3d3c4b68
Add a EXTRACTORS macro to automate the generation of the extractors
...
Like with VOLUMETYPES it is centralising the definitions of the volume and
voxel types.
2012-11-24 15:37:46 +00:00
e7daab5bbc
Simplify macro by assuming PolyVox:: in front of all classes
2012-11-24 15:20:34 +00:00
edf2bf87d4
Add LargeVolume binding
2012-11-24 14:23:52 +00:00
63e0298fbf
Add a VOLUMETYPES macro to avoid repeating ourselves.
2012-11-24 14:16:52 +00:00
a932d060f2
Add RawVolume wrapper
2012-11-24 14:07:13 +00:00
7fbe92e1e7
Separate out the BaseVolume definitions into their own file
2012-11-24 14:06:31 +00:00
989e6ea589
Fix SWIG complaining about redefining uint8_t etc.
2012-11-23 15:41:26 +00:00
3902e00a0f
Add a CompilerCapabilities.h.in file which is filled in by CMake
...
It will #define a each of the basic features detected by CMake which can
then be used by other headers (like TypeDef.h) to set things up for
PolyVox.
It is this file which you will have to manually edit and rename if you want
to skip using CMake.
2012-11-23 15:41:26 +00:00
d28c2aa61d
This is a collection of commits which were supposed to be part of a feature branch... but I got in a mess with Git and so am committing them all together.
2012-11-23 15:51:22 +01:00
3577a56eb3
Rename some SWIG stuff to prepare for C# bindings
2012-11-21 17:03:17 +00:00
27f943adb3
Silence all the SWIG warning hopefully
2012-11-17 13:44:27 +00:00
b534811477
Explicitly include the TypeDef.h header in SWIG
...
This time the bindings really should be fixed.
2012-11-09 13:27:44 +00:00
5c88f2e49f
Inform SWIG of the meaning of the POLYVOX_DEPRECATED command in Linux
...
If the bindings fail to build on Windows, we might need to add an
equivalent there too.
2012-11-08 10:10:01 +00:00
d4edc1047e
Renamed 'PolyVoxImpl' to just 'Impl'.
2012-11-05 17:00:09 +01:00
bc01223237
Removed some unecessary hierarchy in VS project structure.
...
Renamed the documentation targets in VS for clarity.
2012-09-28 14:07:13 +02:00
4b63c34305
Brought the manual and API docs together under the same heading in Visual Studio.
2012-09-28 13:54:27 +02:00
480c159327
Add copyright headers to all the CMake files
2012-08-24 13:20:41 +01:00
b96309f4a4
Use the CMake folder tool to help IDEs groupt targets.
...
This is done as seen in http://athile.net/library/blog/?p=288
Hopefully this works in Visual Studio as KDevelop doesn't use this feature.
2012-08-12 04:29:51 +01:00
8ac27912ae
Fix CMake files so it actually works on CMake 2.8.3
2012-07-23 11:11:31 +01:00
830623800c
Set BUILD_BINDINGS to OFF correctly
...
When ENABLE_BINDINGS is true but SWIG or Python isn't found, correctly
set BUILD_BINDINGS to OFF rather than leaving it blank.
2012-07-20 22:09:58 +01:00
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
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
5b2846f3de
Removed empty file voxel.h
2012-07-16 15:33:23 +02:00
b140e16083
Renamed MarchingCubesController to DefaultMarchingCubesController.
2012-07-15 23:07:00 +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
9a498bad7b
Renamed SurfaceExtractionController to MarchingCubesController.
2012-07-15 17:53:37 +02:00
679d98735a
Renamed SurfaceExtractor to MarchingCubesSurfaceExtractor.
2012-07-15 17:40:37 +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
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
49ea2e8809
Add missing file for MaterialDensityPair bindings
2012-06-22 16:50:28 +01:00
85c5b7abf0
Add all the Material, Density and MaterialDensityPair typedefs
2012-06-22 00:18:04 +01:00
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
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
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
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
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
cb0a746b6f
Update include paths for bindings to new layout.
2011-05-22 21:33:32 +02:00
1fed1c161a
Fix slashes in SWIG files to fix compilation in Linux.
2011-01-28 15:23:18 +00:00
c1ebed678e
More SWIG bindings.
2011-01-18 21:59:21 +00:00
