update for geode v5

Author: TheSillyDoggo

changelog.md

@@ -4,6 +4,7 @@
 - Added Version Info texts into the main UI
 - Added option to change shortcut icon colour
 - Fixed being able to complete levels when playing from a startpos with auto safe mode disabled
+- Improved Blur BG Performance and switched to using Blur API
 
 # 2.5.3
 

include/BlurAPI.hpp

@@ -0,0 +1,51 @@
+#pragma once
+
+#include <Geode/Geode.hpp>
+
+#define BLUR_TAG "thesillydoggo.blur_api/blur-options"
+
+namespace BlurAPI
+{
+    class BlurOptions : public cocos2d::CCObject
+    {
+        public:
+            int apiVersion = 1; // dont change
+            cocos2d::CCRenderTexture* rTex = nullptr;
+            geode::Ref<cocos2d::CCClippingNode> clip = nullptr;
+            bool forcePasses = false;
+            int passes = 3;
+            float alphaThreshold = 0.01f;
+
+            virtual bool init() { return true; }
+            CREATE_FUNC(BlurOptions);
+    };
+
+    inline BlurOptions* getOptions(cocos2d::CCNode* node)
+    {
+        return static_cast<BlurOptions*>(node->getUserObject(BLUR_TAG));
+    }
+
+    inline void addBlur(cocos2d::CCNode* node)
+    {
+        if (getOptions(node))
+            return;
+
+        node->setUserObject(BLUR_TAG, BlurOptions::create());
+    }
+
+    inline void removeBlur(cocos2d::CCNode* node)
+    {
+        node->setUserObject(BLUR_TAG, nullptr);
+    }
+
+    inline bool isBlurAPIEnabled()
+    {
+        if (auto blur = geode::Loader::get()->getLoadedMod("thesillydoggo.blur_api"))
+        {
+            if (blur->getSettingValue<bool>("enabled"))
+                return true;
+        }
+
+        return false;
+    }
+};

resources/translations

@@ -4,7 +4,6 @@
 #include "../GUI/Modules/SeperateColourCheatNames.hpp"
 #include "../Utils/ColourUtils.hpp"
 #include "../GUI/EditKeyConfigUI.hpp"
-#include "../GUI/BlurLayer.hpp"
 #include "../GUI/BetterAlertLayer.hpp"
 #include "../GUI/SetupShortcutUI.hpp"
 
