AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of git@gitorious.org:polyvox/polyvox.git

Browse Source
This commit is contained in:
David Williams 2011-06-07 21:49:13 +01:00
commit 22959716c1
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/CMakeLists.txt
View File

@ -31,9 +31,9 @@ else()
endif() endif()
endif() endif()
#add_subdirectory(bindings)
add_subdirectory(PolyVoxCore) add_subdirectory(PolyVoxCore)
add_subdirectory(PolyVoxUtil) add_subdirectory(PolyVoxUtil)
#add_subdirectory(bindings)
#Set up install paths e.g. for PolyVoxConfig.cmake #Set up install paths e.g. for PolyVoxConfig.cmake
if(WIN32) if(WIN32)

2
library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.h
View File

@ -36,6 +36,7 @@ namespace PolyVox
class SimpleVolume class SimpleVolume
{ {
public: public:
#ifndef SWIG
class Block class Block
{ {
//Make Sampler a friend //Make Sampler a friend
@ -129,6 +130,7 @@ namespace PolyVox
//Other current position information //Other current position information
VoxelType* mCurrentVoxel; VoxelType* mCurrentVoxel;
}; };
#endif
public: public:
/// Constructor for creating a fixed size volume. /// Constructor for creating a fixed size volume.

6
library/bindings/PolyVoxCore.i
View File

@ -27,8 +27,8 @@
//%include "Array.i" //%include "Array.i"
%include "VertexTypes.i" %include "VertexTypes.i"
%include "SurfaceMesh.i" %include "SurfaceMesh.i"
%include "SimpleVolumeSampler.i" //%include "SimpleVolumeSampler.i"
%include "SurfaceExtractor.i" %include "SurfaceExtractor.i"
%include "CubicSurfaceExtractor.i" //%include "CubicSurfaceExtractor.i"
%include "CubicSurfaceExtractorWithNormals.i" //%include "CubicSurfaceExtractorWithNormals.i"
//%include "MeshDecimator.i" //%include "MeshDecimator.i"

23
library/bindings/SurfaceExtractor.i
View File

@ -2,10 +2,29 @@
%{ %{
#include "SimpleVolume.h" #include "SimpleVolume.h"
#include "SurfaceExtractor.h" #include "SurfaceExtractor.h"
#include "PolyVoxCore/Material.h"
namespace PolyVox
{
class SurfaceExtractorSimpleVolumeMaterial8 : public SurfaceExtractor<SimpleVolume, Material8>
{
public:
SurfaceExtractorSimpleVolumeMaterial8(SimpleVolume<Material8>* volData, Region region, SurfaceMesh<PositionMaterialNormal>* result)
: SurfaceExtractor<SimpleVolume, Material8>(volData, region, result) {}
void execute() { SurfaceExtractor<SimpleVolume, Material8>::execute(); }
};
};
%} %}
%include "SimpleVolume.h" %include "SimpleVolume.h"
%include "SurfaceExtractor.h" %include "SurfaceExtractor.h"
%template(SurfaceExtractorMaterial8) PolyVox::SurfaceExtractor<PolyVox::Material8>; namespace PolyVox
%template(SurfaceExtractorDensity8) PolyVox::SurfaceExtractor<PolyVox::Density8>; {
class SurfaceExtractorSimpleVolumeMaterial8 : public SurfaceExtractor<SimpleVolume, Material8>
{
public:
SurfaceExtractorSimpleVolumeMaterial8(SimpleVolume<Material8>* volData, Region region, SurfaceMesh<PositionMaterialNormal>* result);
void execute();
};
};