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

Changed some things to pass by reference.

Browse Source
This commit is contained in:
David Williams 2011-05-10 21:58:36 +01:00
parent 89a35fd97f
commit 4f781df27a
2 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/PolyVoxCore/include/ImprovedCubicSurfaceExtractor.h
View File

@ -114,9 +114,9 @@ namespace PolyVox
bool decimate(std::list<Quad>& quads); bool decimate(std::list<Quad>& quads);
Quad mergeQuads(Quad q1, Quad q2); Quad mergeQuads(const Quad& q1, const Quad& q2);
bool canMergeQuads(Quad q1, Quad q2); bool canMergeQuads(const Quad& q1, const Quad& q2);
int32_t quadContainsVertex(const Quad& quad, uint32_t uVertexIndex); int32_t quadContainsVertex(const Quad& quad, uint32_t uVertexIndex);

46
library/PolyVoxCore/include/ImprovedCubicSurfaceExtractor.inl
View File

@ -105,11 +105,6 @@ namespace PolyVox
if(currentVoxelIsSolid > negXVoxelIsSolid) if(currentVoxelIsSolid > negXVoxelIsSolid)
{ {
//m_meshCurrent->addTriangleCubic(v0,v1,v2);
//m_meshCurrent->addTriangleCubic(v1,v3,v2);
//m_faces[x][y][z][NegativeX] = material;
Quad quad; Quad quad;
quad.vertices[0] = v0; quad.vertices[0] = v0;
quad.vertices[1] = v1; quad.vertices[1] = v1;
@ -118,15 +113,9 @@ namespace PolyVox
quad.material = material; quad.material = material;
m_vecNegXQuads[regX].push_back(quad); m_vecNegXQuads[regX].push_back(quad);
/*m_vecNegXIndices[x].push_back(v0);
m_vecNegXIndices[x].push_back(v1);
m_vecNegXIndices[x].push_back(v2);
m_vecNegXIndices[x].push_back(v3);*/
} }
else else
{ {
Quad quad; Quad quad;
quad.vertices[0] = v0; quad.vertices[0] = v0;
quad.vertices[1] = v3; quad.vertices[1] = v3;
@ -135,18 +124,6 @@ namespace PolyVox
quad.material = material; quad.material = material;
m_vecPosXQuads[regX].push_back(quad); m_vecPosXQuads[regX].push_back(quad);
//m_meshCurrent->addTriangleCubic(v0,v2,v1);
//m_meshCurrent->addTriangleCubic(v1,v2,v3);
/*m_vecPosXIndices[x-1].push_back(v0);
m_vecPosXIndices[x-1].push_back(v2);
m_vecPosXIndices[x-1].push_back(v1);
m_vecPosXIndices[x-1].push_back(v1);
m_vecPosXIndices[x-1].push_back(v2);
m_vecPosXIndices[x-1].push_back(v3);*/
//m_faces[x-1][y][z][PositiveX] = material;
} }
} }
@ -165,9 +142,6 @@ namespace PolyVox
uint32_t v1 = addVertex(regX - 0.5f, regY - 0.5f, regZ + 0.5f, material, m_currentSliceVertices); uint32_t v1 = addVertex(regX - 0.5f, regY - 0.5f, regZ + 0.5f, material, m_currentSliceVertices);
uint32_t v2 = addVertex(regX + 0.5f, regY - 0.5f, regZ + 0.5f, material, m_currentSliceVertices); uint32_t v2 = addVertex(regX + 0.5f, regY - 0.5f, regZ + 0.5f, material, m_currentSliceVertices);
uint32_t v3 = addVertex(regX + 0.5f, regY - 0.5f, regZ - 0.5f, material, m_previousSliceVertices); uint32_t v3 = addVertex(regX + 0.5f, regY - 0.5f, regZ - 0.5f, material, m_previousSliceVertices);
if(currentVoxelIsSolid > negYVoxelIsSolid) if(currentVoxelIsSolid > negYVoxelIsSolid)
{ {
@ -180,10 +154,6 @@ namespace PolyVox
quad.material = material; quad.material = material;
m_vecNegYQuads[regY].push_back(quad); m_vecNegYQuads[regY].push_back(quad);
//m_meshCurrent->addTriangleCubic(v0,v2,v1);
//m_meshCurrent->addTriangleCubic(v1,v2,v3);
//m_faces[x][y][z][NegativeY] = material;
} }
else else
{ {
@ -196,10 +166,6 @@ namespace PolyVox
quad.material = material; quad.material = material;
m_vecPosYQuads[regY].push_back(quad); m_vecPosYQuads[regY].push_back(quad);
//m_meshCurrent->addTriangleCubic(v0,v1,v2);
//m_meshCurrent->addTriangleCubic(v1,v3,v2);
//m_faces[x][y-1][z][PositiveY] = material;
} }
} }
} }
@ -230,10 +196,6 @@ namespace PolyVox
quad.material = material; quad.material = material;
m_vecNegZQuads[regZ].push_back(quad); m_vecNegZQuads[regZ].push_back(quad);
//m_meshCurrent->addTriangleCubic(v0,v1,v2);
//m_meshCurrent->addTriangleCubic(v1,v3,v2);
//m_faces[x][y][z][NegativeZ] = material;
} }
else else
{ {
@ -245,10 +207,6 @@ namespace PolyVox
quad.material = material; quad.material = material;
m_vecPosZQuads[regZ].push_back(quad); m_vecPosZQuads[regZ].push_back(quad);
//m_meshCurrent->addTriangleCubic(v0,v2,v1);
//m_meshCurrent->addTriangleCubic(v1,v2,v3);
//m_faces[x][y][z-1][PositiveZ] = material;
} }
} }
} }
@ -430,7 +388,7 @@ namespace PolyVox
} }
template< template<typename> class VolumeType, typename VoxelType> template< template<typename> class VolumeType, typename VoxelType>
Quad ImprovedCubicSurfaceExtractor<VolumeType, VoxelType>::mergeQuads(Quad q1, Quad q2) Quad ImprovedCubicSurfaceExtractor<VolumeType, VoxelType>::mergeQuads(const Quad& q1, const Quad& q2)
{ {
/*Quad* pCurrentQuad = &q1; /*Quad* pCurrentQuad = &q1;
Quad* pOtherQuad = &q2; Quad* pOtherQuad = &q2;
@ -480,7 +438,7 @@ namespace PolyVox
} }
template< template<typename> class VolumeType, typename VoxelType> template< template<typename> class VolumeType, typename VoxelType>
bool ImprovedCubicSurfaceExtractor<VolumeType, VoxelType>::canMergeQuads(Quad q1, Quad q2) bool ImprovedCubicSurfaceExtractor<VolumeType, VoxelType>::canMergeQuads(const Quad& q1, const Quad& q2)
{ {
if(q1.material != q2.material) if(q1.material != q2.material)
{ {