Merge pull request #69 from HJfod/dumdum

Alpha 10
HJfod · Oct 19, 2023 · 2a45949 · 2a45949
2 parents d1e8799 + 91e7125
commit 2a45949
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,6 +13,7 @@ file(GLOB SOURCES
 	src/features/BetterScaling/*.cpp
 	src/features/StartPosSwitcher/*.cpp
 	src/features/OffsetNextFree/*.cpp
+	src/features/RGBColorInput/*.cpp
 	src/features/*.cpp
 	src/other/*.cpp
 	src/*.cpp
@@ -34,6 +35,7 @@ add_subdirectory($ENV{GEODE_SDK} $ENV{GEODE_SDK}/build)
 
 setup_geode_mod(${PROJECT_NAME} EXTERNALS be_team.editorapi:1.0.0)
 
+
 # Build EditorAPI alongside BetterEdit
 add_subdirectory(api)
 target_link_libraries(${PROJECT_NAME} EditorAPI)

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+# v5.0.0-alpha.10
+
+ - Fix a crash that could happen when entering the editor
+ - Correctly enable RGB Color Input
+
 # v5.0.0-alpha.9
 
  - Fix preview mode screwing up moving objects on playtest pause

diff --git a/mod.json b/mod.json
@@ -1,6 +1,6 @@
 {
 	"geode": "1.3.4",
-	"version": "v5.0.0-alpha.9",
+	"version": "v5.0.0-alpha.10",
 	"id": "be_team.betteredit",
 	"name": "BetterEdit",
 	"developer": "BE Team",
@@ -54,7 +54,7 @@
 		"rgb-color-input": {
 			"type": "bool",
 			"default": true,
-			"name": "RGB + HEX Color Input",
+			"name": "RGB Color Input",
 			"description": "Adds a widget that allows RGB and HEX input in color edit, color trigger and pulse trigger"
 		},
 		"editor-pulse": {

diff --git a/src/features/RGBColorInput/RGBColorInput.cpp b/src/features/RGBColorInput/RGBColorInput.cpp
@@ -102,13 +102,14 @@ class $modify(SetupPulsePopup) {
         }
     }
 
-    void updatePulseMode() {
-        SetupPulsePopup::updatePulseMode();
+    void onSelectPulseMode(CCObject* sender) {
+        SetupPulsePopup::onSelectPulseMode(sender);
         if (!Mod::get()->getSettingValue<bool>("rgb-color-input")) {
             return;
         }
         if (m_fields->rgbWidget) {
             m_fields->rgbWidget->setVisible(m_pulseMode == 0);
+            m_fields->rgbWidget->updateLabels(true, true);
         }
     }
-};
+};
diff --git a/src/features/StartPosSwitcher/StartPosSwitcher.cpp b/src/features/StartPosSwitcher/StartPosSwitcher.cpp
@@ -63,9 +63,11 @@ class $modify(StartPosSwitchLayer, LevelEditorLayer) {
             return false;
         }
         StartPosManager::get()->setStartPositions(m_objects);
-        auto bar = static_cast<StartPosButtonBar*>(m_editorUI->getChildByID("start-pos-button-bar"_spr));
-        if (bar) {
-            bar->setStartPosCounters();
+        if (m_editorUI && m_editorUI->getChildren()) {
+            auto bar = static_cast<StartPosButtonBar*>(m_editorUI->getChildByID("start-pos-button-bar"_spr));
+            if (bar) {
+                bar->setStartPosCounters();
+            }
         }
 
         return true;
@@ -74,9 +76,11 @@ class $modify(StartPosSwitchLayer, LevelEditorLayer) {
         LevelEditorLayer::addSpecial(obj);
         if (!m_editorInitialising && obj->m_objectID == 31) {
             StartPosManager::get()->addStartPos(obj->getPosition());
-            auto bar = static_cast<StartPosButtonBar*>(m_editorUI->getChildByID("start-pos-button-bar"_spr));
-            if (bar) {
-                bar->setStartPosCounters();
+            if (m_editorUI && m_editorUI->getChildren()) {
+                auto bar = static_cast<StartPosButtonBar*>(m_editorUI->getChildByID("start-pos-button-bar"_spr));
+                if (bar) {
+                    bar->setStartPosCounters();
+                }
             }
         }
     }
@@ -96,8 +100,10 @@ class $modify(StartPosSwitchLayer, LevelEditorLayer) {
                 manager->clear();
             }
             manager->setStartPositions(m_objects);
-            auto buttonBar = static_cast<StartPosButtonBar*>(m_editorUI->getChildByID("start-pos-button-bar"_spr));
-            buttonBar->setStartPosCounters();
+            if (m_editorUI && m_editorUI->getChildren()) {
+                auto buttonBar = static_cast<StartPosButtonBar*>(m_editorUI->getChildByID("start-pos-button-bar"_spr));
+                buttonBar->setStartPosCounters();
+            }
         }
     }
 
@@ -108,6 +114,9 @@ class $modify(StartPosSwitchLayer, LevelEditorLayer) {
 
     void setupLevelStart(LevelSettingsObject* obj) {
         StartPosManager::get()->setStartPositions(m_objects);
+        if (!m_editorInitialising) {
+            return;
+        }
         if (StartPosManager::get()->isLevelStart()) {
             this->setStartPosObject(nullptr);
             m_player1->setStartPos(CCPointZero);
@@ -122,9 +131,11 @@ class $modify(StartPosSwitchLayer, LevelEditorLayer) {
         if (!startPos) {
             Notification::create("Couldn't setup Start Position switcher.", CCSprite::createWithSpriteFrameName("edit_delBtnSmall_001.png"))->show();
             StartPosManager::get()->setDefault();
-            auto bar = static_cast<StartPosButtonBar*>(m_editorUI->getChildByID("start-pos-button-bar"_spr));
-            if (bar) {
-                bar->setStartPosCounters();
+            if (m_editorUI && m_editorUI->getChildren()) {
+                auto bar = static_cast<StartPosButtonBar*>(m_editorUI->getChildByID("start-pos-button-bar"_spr));
+                if (bar) {
+                    bar->setStartPosCounters();
+                }
             }
             LevelEditorLayer::setupLevelStart(obj);
             return;
@@ -288,9 +299,12 @@ class $modify(GameObject) {
                 LevelEditorLayer::get(),
                 static_cast<StartPosObject*>(as<GameObject*>(this)),
                 [this]() {
-                    auto buttonBar = static_cast<StartPosButtonBar*>(LevelEditorLayer::get()->m_editorUI->getChildByID("start-pos-button-bar"_spr));
-                    if (buttonBar) {
-                        buttonBar->setStartPosCounters();
+                    auto editorUI = LevelEditorLayer::get()->m_editorUI;
+                    if (editorUI && editorUI->getChildren()) {
+                        auto buttonBar = static_cast<StartPosButtonBar*>(LevelEditorLayer::get()->m_editorUI->getChildByID("start-pos-button-bar"_spr));
+                        if (buttonBar) {
+                            buttonBar->setStartPosCounters();
+                        }
                     }
                 }
             );