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

Fix compilation on Linux:

Browse Source 
- The template addition is apparently a C++ Standard thing which is a bit of a mess but the way GCC interprets it requires these.
 - In XOrg there is a struct called 'Region' which causes ambiguities. For some reason doing 'using PolyVox::Region' didn't fix it.
This commit is contained in:
Matt Williams 2011-01-06 17:56:19 +00:00
parent e6307a9a77
commit 149dde9460
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Basic/main.cpp
View File

@ -159,7 +159,7 @@ int main(int argc, char *argv[])
createSphereInVolume(volData, 24); createSphereInVolume(volData, 24);
//Extract the surface //Extract the surface
Region region(Vector3DInt16(-1,-1,-1), Vector3DInt16(32,32,32)); PolyVox::Region region(Vector3DInt16(-1,-1,-1), Vector3DInt16(32,32,32));
SurfaceMesh<PositionMaterial> mesh; SurfaceMesh<PositionMaterial> mesh;
//CubicSurfaceExtractor<MaterialDensityPair44> surfaceExtractor(&volData, volData.getEnclosingRegion(), &mesh); //CubicSurfaceExtractor<MaterialDensityPair44> surfaceExtractor(&volData, volData.getEnclosingRegion(), &mesh);

2
library/PolyVoxCore/include/MeshDecimator.inl
View File

@ -112,6 +112,7 @@ namespace PolyVox
} }
} }
template<>
void MeshDecimator<PositionMaterial>::fillInitialVertexMetadata(std::vector<InitialVertexMetadata>& vecVertexMetadata) void MeshDecimator<PositionMaterial>::fillInitialVertexMetadata(std::vector<InitialVertexMetadata>& vecVertexMetadata)
{ {
vecVertexMetadata.clear(); vecVertexMetadata.clear();
@ -171,6 +172,7 @@ namespace PolyVox
} }
} }
template<>
void MeshDecimator<PositionMaterialNormal>::fillInitialVertexMetadata(std::vector<InitialVertexMetadata>& vecVertexMetadata) void MeshDecimator<PositionMaterialNormal>::fillInitialVertexMetadata(std::vector<InitialVertexMetadata>& vecVertexMetadata)
{ {
vecVertexMetadata.clear(); vecVertexMetadata.clear();