@@ -207,7 +206,6 @@ void ModuleNode::onChangeShortcut(CCObject* sender)
 void ModuleNode::onInfo(CCObject* sender)
 {
     auto alert = BetterAlertLayer::createWithLocalisation(fmt::format("names/{}", getID()).c_str(), fmt::format("descriptions/{}", getID()), "ui/ok-button");
-    alert->addChild(CCBlurLayer::create(), -3);
     alert->setUserData(module);
     alert->show();
 
@@ -216,7 +214,7 @@ void ModuleNode::onInfo(CCObject* sender)
     menu->setPosition(ccp(0, 25));
 
     auto btn = CCMenuItemToggler::create(CCSprite::create("favourites.png"_spr), CCSprite::create("favourites.png"_spr), alert, menu_selector(ModuleNode::onInfoToggleFavourite));
-    btn->setPositionX(-alert->m_mainLayer->getChildByType<CCScale9Sprite>(0)->getContentWidth() / 2 + 25);
+    btn->setPositionX(25);
     btn->toggle(module->isFavourited());
 
     btn->setContentSize(btn->getContentSize() * 3);

src/Client/ModuleNode.cpp

@@ -18,8 +18,6 @@ CustomRewardSetupUI* CustomRewardSetupUI::create()
 
 bool CustomRewardSetupUI::setup()
 {
-    this->addChild(CCBlurLayer::create(), -3);
-
     m_bgSprite->setVisible(false);
     bg = BackgroundSprite::create();
     bg->setContentSize(this->m_size);

src/CustomRewards/UI/CustomRewardSetupUI.cpp

@@ -2,13 +2,13 @@
 
 #include <Geode/Geode.hpp>
 #include "../../GUI/BackgroundSprite.hpp"
-#include "../../GUI/BlurLayer.hpp"
 #include "../../GUI/BetterButtonSprite.hpp"
 #include "../../Utils/AdvancedLabel/AdvLabelBMFont.hpp"
+#include "../../GUI/PopupBase.hpp"
 
 using namespace geode::prelude;
 
-class CustomRewardSetupUI : public geode::Popup<>
+class CustomRewardSetupUI : public PopupBase
 {
     protected:
         BackgroundSprite* bg;

src/CustomRewards/UI/CustomRewardSetupUI.hpp

@@ -9,13 +9,14 @@
 #include "../Utils/RealtimeAction.hpp"
 #include "../Localisation/LocalisationManager.hpp"
 #include "BetterInputNode.hpp"
-#include "BlurLayer.hpp"
+
 #include "FloatingButton/FloatingUIManager.hpp"
 #include "EasyBG.hpp"
+#include <BlurAPI.hpp>
 
 bool AndroidUI::setup()
 {
-    this->addChild(CCBlurLayer::create(), -3);
+    instance = this;
     this->scheduleUpdate();
 
     rt = CCRenderTexture::create(getContentWidth(), getContentHeight());
@@ -128,7 +129,6 @@ void AndroidUI::populateTabs()
     tabsMenu->setAnchorPoint(ccp(0, 0.5f));
     tabsMenu->ignoreAnchorPointForPosition(false);
     tabsMenu->setLayout(ColumnLayout::create()->setAxisReverse(true)->setAxisAlignment(AxisAlignment::End)->setCrossAxisOverflow(true)->setAutoScale(false)->setGap(2.5f));
-    tabsMenu->getLayout()->ignoreInvisibleChildren(true);
 
     m_mainLayer->addChildAtPosition(bg, Anchor::Left, ccp(10, 0));
     m_mainLayer->addChildAtPosition(tabsMenu, Anchor::Left, ccp(10 + 2.5f, 0));
@@ -251,7 +251,6 @@ AndroidUI* AndroidUI::create()
     if (pRet && pRet->initAnchored(475.f, 280.f))
     {
         PlatformToolbox::showCursor();
-        instance = pRet;
         pRet->m_noElasticity = true;
 
         pRet->autorelease();
@@ -307,7 +306,7 @@ void AndroidUI::runAnimation(MenuAnimation anim)
     bottomRight->setOpacity(150);
     this->setOpacity(150);
 
-    if (BlurMenuBG::get()->getRealEnabled() && anim == MenuAnimation::FadeIn)
+    if (/*BlurMenuBG::get()->getRealEnabled() && BlurAPI::isBlurAPIEnabled() && */anim == MenuAnimation::FadeIn)
         anim = MenuAnimation::None;
 
     switch (anim)
@@ -400,7 +399,7 @@ void AndroidUI::close()
 
 void AndroidUI::keyDown(cocos2d::enumKeyCodes key, double timestamp)
 {
-    geode::Popup<>::keyDown(key, 0);
+    PopupBase::keyDown(key, 0);
 
     auto old = selectedCategory;
 
@@ -437,13 +436,13 @@ void AndroidUI::visit()
     // for an animation i was making, but i couldnt get clipping to work right
 
     if (drawOpacity->getOpacity() == 255)
-        return geode::Popup<>::visit();
+        return PopupBase::visit();
 
     auto op = getOpacity();
     this->setOpacity(0);
 
     rt->beginWithClear(0, 0, 0, op / 255.0f);
-    geode::Popup<>::visit();
+    PopupBase::visit();
     rt->end();
 
     this->setOpacity(op);

src/GUI/AndroidUI.cpp

@@ -8,6 +8,7 @@
 #include "CategoryTabSprite.hpp"
 #include "../Utils/AdvancedLabel/AdvLabelBMFont.hpp"
 #include "VersionInfoNode.hpp"
+#include "PopupBase.hpp"
 
 using namespace geode::prelude;
 
@@ -22,7 +23,7 @@ enum class MenuAnimation
     FadeIn
 };
 
-class AndroidUI : public geode::Popup<>
+class AndroidUI : public PopupBase
 {
     protected:
         friend class ThemeNode;

src/GUI/AndroidUI.hpp

@@ -1,7 +1,6 @@
 #include "BetterAlertLayer.hpp"
 #include "../Localisation/LocalisationManager.hpp"
 #include "BetterButtonSprite.hpp"
-#include "BlurLayer.hpp"
 #include "EasyBG.hpp"
 
 BetterAlertLayer* BetterAlertLayer::create(FLAlertLayerProtocol* delegate, char const* title, gd::string desc, char const* btn1, char const* btn2, float width, bool scroll, float height, float textScale)
@@ -18,7 +17,7 @@ BetterAlertLayer* BetterAlertLayer::create(FLAlertLayerProtocol* delegate, char
     pRet->height = height;
     pRet->textScale = textScale;
 
-    if (pRet && pRet->initAnchored(0, 0))
+    if (pRet && pRet->init(0, 0))
     {
         pRet->autorelease();
         return pRet;
@@ -52,8 +51,6 @@ BetterAlertLayer* BetterAlertLayer::createWithLocalisation(char const* title, co
 
 bool BetterAlertLayer::setup()
 {
-    this->addChild(CCBlurLayer::create(), -69);
-
     m_bgSprite->setVisible(false);
     m_buttonMenu->setVisible(false);
 

src/GUI/BetterAlertLayer.cpp

@@ -2,10 +2,11 @@
 
 #include <Geode/Geode.hpp>
 #include "../Utils/AdvancedLabel/AdvLabelBMFont.hpp"
+#include "PopupBase.hpp"
 
 using namespace geode::prelude;
 
-class BetterAlertLayer : public geode::Popup<>
+class BetterAlertLayer : public PopupBase
 {
     protected:
         CCScale9Sprite* bg = nullptr;