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

Remove boo classes from CAuiImagePane

This commit is contained in:
Phillip Stephens 2022-02-07 04:28:19 -08:00
parent b8e60eac1b
commit f7061b1a49
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/GuiSys/CAuiImagePane.cpp
View File

@ -51,13 +51,6 @@ void CAuiImagePane::Update(float dt) {
CGuiWidget::Update(dt); CGuiWidget::Update(dt);
} }
CAuiImagePane::Filters::Filters(TLockedToken<CTexture>& tex)
: m_texId(tex.GetObjectTag()->id)
, m_darkenerQuad(EFilterType::Blend, tex)
, m_flashQuad{{CTexturedQuadFilterAlpha{EFilterType::Add, tex}, CTexturedQuadFilterAlpha{EFilterType::Add, tex}}}
, m_alphaQuad{{CTexturedQuadFilterAlpha{EFilterType::Blend, tex}, CTexturedQuadFilterAlpha{EFilterType::Blend, tex}}}
, m_addQuad{{CTexturedQuadFilterAlpha{EFilterType::Add, tex}, CTexturedQuadFilterAlpha{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,
EFilterType filter) const { EFilterType filter) const {
zeus::CColor useColor = color; zeus::CColor useColor = color;
@ -121,10 +114,6 @@ void CAuiImagePane::Draw(const CGuiWidgetDrawParms& params) {
} }
SCOPED_GRAPHICS_DEBUG_GROUP(fmt::format(FMT_STRING("CAuiImagePane::Draw {}"), m_name).c_str(), zeus::skCyan); SCOPED_GRAPHICS_DEBUG_GROUP(fmt::format(FMT_STRING("CAuiImagePane::Draw {}"), m_name).c_str(), zeus::skCyan);
GetIsFinishedLoadingWidgetSpecific(); GetIsFinishedLoadingWidgetSpecific();
if (!m_filters || m_filters->m_texId != xb8_tex0Tok.GetObjectTag()->id) {
m_filters.emplace(xb8_tex0Tok);
}
Filters& filters = *m_filters;
zeus::CColor color = xa8_color2; zeus::CColor color = xa8_color2;
color.a() *= params.x0_alphaMod; color.a() *= params.x0_alphaMod;
// SetZUpdate(xac_drawFlags == EGuiModelDrawFlags::Shadeless || xac_drawFlags == EGuiModelDrawFlags::Opaque); // SetZUpdate(xac_drawFlags == EGuiModelDrawFlags::Shadeless || xac_drawFlags == EGuiModelDrawFlags::Opaque);

9
Runtime/GuiSys/CAuiImagePane.hpp
View File

@ -32,15 +32,6 @@ class CAuiImagePane : public CGuiWidget {
float x148_fadeDuration = 0.f; float x148_fadeDuration = 0.f;
float x14c_deResFactor = 0.f; float x14c_deResFactor = 0.f;
float x150_flashFactor = 0.f; float x150_flashFactor = 0.f;
struct Filters {
CAssetId m_texId;
CTexturedQuadFilterAlpha m_darkenerQuad;
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, void DoDrawImagePane(const zeus::CColor& color, const CTexture& tex, int frame, float blurAmt, bool noBlur,
EFilterType filter) const; EFilterType filter) const;