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

Move to VS 2010.

Browse Source 
Update to Ogre SDK 1.7.1
Removed support for compilers which don't adhere to C++0X
This commit is contained in:
David Williams
2010-05-23 21:51:34 +00:00
parent e1dde122a7
commit 7ffcd0c7ed
190 changed files with 69 additions and 19405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/PolyVoxCore/source/SurfaceExtractor.cpp
View File

@ -28,6 +28,8 @@ freely, subject to the following restrictions:
#include "PolyVoxImpl/MarchingCubesTables.h"
#include "SurfaceVertex.h"
using namespace std;
namespace PolyVox
{
SurfaceExtractor::SurfaceExtractor(Volume<uint8_t>& volData)
@ -36,7 +38,7 @@ namespace PolyVox
{
}
POLYVOX_SHARED_PTR<SurfaceMesh> SurfaceExtractor::extractSurfaceForRegion(Region region)
shared_ptr<SurfaceMesh> SurfaceExtractor::extractSurfaceForRegion(Region region)
{
m_regInputUncropped = region;
@ -148,7 +150,7 @@ namespace PolyVox
lodRecord.endIndex = m_meshCurrent->getNoOfIndices();
m_meshCurrent->m_vecLodRecords.push_back(lodRecord);
return POLYVOX_SHARED_PTR<SurfaceMesh>(m_meshCurrent);
return shared_ptr<SurfaceMesh>(m_meshCurrent);
}
template<bool isPrevZAvail>

4
library/PolyVoxCore/source/SurfaceMesh.cpp
View File

@ -349,9 +349,9 @@ namespace PolyVox
}
}
POLYVOX_SHARED_PTR<SurfaceMesh> SurfaceMesh::extractSubset(std::set<uint8_t> setMaterials)
shared_ptr<SurfaceMesh> SurfaceMesh::extractSubset(std::set<uint8_t> setMaterials)
{
POLYVOX_SHARED_PTR<SurfaceMesh> result(new SurfaceMesh);
shared_ptr<SurfaceMesh> result(new SurfaceMesh);
if(m_vecVertices.size() == 0) //FIXME - I don't think we should need this test, but I have seen crashes otherwise...
{