2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 18:17:02 +00:00

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

View File

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