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-06 20:16:38 +01:00
commit 72adbaa5a7
11 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.inl
View File

@ -67,7 +67,7 @@ namespace PolyVox
m_vecQuads[NegativeZ].resize(m_regSizeInVoxels.getUpperCorner().getZ() - m_regSizeInVoxels.getLowerCorner().getZ() + 2);
m_vecQuads[PositiveZ].resize(m_regSizeInVoxels.getUpperCorner().getZ() - m_regSizeInVoxels.getLowerCorner().getZ() + 2);
VolumeType<VoxelType>::Sampler volumeSampler(m_volData);
typename VolumeType<VoxelType>::Sampler volumeSampler(m_volData);
Quad quad;
for(int32_t z = m_regSizeInVoxels.getLowerCorner().getZ(); z <= m_regSizeInVoxels.getUpperCorner().getZ() + 1; z++)
@ -220,8 +220,8 @@ namespace PolyVox
while(performQuadMerging(listQuads)){}
}
std::list<Quad>::iterator iterEnd = listQuads.end();
for(std::list<Quad>::iterator quadIter = listQuads.begin(); quadIter != iterEnd; quadIter++)
typename std::list<Quad>::iterator iterEnd = listQuads.end();
for(typename std::list<Quad>::iterator quadIter = listQuads.begin(); quadIter != iterEnd; quadIter++)
{
Quad& quad = *quadIter;
m_meshCurrent->addTriangleCubic(quad.vertices[0], quad.vertices[1],quad.vertices[2]);
@ -276,9 +276,9 @@ namespace PolyVox
bool CubicSurfaceExtractor<VolumeType, VoxelType>::performQuadMerging(std::list<Quad>& quads)
{
bool bDidMerge = false;
for(std::list<Quad>::iterator outerIter = quads.begin(); outerIter != quads.end(); outerIter++)
for(typename std::list<Quad>::iterator outerIter = quads.begin(); outerIter != quads.end(); outerIter++)
{
std::list<Quad>::iterator innerIter = outerIter;
typename std::list<Quad>::iterator innerIter = outerIter;
innerIter++;
while(innerIter != quads.end())
{

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

@ -37,7 +37,7 @@ namespace PolyVox
{
public:
const static Region MaxRegion;
static const Region MaxRegion;
Region();
Region(const Vector3DInt32& v3dLowerCorner, const Vector3DInt32& v3dUpperCorner);

3
library/bindings/CMakeLists.txt
View File

@ -4,7 +4,8 @@ if(SWIG_FOUND)
find_package(PythonLibs)
include_directories(${PYTHON_INCLUDE_PATH})
include_directories(${PolyVoxCore_SOURCE_DIR}/include)
include_directories(${PolyVoxCore_SOURCE_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include/PolyVoxCore)
link_directories(${PolyVoxCore_BINARY_DIR})
set(CMAKE_SWIG_FLAGS "")
set_source_files_properties(PolyVoxCore.i PROPERTIES CPLUSPLUS ON)

4
library/bindings/CubicSurfaceExtractor.i
View File

@ -1,11 +1,11 @@
%module CubicSurfaceExtractor
%{
#include "VolumeSampler.h"
#include "SimpleVolume.h"
#include "Array.h"
#include "CubicSurfaceExtractor.h"
%}
%include "VolumeSampler.h"
%include "SimpleVolume.h"
%include "Array.h"
%include "CubicSurfaceExtractor.h"

4
library/bindings/CubicSurfaceExtractorWithNormals.i
View File

@ -1,11 +1,11 @@
%module CubicSurfaceExtractorWithNormals
%{
#include "VolumeSampler.h"
#include "SimpleVolume.h"
//#include "CubicSurfaceExtractor.h"
#include "CubicSurfaceExtractorWithNormals.h"
%}
%include "VolumeSampler.h"
%include "SimpleVolume.h"
//%include "CubicSurfaceExtractor.h"
%include "CubicSurfaceExtractorWithNormals.h"

4
library/bindings/PolyVoxCore.i
View File

@ -21,13 +21,13 @@
%include "Density.i"
%include "Vector.i"
%include "Region.i"
%include "Volume.i"
%include "SimpleVolume.i"
%include "TypeDef.i"
//%include "SubArray.i"
//%include "Array.i"
%include "VertexTypes.i"
%include "SurfaceMesh.i"
%include "VolumeSampler.i"
%include "SimpleVolumeSampler.i"
%include "SurfaceExtractor.i"
%include "CubicSurfaceExtractor.i"
%include "CubicSurfaceExtractorWithNormals.i"

13
library/bindings/SimpleVolume.i Normal file
View File

@ -0,0 +1,13 @@
%module SimpleVolume
%{
#include "Material.h"
#include "Density.h"
#include "SimpleVolume.h"
%}
%include "Material.h"
%include "Density.h"
%include "SimpleVolume.h"
%template(SimpleVolumeMaterial8) PolyVox::SimpleVolume<PolyVox::Material8>;
%template(SimpleVolumeDensity8) PolyVox::SimpleVolume<PolyVox::Density8>;

9
library/bindings/SimpleVolumeSampler.i Normal file
View File

@ -0,0 +1,9 @@
%module SimpleVolumeSampler
%{
#include "SimpleVolume.h"
%}
%include "SimpleVolume.h"
%template(SimpleVolumeSamplerMaterial8) PolyVox::SimpleVolume::Sampler<PolyVox::Material8>;
%template(SimpleVolumeSamplerDensity8) PolyVox::SimpleVolume::Sampler<PolyVox::Density8>;

4
library/bindings/SurfaceExtractor.i
View File

@ -1,10 +1,10 @@
%module SurfaceExtractor
%{
#include "VolumeSampler.h"
#include "SimpleVolume.h"
#include "SurfaceExtractor.h"
%}
%include "VolumeSampler.h"
%include "SimpleVolume.h"
%include "SurfaceExtractor.h"
%template(SurfaceExtractorMaterial8) PolyVox::SurfaceExtractor<PolyVox::Material8>;

13
library/bindings/Volume.i
View File

@ -1,13 +0,0 @@
%module Volume
%{
#include "Material.h"
#include "Density.h"
#include "Volume.h"
%}
%include "Material.h"
%include "Density.h"
%include "Volume.h"
%template(VolumeMaterial8) PolyVox::Volume<PolyVox::Material8>;
%template(VolumeDensity8) PolyVox::Volume<PolyVox::Density8>;

9
library/bindings/VolumeSampler.i
View File

@ -1,9 +0,0 @@
%module VolumeSampler
%{
#include "VolumeSampler.h"
%}
%include "VolumeSampler.h"
%template(VolumeSamplerMaterial8) PolyVox::VolumeSampler<PolyVox::Material8>;
%template(VolumeSamplerDensity8) PolyVox::VolumeSampler<PolyVox::Density8>;