From f7061b1a495b18e0d8ecd6aab3d53508522ad86c Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Mon, 7 Feb 2022 04:28:19 -0800 Subject: [PATCH] Remove boo classes from CAuiImagePane --- Runtime/GuiSys/CAuiImagePane.cpp | 11 ----------- Runtime/GuiSys/CAuiImagePane.hpp | 9 --------- 2 files changed, 20 deletions(-) diff --git a/Runtime/GuiSys/CAuiImagePane.cpp b/Runtime/GuiSys/CAuiImagePane.cpp index be36be40c..8a246b1d4 100644 --- a/Runtime/GuiSys/CAuiImagePane.cpp +++ b/Runtime/GuiSys/CAuiImagePane.cpp @@ -51,13 +51,6 @@ void CAuiImagePane::Update(float dt) { CGuiWidget::Update(dt); } -CAuiImagePane::Filters::Filters(TLockedToken& 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, EFilterType filter) const { 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); 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; color.a() *= params.x0_alphaMod; // SetZUpdate(xac_drawFlags == EGuiModelDrawFlags::Shadeless || xac_drawFlags == EGuiModelDrawFlags::Opaque); diff --git a/Runtime/GuiSys/CAuiImagePane.hpp b/Runtime/GuiSys/CAuiImagePane.hpp index 27ea2d1d8..0b884e538 100644 --- a/Runtime/GuiSys/CAuiImagePane.hpp +++ b/Runtime/GuiSys/CAuiImagePane.hpp @@ -32,15 +32,6 @@ class CAuiImagePane : public CGuiWidget { float x148_fadeDuration = 0.f; float x14c_deResFactor = 0.f; float x150_flashFactor = 0.f; - struct Filters { - CAssetId m_texId; - CTexturedQuadFilterAlpha m_darkenerQuad; - std::array m_flashQuad; - std::array m_alphaQuad; - std::array m_addQuad; - explicit Filters(TLockedToken& tex); - }; - std::optional m_filters; void DoDrawImagePane(const zeus::CColor& color, const CTexture& tex, int frame, float blurAmt, bool noBlur, EFilterType filter) const;