Clean up in interface files and CubicExtractor bindings

This commit is contained in:
Matt Williams 2012-11-24 15:42:02 +00:00
parent bb3d3c4b68
commit e048f7c2f6
3 changed files with 3 additions and 12 deletions

View File

@ -1,13 +1,8 @@
%module CubicSurfaceExtractor %module CubicSurfaceExtractor
%{ %{
#include "SimpleVolume.h"
#include "Array.h"
#include "CubicSurfaceExtractor.h" #include "CubicSurfaceExtractor.h"
%} %}
%include "SimpleVolume.h"
%include "Array.h"
%include "CubicSurfaceExtractor.h" %include "CubicSurfaceExtractor.h"
%template(CubicSurfaceExtractorMaterial8) PolyVox::CubicSurfaceExtractor<PolyVox::Material8>; EXTRACTORS(MarchingCubesSurfaceExtractor)
%template(CubicSurfaceExtractorDensity8) PolyVox::CubicSurfaceExtractor<PolyVox::Density8>;

View File

@ -1,11 +1,8 @@
%module MarchingCubesSurfaceExtractor %module MarchingCubesSurfaceExtractor
%{ %{
#include "SimpleVolume.h"
#include "Material.h"
#include "MarchingCubesSurfaceExtractor.h" #include "MarchingCubesSurfaceExtractor.h"
%} %}
%include "SimpleVolume.h"
%include "MarchingCubesSurfaceExtractor.h" %include "MarchingCubesSurfaceExtractor.h"
EXTRACTORS(MarchingCubesSurfaceExtractor) EXTRACTORS(MarchingCubesSurfaceExtractor)

View File

@ -52,8 +52,10 @@ EXTRACTOR(shortname, LargeVolume)
%feature("autodoc", "1"); %feature("autodoc", "1");
#ifdef SWIGPYTHON
//This will rename "operator=" to "assign" since Python doesn't have assignment //This will rename "operator=" to "assign" since Python doesn't have assignment
%rename(assign) *::operator=; %rename(assign) *::operator=;
#endif
%include "stdint.i" %include "stdint.i"
%include "std_vector.i" %include "std_vector.i"
@ -67,14 +69,11 @@ EXTRACTOR(shortname, LargeVolume)
%include "SimpleVolume.i" %include "SimpleVolume.i"
%include "RawVolume.i" %include "RawVolume.i"
%include "LargeVolume.i" %include "LargeVolume.i"
//%include "TypeDef.i"
//%include "SubArray.i" //%include "SubArray.i"
//%include "Array.i" //%include "Array.i"
%include "VertexTypes.i" %include "VertexTypes.i"
%include "SurfaceMesh.i" %include "SurfaceMesh.i"
//%include "SimpleVolumeSampler.i"
%include "MarchingCubesSurfaceExtractor.i" %include "MarchingCubesSurfaceExtractor.i"
//%include "CubicSurfaceExtractor.i" //%include "CubicSurfaceExtractor.i"
//%include "CubicSurfaceExtractorWithNormals.i" //%include "CubicSurfaceExtractorWithNormals.i"
//%include "MeshDecimator.i" //%include "MeshDecimator.i"