AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CAuiImagePane: Make use of std::array where applicable 

Same behavior, stronger typing.
This commit is contained in:
Lioncash 2020-03-17 21:18:52 -04:00
parent 6ddbd15cfc
commit 15e4d4aa01
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Runtime/GuiSys/CAuiImagePane.cpp
View File

@ -54,9 +54,9 @@ void CAuiImagePane::Update(float dt) {
CAuiImagePane::Filters::Filters(TLockedToken<CTexture>& tex) CAuiImagePane::Filters::Filters(TLockedToken<CTexture>& tex)
: m_texId(tex.GetObjectTag()->id) : m_texId(tex.GetObjectTag()->id)
, m_darkenerQuad(EFilterType::Blend, tex) , m_darkenerQuad(EFilterType::Blend, tex)
, m_flashQuad{{EFilterType::Add, tex}, {EFilterType::Add, tex}} , m_flashQuad{{{EFilterType::Add, tex}, {EFilterType::Add, tex}}}
, m_alphaQuad{{EFilterType::Blend, tex}, {EFilterType::Blend, tex}} , m_alphaQuad{{{EFilterType::Blend, tex}, {EFilterType::Blend, tex}}}
, m_addQuad{{EFilterType::Add, tex}, {EFilterType::Add, tex}} {} , m_addQuad{{{EFilterType::Add, tex}, {EFilterType::Add, tex}}} {}
void CAuiImagePane::DoDrawImagePane(const zeus::CColor& color, const CTexture& tex, int frame, float alpha, bool noBlur, void CAuiImagePane::DoDrawImagePane(const zeus::CColor& color, const CTexture& tex, int frame, float alpha, bool noBlur,
CTexturedQuadFilterAlpha& quad) const { CTexturedQuadFilterAlpha& quad) const {
@ -66,13 +66,13 @@ void CAuiImagePane::DoDrawImagePane(const zeus::CColor& color, const CTexture& t
rstl::reserved_vector<zeus::CVector2f, 4> vec; rstl::reserved_vector<zeus::CVector2f, 4> vec;
const rstl::reserved_vector<zeus::CVector2f, 4>* useUVs; const rstl::reserved_vector<zeus::CVector2f, 4>* useUVs;
if (x138_tileSize != zeus::skZero2f) { if (x138_tileSize != zeus::skZero2f) {
zeus::CVector2f res(xb8_tex0Tok->GetWidth(), xb8_tex0Tok->GetHeight()); const zeus::CVector2f res(xb8_tex0Tok->GetWidth(), xb8_tex0Tok->GetHeight());
zeus::CVector2f tmp = res / x138_tileSize; const zeus::CVector2f tmp = res / x138_tileSize;
zeus::CVector2f tmpRecip = x138_tileSize / res; const zeus::CVector2f tmpRecip = x138_tileSize / res;
float x0 = tmpRecip.x() * (frame % int(tmp.x())); const float x0 = tmpRecip.x() * (frame % int(tmp.x()));
float x1 = x0 + tmpRecip.x(); const float x1 = x0 + tmpRecip.x();
float y0 = tmpRecip.y() * (frame % int(tmp.y())); const float y0 = tmpRecip.y() * (frame % int(tmp.y()));
float y1 = y0 + tmpRecip.y(); const float y1 = y0 + tmpRecip.y();
vec.push_back(zeus::CVector2f(x0, y0)); vec.push_back(zeus::CVector2f(x0, y0));
vec.push_back(zeus::CVector2f(x0, y1)); vec.push_back(zeus::CVector2f(x0, y1));
vec.push_back(zeus::CVector2f(x1, y0)); vec.push_back(zeus::CVector2f(x1, y0));
@ -82,20 +82,22 @@ void CAuiImagePane::DoDrawImagePane(const zeus::CColor& color, const CTexture& t
useUVs = &x114_uvs; useUVs = &x114_uvs;
} }
CTexturedQuadFilter::Vert verts[] = {{xe0_coords[0], (*useUVs)[0] + xd0_uvBias0}, const std::array<CTexturedQuadFilter::Vert, 4> verts{{
{xe0_coords[0], (*useUVs)[0] + xd0_uvBias0},
{xe0_coords[1], (*useUVs)[1] + xd0_uvBias0}, {xe0_coords[1], (*useUVs)[1] + xd0_uvBias0},
{xe0_coords[3], (*useUVs)[3] + xd0_uvBias0}, {xe0_coords[3], (*useUVs)[3] + xd0_uvBias0},
{xe0_coords[2], (*useUVs)[2] + xd0_uvBias0}}; {xe0_coords[2], (*useUVs)[2] + xd0_uvBias0},
}};
if (noBlur) { if (noBlur) {
quad.drawVerts(useColor, verts); quad.drawVerts(useColor, verts.data());
} else if ((x14c_deResFactor == 0.f && alpha == 1.f) || tex.GetNumMips() == 1) { } else if ((x14c_deResFactor == 0.f && alpha == 1.f) || tex.GetNumMips() == 1) {
quad.drawVerts(useColor, verts, 0.f); quad.drawVerts(useColor, verts.data(), 0.f);
} else { } else {
float tmp = (1.f - x14c_deResFactor) * alpha; const float tmp = (1.f - x14c_deResFactor) * alpha;
float tmp3 = 1.f - tmp * tmp * tmp; const float tmp3 = 1.f - tmp * tmp * tmp;
float mip = tmp3 * (tex.GetNumMips() - 1); const float mip = tmp3 * (tex.GetNumMips() - 1);
quad.drawVerts(useColor, verts, mip); quad.drawVerts(useColor, verts.data(), mip);
} }
} }

10
Runtime/GuiSys/CAuiImagePane.hpp
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include <array>
#include "Runtime/CToken.hpp" #include "Runtime/CToken.hpp"
#include "Runtime/rstl.hpp" #include "Runtime/rstl.hpp"
#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp" #include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
@ -33,10 +35,10 @@ class CAuiImagePane : public CGuiWidget {
struct Filters { struct Filters {
CAssetId m_texId; CAssetId m_texId;
CTexturedQuadFilterAlpha m_darkenerQuad; CTexturedQuadFilterAlpha m_darkenerQuad;
CTexturedQuadFilterAlpha m_flashQuad[2]; std::array<CTexturedQuadFilterAlpha, 2> m_flashQuad;
CTexturedQuadFilterAlpha m_alphaQuad[2]; std::array<CTexturedQuadFilterAlpha, 2> m_alphaQuad;
CTexturedQuadFilterAlpha m_addQuad[2]; std::array<CTexturedQuadFilterAlpha, 2> m_addQuad;
Filters(TLockedToken<CTexture>& tex); explicit Filters(TLockedToken<CTexture>& tex);
}; };
std::optional<Filters> m_filters; std::optional<Filters> m_filters;
void DoDrawImagePane(const zeus::CColor& color, const CTexture& tex, int frame, float blurAmt, bool noBlur, void DoDrawImagePane(const zeus::CColor& color, const CTexture& tex, int frame, float blurAmt, bool noBlur,