Merge branch 'main' of https://github.com/geode-sdk/DevTools

altalk23 · altalk23 · commit 925c278c77c9 · 2024-01-20T22:27:04.000+03:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,8 +15,16 @@ jobs:
         - name: Windows
           os: windows-latest
           
-        - name: macOS
-          os: macos-latest
+        #- name: macOS
+        #  os: macos-latest
+
+        - name: Android32
+          os: ubuntu-latest
+          target: Android32
+
+        - name: Android64
+          os: ubuntu-latest
+          target: Android64
 
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
@@ -27,7 +35,9 @@ jobs:
       - name: Build the mod
         uses: geode-sdk/build-geode-mod@main
         with:
+          sdk: nightly
           combine: true
+          target: ${{ matrix.config.target }}
       
   package:
     name: Package builds
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,5 @@ Source/Geode/pkg/uber-apk-signer.jar
 imgui/**
 imgui
 
-**/.DS_Store
+**/.DS_Store
+.cache/
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Browser-like developer tools for Geode.
 
-Press `F11` to open up the dev tools.
+Press `F11` (`F10` for MacOS) to open up the dev tools.
 
 ## Features
 
diff --git a/mod.json b/mod.json
@@ -1,6 +1,7 @@
 {
-	"geode": "v1.0.0",
-	"version": "v1.2.2",
+	"geode": "v2.0.0",
+	"version": "v1.4.0",
+	"gd": "*",
 	"id": "geode.devtools",
 	"name": "DevTools",
 	"developer": "Geode Team",
diff --git a/src/DevTools.cpp b/src/DevTools.cpp
@@ -24,6 +24,14 @@ bool DevTools::pausedGame() const {
     return m_pauseGame;
 }
 
+bool DevTools::isSetup() const {
+    return m_setup;
+}
+
+bool DevTools::shouldOrderChildren() const {
+    return m_orderChildren;
+}
+
 CCNode* DevTools::getSelectedNode() const {
     return m_selectedNode;
 }
@@ -178,6 +186,11 @@ void DevTools::setup() {
         
     this->setupFonts();
     this->setupPlatform();
+
+#ifdef GEODE_IS_MOBILE
+    ImGui::GetIO().FontGlobalScale = 3.f;
+    ImGui::GetStyle().ScrollbarSize = 60.f;
+#endif
 }
 
 void DevTools::show(bool visible) {
diff --git a/src/DevTools.hpp b/src/DevTools.hpp
@@ -31,6 +31,7 @@ class DevTools {
     bool m_showModGraph = false;
     bool m_showModIndex = false;
     bool m_pauseGame = false;
+    bool m_orderChildren = true;
     std::string m_theme = DARK_THEME;
     ImGuiID m_dockspaceID;
     ImFont* m_defaultFont  = nullptr;
@@ -71,6 +72,8 @@ class DevTools {
 
     bool shouldPopGame() const;
     bool pausedGame() const;
+    bool isSetup() const;
+    bool shouldOrderChildren() const;
 
     CCNode* getSelectedNode() const;
     void selectNode(CCNode* node);
diff --git a/src/backend.cpp b/src/backend.cpp
@@ -49,8 +49,10 @@ void DevTools::newFrame() {
     );
     io.DeltaTime = director->getDeltaTime();
 
+#ifdef GEODE_IS_DESKTOP
     const auto mousePos = toVec2(geode::cocos::getMousePos());
     io.AddMousePosEvent(mousePos.x, mousePos.y);
+#endif
 
     // TODO: text input
 
@@ -141,6 +143,8 @@ static float SCROLL_SENSITIVITY = 10;
 
 class $modify(CCMouseDispatcher) {
     bool dispatchScrollMSG(float y, float x) {
+        if(!DevTools::get()->isSetup()) return true;
+
         auto& io = ImGui::GetIO();
         io.AddMouseWheelEvent(x / SCROLL_SENSITIVITY, -y / SCROLL_SENSITIVITY);
 
@@ -212,10 +216,10 @@ class $modify(CCTouchDispatcher) {
 };
 
 class $modify(CCIMEDispatcher) {
-    void dispatchInsertText(const char* text, int len) {
+    void dispatchInsertText(const char* text, int len, enumKeyCodes key) {
         auto& io = ImGui::GetIO();
         if (!io.WantCaptureKeyboard) {
-            CCIMEDispatcher::dispatchInsertText(text, len);
+            CCIMEDispatcher::dispatchInsertText(text, len, key);
         }
         std::string str(text, len);
         io.AddInputCharactersUTF8(str.c_str());
diff --git a/src/main.cpp b/src/main.cpp
@@ -4,23 +4,43 @@
 #include <Geode/modify/AchievementNotifier.hpp>
 #include <Geode/modify/CCDirector.hpp>
 #include <Geode/modify/CCEGLView.hpp>
+#include <Geode/modify/CCNode.hpp>
 #include "DevTools.hpp"
 #include <imgui.h>
 #include "ImGui.hpp"
 
 using namespace geode::prelude;
 
+class $modify(CCNode) {
+    void sortAllChildren() override {
+        if (DevTools::get()->shouldOrderChildren()) {
+            CCNode::sortAllChildren();
+        }
+    }
+};
+
 // todo: use shortcuts api once Geode has those
 class $modify(CCKeyboardDispatcher) {
-    bool dispatchKeyboardMSG(enumKeyCodes key, bool down) {
+    bool dispatchKeyboardMSG(enumKeyCodes key, bool down, bool arr) {
         if (down && (key == KEY_F11 GEODE_MACOS(|| key == KEY_F10))) {
             DevTools::get()->toggle();
             return true;
         }
-        return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down);
+        return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down, arr);
     }
 };
 
+#ifdef GEODE_IS_MOBILE
+// lol
+#include <Geode/modify/MenuLayer.hpp>
+class $modify(MenuLayer) {
+    void onMoreGames(CCObject*) {
+        DevTools::get()->toggle();
+    }
+};
+
+#endif
+
 class $modify(AchievementNotifier) {
     void willSwitchToScene(CCScene* scene) {
         AchievementNotifier::willSwitchToScene(scene);
diff --git a/src/pages/Advanced.cpp b/src/pages/Advanced.cpp
@@ -164,8 +164,6 @@ void DevTools::drawModGraphNode(Mod* node) {
     ImColor color = ImColor(1.f, 1.f, 1.f);
     if (node->isUninstalled())
         color = ImColor(0.1f, 0.1f, 0.1f);
-    else if (!node->isLoaded())
-        color = ImColor(1.f, 0.f, 0.f);
     else if (!node->isEnabled())
         color = ImColor(0.7f, 0.7f, 0.7f);
 
@@ -178,10 +176,8 @@ void DevTools::drawModGraphNode(Mod* node) {
 
     node->setMetadata(this->inputMetadata(node, node->getMetadata()));
 
-    ImGui::Text("supportsDisabling: %s", node->supportsDisabling() ? "true" : "false");
+    ImGui::Text("isInternal: %s", node->isInternal() ? "true" : "false");
     ImGui::Text("early: %s", node->needsEarlyLoad() ? "true" : "false");
-    ImGui::Text("canEnable: %s", node->canEnable() ? "true" : "false");
-    ImGui::Text("canDisable: %s", node->canDisable() ? "true" : "false");
     ImGui::Text("hasUnresolvedDependencies: %s", node->hasUnresolvedDependencies() ? "true" : "false");
     ImGui::Text("hasUnresolvedIncompatibilities: %s", node->hasUnresolvedIncompatibilities() ? "true" : "false");
 
diff --git a/src/pages/Attributes.cpp b/src/pages/Attributes.cpp
@@ -35,7 +35,7 @@ void DevTools::drawNodeAttributes(CCNode* node) {
     if (ImGui::Button("Deselect")) {
         return this->selectNode(nullptr);
     }
-    ImGui::Text("Address: 0x%p", node);
+    ImGui::Text("Address: %s", fmt::to_string(fmt::ptr(node)).c_str());
     ImGui::SameLine();
     if (ImGui::Button(U8STR(FEATHER_COPY " Copy"))) {
         clipboard::write(
@@ -48,11 +48,16 @@ void DevTools::drawNodeAttributes(CCNode* node) {
 
     if (auto menuItemNode = typeinfo_cast<CCMenuItem*>(node)) {
         const auto selector = menuItemNode->m_pfnSelector;
-        const auto addr = formatAddressIntoOffset(addresser::getNonVirtual(selector));
-        ImGui::Text("CCMenuItem selector: %s", addr.c_str());
-        ImGui::SameLine();
-        if (ImGui::Button(U8STR(FEATHER_COPY " Copy##copymenuitem"))) {
-            clipboard::write(addr);
+        if (!selector) {
+            std::string addr = "N/A";
+            ImGui::Text("CCMenuItem selector: %s", addr.c_str());
+        } else {
+            const auto addr = formatAddressIntoOffset(addresser::getNonVirtual(selector));
+            ImGui::Text("CCMenuItem selector: %s", addr.c_str());
+            ImGui::SameLine();
+            if (ImGui::Button(U8STR(FEATHER_COPY " Copy##copymenuitem"))) {
+                clipboard::write(addr);
+            }
         }
     }
 
@@ -111,25 +116,51 @@ void DevTools::drawNodeAttributes(CCNode* node) {
         &CCNode::ignoreAnchorPointForPosition
     );
     
-    if (auto rgbaNode = dynamic_cast<CCRGBAProtocol*>(node)) {
+    if (auto rgbaNode = typeinfo_cast<CCRGBAProtocol*>(node)) {
         auto color = rgbaNode->getColor();
         float _color[4] = { color.r / 255.f, color.g / 255.f, color.b / 255.f, rgbaNode->getOpacity() / 255.f };
-        ImGui::ColorEdit4("Color", _color);
-        rgbaNode->setColor({
-            static_cast<GLubyte>(_color[0] * 255),
-            static_cast<GLubyte>(_color[1] * 255),
-            static_cast<GLubyte>(_color[2] * 255)
-        });
-        rgbaNode->setOpacity(static_cast<GLubyte>(_color[3] * 255));
+        if (ImGui::ColorEdit4("Color", _color)) {
+            rgbaNode->setColor({
+                static_cast<GLubyte>(_color[0] * 255),
+                static_cast<GLubyte>(_color[1] * 255),
+                static_cast<GLubyte>(_color[2] * 255)
+            });
+
+            rgbaNode->setOpacity(static_cast<GLubyte>(_color[3] * 255));
+        }
     }
     
-    if (auto labelNode = dynamic_cast<CCLabelProtocol*>(node)) {
+    if (auto labelNode = typeinfo_cast<CCLabelProtocol*>(node)) {
         std::string str = labelNode->getString();
         if (ImGui::InputText("Text", &str, 256)) {
             labelNode->setString(str.c_str());
         }
     }
 
+    if (auto textureProtocol = typeinfo_cast<CCTextureProtocol*>(node)) {
+        if (auto texture = textureProtocol->getTexture()) {
+            auto* cachedTextures = CCTextureCache::sharedTextureCache()->m_pTextures;
+            for (auto [key, obj] : CCDictionaryExt<std::string, CCTexture2D*>(cachedTextures)) {
+                if (obj == texture) {
+                    ImGui::TextWrapped("Texture name: %s", key.c_str());
+                    break;
+                }
+            }
+
+            if (auto spriteNode = typeinfo_cast<CCSprite*>(node)) {
+                auto* cachedFrames = CCSpriteFrameCache::sharedSpriteFrameCache()->m_pSpriteFrames;
+                const auto rect = spriteNode->getTextureRect();
+                for (auto [key, frame] : CCDictionaryExt<std::string, CCSpriteFrame*>(cachedFrames)) {
+                    if (frame->getTexture() == texture && frame->getRect() == rect) {
+                        ImGui::Text("Frame name: %s", key.c_str());
+                        break;
+                    }
+                }
+            }
+
+        }
+    }
+
     ImGui::NewLine();
     ImGui::Separator();
     ImGui::NewLine();
diff --git a/src/pages/GeometryDash.cpp b/src/pages/GeometryDash.cpp
@@ -199,6 +199,15 @@ void DevTools::drawHighlight(CCNode* node, HighlightMode mode) {
         max.y / wsize.y * rect.GetHeight() + rect.Min.y
     );
 
+    if (
+        isnan(tmax.x) ||
+        isnan(tmax.y) ||
+        isnan(tmin.x) ||
+        isnan(tmin.y)
+    ) {
+        return;
+    }
+
     auto anchor = ImVec2(
         node->getAnchorPoint().x * (tmax.x - tmin.x) + tmin.x,
         node->getAnchorPoint().y * (tmax.y - tmin.y) + tmin.y
@@ -242,7 +251,9 @@ void DevTools::drawHighlight(CCNode* node, HighlightMode mode) {
 }
 
 void DevTools::drawLayoutHighlights(CCNode* node) {
-    for (auto child : ranges::reverse(CCArrayExt<CCNode>(node->getChildren()))) {
+    // TODO: undo later
+    #if 0
+    for (auto child : ranges::reverse(CCArrayExt<CCNode*>(node->getChildren()))) {
         if (!child->isVisible()) continue;
         if (child->getLayout()) {
             this->drawHighlight(child, HighlightMode::Layout);
@@ -256,6 +267,7 @@ void DevTools::drawLayoutHighlights(CCNode* node) {
             break;
         }
     }
+    #endif
 }
 
 void DevTools::drawGD(GLRenderCtx* gdCtx) {
diff --git a/src/pages/Settings.cpp b/src/pages/Settings.cpp
@@ -2,7 +2,7 @@
 #include <Geode/loader/Loader.hpp>
 #include <Geode/loader/Mod.hpp>
 #include <Geode/utils/ranges.hpp>
-#include <Geode/binding/FMODAudioEngine.hpp>
+// #include <Geode/binding/FMODAudioEngine.hpp>
 #include <Geode/modify/AppDelegate.hpp>
 #include <fmod.hpp>
 #include <numeric>
@@ -13,10 +13,13 @@ static float RAINBOW_HUE = 0.f;
 
 void DevTools::drawSettings() {
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { 1.f, 1.f });
+    // TODO: fix this option as it hasnt worked in a while lol
+#if 0
     ImGui::Checkbox("GD in Window", &m_GDInWindow);
     if (ImGui::IsItemHovered()) {
         ImGui::SetTooltip("Show GD inside a window when DevTools are open");
     }
+#endif
     ImGui::Checkbox("Attributes in Tree", &m_attributesInTree);
     if (ImGui::IsItemHovered()) {
         ImGui::SetTooltip("Show node attributes in the Tree");
@@ -41,6 +44,14 @@ void DevTools::drawSettings() {
             "Makes selecting nodes less annoying."
         );
     }
+    ImGui::Checkbox("Order Node Children", &m_orderChildren);
+    if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip(
+            "When enabled (default behavior) node children are sorted by Z Order.\n"
+            "When disabled, children have the same order they do during init functions (maybe).\n"
+            "As a side effect to disabling this, things may render incorrectly."
+        );
+    }
     ImGui::Checkbox("Advanced Settings", &m_advancedSettings);
     if (ImGui::IsItemHovered()) {
         ImGui::SetTooltip(
@@ -53,6 +64,8 @@ void DevTools::drawSettings() {
 
     ImGui::Text("GD Window");
 
+    // TODO: undo later
+#if 0
     auto winSize = CCDirector::get()->getWinSize();
     auto frameSize = GameManager::get()->resolutionForKey(GameManager::get()->m_resolution);
     auto fps = roundf(1 / CCDirector::get()->getAnimationInterval());
@@ -134,6 +147,7 @@ void DevTools::drawSettings() {
             CCDirector::get()->getScheduler()->resumeTargets(PAUSED_TARGETS);
         }
     }
+#endif
 
     ImGui::Separator();
 
@@ -184,7 +198,8 @@ class $modify(AppDelegate) {
     void applicationWillEnterForeground() override {
         AppDelegate::applicationWillEnterForeground();
         if (DevTools::get()->pausedGame()) {
-            FMODAudioEngine::sharedEngine()->m_globalChannel->setPaused(true);
+            // TODO: undo later
+            // FMODAudioEngine::sharedEngine()->m_globalChannel->setPaused(true);
         }
     }
 };
diff --git a/src/pages/Tree.cpp b/src/pages/Tree.cpp
diff --git a/src/platform/Android.cpp b/src/platform/Android.cpp
diff --git a/src/platform/platform.cpp b/src/platform/platform.cpp
