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

Simplyfying code.

Browse Source
This commit is contained in:
unknown 2012-08-10 16:56:33 +02:00
parent f19e9caae1
commit cc98c8e71a
2 changed files with 15 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h
View File

@ -54,6 +54,14 @@ namespace PolyVox
struct Quad struct Quad
{ {
Quad(uint32_t v0, uint32_t v1, uint32_t v2, uint32_t v3)
{
vertices[0] = v0;
vertices[1] = v1;
vertices[2] = v2;
vertices[3] = v3;
}
uint32_t vertices[4]; uint32_t vertices[4];
}; };

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

@ -72,7 +72,6 @@ namespace PolyVox
m_vecQuads[PositiveZ].resize(m_regSizeInVoxels.getUpperCorner().getZ() - m_regSizeInVoxels.getLowerCorner().getZ() + 2); m_vecQuads[PositiveZ].resize(m_regSizeInVoxels.getUpperCorner().getZ() - m_regSizeInVoxels.getLowerCorner().getZ() + 2);
typename VolumeType::Sampler volumeSampler(m_volData); typename VolumeType::Sampler volumeSampler(m_volData);
Quad quad;
for(int32_t z = m_regSizeInVoxels.getLowerCorner().getZ(); z <= m_regSizeInVoxels.getUpperCorner().getZ(); z++) for(int32_t z = m_regSizeInVoxels.getLowerCorner().getZ(); z <= m_regSizeInVoxels.getUpperCorner().getZ(); z++)
{ {
@ -104,22 +103,12 @@ namespace PolyVox
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 > negXVoxelIsSolid) if(currentVoxelIsSolid > negXVoxelIsSolid)
{ {
quad.vertices[0] = v0; m_vecQuads[NegativeX][regX].push_back(Quad(v0, v1, v2, v3));
quad.vertices[1] = v1;
quad.vertices[2] = v2;
quad.vertices[3] = v3;
m_vecQuads[NegativeX][regX].push_back(quad);
} }
else else
{ {
quad.vertices[0] = v0; m_vecQuads[PositiveX][regX].push_back(Quad(v0, v3, v2, v1));
quad.vertices[1] = v3;
quad.vertices[2] = v2;
quad.vertices[3] = v1;
m_vecQuads[PositiveX][regX].push_back(quad);
} }
} }
@ -138,22 +127,12 @@ namespace PolyVox
if(currentVoxelIsSolid > negYVoxelIsSolid) if(currentVoxelIsSolid > negYVoxelIsSolid)
{ {
//NOTE: For some reason y windong is opposite of X and Z. Investigate this... //NOTE: For some reason y windong is opposite of X and Z. Investigate this...
quad.vertices[0] = v0; m_vecQuads[NegativeY][regY].push_back(Quad(v0, v3, v2, v1));
quad.vertices[1] = v3;
quad.vertices[2] = v2;
quad.vertices[3] = v1;
m_vecQuads[NegativeY][regY].push_back(quad);
} }
else else
{ {
//NOTE: For some reason y windong is opposite of X and Z. Investigate this... //NOTE: For some reason y windong is opposite of X and Z. Investigate this...
quad.vertices[0] = v0; m_vecQuads[PositiveY][regY].push_back(Quad(v0, v1, v2, v3));
quad.vertices[1] = v1;
quad.vertices[2] = v2;
quad.vertices[3] = v3;
m_vecQuads[PositiveY][regY].push_back(quad);
} }
} }
@ -171,21 +150,11 @@ namespace PolyVox
if(currentVoxelIsSolid > negZVoxelIsSolid) if(currentVoxelIsSolid > negZVoxelIsSolid)
{ {
quad.vertices[0] = v0; m_vecQuads[NegativeZ][regZ].push_back(Quad(v0, v1, v2, v3));
quad.vertices[1] = v1;
quad.vertices[2] = v2;
quad.vertices[3] = v3;
m_vecQuads[NegativeZ][regZ].push_back(quad);
} }
else else
{ {
quad.vertices[0] = v0; m_vecQuads[PositiveZ][regZ].push_back(Quad(v0, v3, v2, v1));
quad.vertices[1] = v3;
quad.vertices[2] = v2;
quad.vertices[3] = v1;
m_vecQuads[PositiveZ][regZ].push_back(quad);
} }
} }
} }