AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 17:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Graphics/Shaders: Use std::array where applicable

Browse Source 
Makes the arrays strongly typed and impervious to array->pointer decay.
This also allows simplifying some operations (such as being able to call
fill() instead of needing to use std::fill, etc).
This commit is contained in:
Lioncash
2019-09-28 22:22:12 -04:00
parent 417506572c
commit 136a229a1a
36 changed files with 530 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/World/CFluidPlaneGPU.cpp
View File

@@ -52,19 +52,19 @@ void CFluidPlaneGPU::RenderStripWithRipples(float curY, const CFluidPlaneRender:
break;
}
std::fill(std::begin(pv.m_outerLevels), std::end(pv.m_outerLevels), subdivF);
std::fill(std::begin(pv.m_innerLevels), std::end(pv.m_innerLevels), subdivF);
pv.m_outerLevels.fill(subdivF);
pv.m_innerLevels.fill(subdivF);
} else {
bool r19 = (flags[yTile + 1][xTile] & 0x2) != 0; // North
bool r16 = (flags[yTile][xTile - 1] & 0x8) != 0; // West
bool r18 = (flags[yTile][xTile + 1] & 0x4) != 0; // East
bool r17 = (flags[yTile - 1][xTile] & 0x1) != 0; // South
const bool r19 = (flags[yTile + 1][xTile] & 0x2) != 0; // North
const bool r16 = (flags[yTile][xTile - 1] & 0x8) != 0; // West
const bool r18 = (flags[yTile][xTile + 1] & 0x4) != 0; // East
const bool r17 = (flags[yTile - 1][xTile] & 0x1) != 0; // South
pv.m_outerLevels[0] = r16 ? subdivF : 1.f;
pv.m_outerLevels[1] = r17 ? subdivF : 1.f;
pv.m_outerLevels[2] = r18 ? subdivF : 1.f;
pv.m_outerLevels[3] = r19 ? subdivF : 1.f;
std::fill(std::begin(pv.m_innerLevels), std::end(pv.m_innerLevels), subdivF);
pv.m_innerLevels.fill(subdivF);
}
float curTileY = yMin;