scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-02-26 16:44:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed variable shadowing.

Browse source
This commit is contained in:
Branimir Karadžić 2015-04-04 16:40:28 -07:00
parent 2e6ac0ca49
commit 250777287f
1 changed files with 121 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
examples/14-shadowvolumes/shadowvolumes.cpp
View file

@ -880,9 +880,9 @@ struct Group
for (uint32_t ii = 0, size = m_numIndices/3; ii < size; ++ii) for (uint32_t ii = 0, size = m_numIndices/3; ii < size; ++ii)
{ {
const uint16_t* indices = &m_indices[ii*3]; const uint16_t* indices = &m_indices[ii*3];
const uint16_t i0 = indices[0]; uint16_t i0 = indices[0];
const uint16_t i1 = indices[1]; uint16_t i1 = indices[1];
const uint16_t i2 = indices[2]; uint16_t i2 = indices[2];
const float* v0 = (float*)&m_vertices[i0*stride]; const float* v0 = (float*)&m_vertices[i0*stride];
const float* v1 = (float*)&m_vertices[i1*stride]; const float* v1 = (float*)&m_vertices[i1*stride];
const float* v2 = (float*)&m_vertices[i2*stride]; const float* v2 = (float*)&m_vertices[i2*stride];
@ -899,15 +899,15 @@ struct Group
//Use unique indices for EdgeMap. //Use unique indices for EdgeMap.
const uint16_t* uindices = &uniqueIndices[ii*3]; const uint16_t* uindices = &uniqueIndices[ii*3];
const uint16_t ui0 = uindices[0]; i0 = uindices[0];
const uint16_t ui1 = uindices[1]; i1 = uindices[1];
const uint16_t ui2 = uindices[2]; i2 = uindices[2];
const uint16_t triangleEdge[3][2] = const uint16_t triangleEdge[3][2] =
{ {
{ui0, ui1}, { i0, i1 },
{ui1, ui2}, { i1, i2 },
{ui2, ui0}, { i2, i0 },
}; };
for (uint8_t jj = 0; jj < 3; ++jj) for (uint8_t jj = 0; jj < 3; ++jj)
@ -1510,6 +1510,7 @@ void shadowVolumeCreate(ShadowVolume& _shadowVolume
} }
} }
else // ShadowVolumeAlgorithm::EdgeBased: else // ShadowVolumeAlgorithm::EdgeBased:
{
{ {
uint32_t ii = 0; uint32_t ii = 0;
@ -1529,21 +1530,22 @@ void shadowVolumeCreate(ShadowVolume& _shadowVolume
const Plane* edgePlane0 = &edgePlanes[ii*2]; const Plane* edgePlane0 = &edgePlanes[ii*2];
const Plane* edgePlane1 = &edgePlanes[ii*2 + 2]; const Plane* edgePlane1 = &edgePlanes[ii*2 + 2];
const float4_t reverse = float4_ild(edge0.m_faceReverseOrder[0] const float4_t reverse =
float4_ild(edge0.m_faceReverseOrder[0]
, edge1.m_faceReverseOrder[0] , edge1.m_faceReverseOrder[0]
, edge0.m_faceReverseOrder[1] , edge0.m_faceReverseOrder[1]
, edge1.m_faceReverseOrder[1] , edge1.m_faceReverseOrder[1]
); );
const float4_t v0 = float4_ld(edgePlane0[0].m_plane); const float4_t p00 = float4_ld(edgePlane0[0].m_plane);
const float4_t v1 = float4_ld(edgePlane1[0].m_plane); const float4_t p10 = float4_ld(edgePlane1[0].m_plane);
const float4_t v2 = float4_ld(edgePlane0[1].m_plane); const float4_t p01 = float4_ld(edgePlane0[1].m_plane);
const float4_t v3 = float4_ld(edgePlane1[1].m_plane); const float4_t p11 = float4_ld(edgePlane1[1].m_plane);
const float4_t xxyy0 = float4_shuf_xAyB(v0, v2); const float4_t xxyy0 = float4_shuf_xAyB(p00, p01);
const float4_t zzww0 = float4_shuf_zCwD(v0, v2); const float4_t zzww0 = float4_shuf_zCwD(p00, p01);
const float4_t xxyy1 = float4_shuf_xAyB(v1, v3); const float4_t xxyy1 = float4_shuf_xAyB(p10, p11);
const float4_t zzww1 = float4_shuf_zCwD(v1, v3); const float4_t zzww1 = float4_shuf_zCwD(p10, p11);
const float4_t vX = float4_shuf_xAyB(xxyy0, xxyy1); const float4_t vX = float4_shuf_xAyB(xxyy0, xxyy1);
const float4_t vY = float4_shuf_zCwD(xxyy0, xxyy1); const float4_t vY = float4_shuf_zCwD(xxyy0, xxyy1);
@ -1572,19 +1574,19 @@ void shadowVolumeCreate(ShadowVolume& _shadowVolume
for (uint16_t jj = 0; jj < 2; ++jj) for (uint16_t jj = 0; jj < 2; ++jj)
{ {
int16_t k = res[jj] + res[jj+2]; int16_t kk = res[jj] + res[jj+2];
if (k != 0) if (kk != 0)
{ {
float* v0 = (float*)&vertices[edges[ii+jj].m_i0*_stride]; float* v0 = (float*)&vertices[edges[ii+jj].m_i0*_stride];
float* v1 = (float*)&vertices[edges[ii+jj].m_i1*_stride]; float* v1 = (float*)&vertices[edges[ii+jj].m_i1*_stride];
verticesSide[vsideI++] = VertexData(v0, 0.0f, float(k)); verticesSide[vsideI++] = VertexData(v0, 0.0f, float(kk) );
verticesSide[vsideI++] = VertexData(v0, 1.0f, float(k)); verticesSide[vsideI++] = VertexData(v0, 1.0f, float(kk) );
verticesSide[vsideI++] = VertexData(v1, 0.0f, float(k)); verticesSide[vsideI++] = VertexData(v1, 0.0f, float(kk) );
verticesSide[vsideI++] = VertexData(v1, 1.0f, float(k)); verticesSide[vsideI++] = VertexData(v1, 1.0f, float(kk) );
k = _textureAsStencil ? 1 : k; kk = _textureAsStencil ? 1 : kk;
uint16_t winding = uint16_t(k > 0); uint16_t winding = uint16_t(kk > 0);
for (uint8_t ii = 0, end = abs(k); ii < end; ++ii) for (uint8_t ll = 0, end = abs(kk); ll < end; ++ll)
{ {
indicesSide[sideI++] = indexSide; indicesSide[sideI++] = indexSide;
indicesSide[sideI++] = indexSide + 2 - winding; indicesSide[sideI++] = indexSide + 2 - winding;
@ -1608,20 +1610,20 @@ void shadowVolumeCreate(ShadowVolume& _shadowVolume
int16_t s0 = ( (vec3Dot(edgePlane[0].m_plane, _light) + edgePlane[0].m_plane[3]) > 0.0f) ^ edge.m_faceReverseOrder[0]; int16_t s0 = ( (vec3Dot(edgePlane[0].m_plane, _light) + edgePlane[0].m_plane[3]) > 0.0f) ^ edge.m_faceReverseOrder[0];
int16_t s1 = ( (vec3Dot(edgePlane[1].m_plane, _light) + edgePlane[1].m_plane[3]) > 0.0f) ^ edge.m_faceReverseOrder[1]; int16_t s1 = ( (vec3Dot(edgePlane[1].m_plane, _light) + edgePlane[1].m_plane[3]) > 0.0f) ^ edge.m_faceReverseOrder[1];
int16_t k = ( (s0 + s1) << 1) - 2; int16_t kk = ( (s0 + s1) << 1) - 2;
if (k != 0) if (kk != 0)
{ {
float* v0 = (float*)&vertices[edge.m_i0*_stride]; float* v0 = (float*)&vertices[edge.m_i0*_stride];
float* v1 = (float*)&vertices[edge.m_i1*_stride]; float* v1 = (float*)&vertices[edge.m_i1*_stride];
verticesSide[vsideI++] = VertexData(v0, 0.0f, k); verticesSide[vsideI++] = VertexData(v0, 0.0f, kk);
verticesSide[vsideI++] = VertexData(v0, 1.0f, k); verticesSide[vsideI++] = VertexData(v0, 1.0f, kk);
verticesSide[vsideI++] = VertexData(v1, 0.0f, k); verticesSide[vsideI++] = VertexData(v1, 0.0f, kk);
verticesSide[vsideI++] = VertexData(v1, 1.0f, k); verticesSide[vsideI++] = VertexData(v1, 1.0f, kk);
k = _textureAsStencil ? 1 : k; kk = _textureAsStencil ? 1 : kk;
uint16_t winding = uint16_t(k > 0); uint16_t winding = uint16_t(kk > 0);
for (uint8_t ii = 0, end = abs(k); ii < end; ++ii) for (uint8_t jj = 0, end = abs(kk); jj < end; ++jj)
{ {
indicesSide[sideI++] = indexSide; indicesSide[sideI++] = indexSide;
indicesSide[sideI++] = indexSide + 2 - winding; indicesSide[sideI++] = indexSide + 2 - winding;
@ -1635,6 +1637,7 @@ void shadowVolumeCreate(ShadowVolume& _shadowVolume
indexSide += 4; indexSide += 4;
} }
} }
}
if (cap) if (cap)
{ {
@ -1643,10 +1646,10 @@ void shadowVolumeCreate(ShadowVolume& _shadowVolume
{ {
const Face& face = *iter; const Face& face = *iter;
float f = vec3Dot(face.m_plane, _light) + face.m_plane[3]; float f = bx::vec3Dot(face.m_plane, _light) + face.m_plane[3];
bool frontFacing = (f > 0.0f); bool frontFacing = (f > 0.0f);
for (uint8_t ii = 0, end = 1 + uint8_t(!_textureAsStencil); ii < end; ++ii) for (uint8_t ii = 0, num = 1 + uint8_t(!_textureAsStencil); ii < num; ++ii)
{ {
if (frontFacing) if (frontFacing)
{ {
@ -2791,15 +2794,15 @@ int _main_(int /*_argc*/, char** /*_argv*/)
viewId += uint8_t(settings_useStencilTexture); viewId += uint8_t(settings_useStencilTexture);
// Draw shadow casters. // Draw shadow casters.
for (uint8_t ii = 0; ii < shadowCastersCount[currentScene]; ++ii) for (uint8_t jj = 0; jj < shadowCastersCount[currentScene]; ++jj)
{ {
shadowCasters[currentScene][ii].submit(viewId, drawDiffuse); shadowCasters[currentScene][jj].submit(viewId, drawDiffuse);
} }
// Draw shadow receivers. // Draw shadow receivers.
for (uint8_t ii = 0; ii < shadowReceiversCount[currentScene]; ++ii) for (uint8_t jj = 0; jj < shadowReceiversCount[currentScene]; ++jj)
{ {
shadowReceivers[currentScene][ii].submit(viewId, drawDiffuse); shadowReceivers[currentScene][jj].submit(viewId, drawDiffuse);
} }
} }