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

Author: HJfod

.github/workflows/build.yml

@@ -44,7 +44,7 @@ jobs:
     needs: ['build']
 
     steps:
-      - uses: geode-sdk/build-geode-mod@combine
+      - uses: geode-sdk/build-geode-mod/combine@main
         id: build
 
       - uses: actions/upload-artifact@v3

.gitignore

@@ -8,6 +8,7 @@ Source/Geode/pkg/uber-apk-signer.jar
 
 # Ignore build folders
 **/build
+build-*/
 
 # ILY vscode
 **/.vscode

CMakeLists.txt

@@ -1,17 +1,17 @@
 cmake_minimum_required(VERSION 3.21)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 
 project(DevTools VERSION 1.0.0)
 
 file(GLOB_RECURSE SOURCES
     src/*.cpp
 )
 
-add_library(${PROJECT_NAME} SHARED ${SOURCES} src/platform/Mac.mm src/platform/retina.mm)
+add_library(${PROJECT_NAME} SHARED ${SOURCES} src/platform/Mac.mm)
 
 set_source_files_properties(src/platform/Mac.mm PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
-set_source_files_properties(src/platform/retina.mm PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
 
 if (NOT DEFINED ENV{GEODE_SDK})
     message(FATAL_ERROR "Unable to find Geode SDK! Please define GEODE_SDK environment variable to point to Geode")
@@ -21,7 +21,7 @@ endif()
 
 add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
 
-CPMAddPackage("gh:ocornut/imgui#c191faf")
+CPMAddPackage("gh:ocornut/imgui@1.91.0-docking")
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${imgui_SOURCE_DIR})
 

about.md

@@ -2,7 +2,7 @@
 
 Browser-like developer tools for Geode.
 
-Press `F11` (or `F10` on mac) to open up the dev tools.
+Press `F11` (or `F10` on Mac or `More Games` on Android) to open up the dev tools.
 
 ## Features
 

changelog.md

@@ -0,0 +1,18 @@
+## v1.7.1
+* Added support for Intel Mac
+* Disabled GD hooks that were still enabled on Windows
+
+## v1.7.0
+
+* Support for 2.206
+* Bump to Geode `v3.0.0-beta.1`
+* Fixes for 64-bit
+* Make the time format for memory dumps better
+* Remove logs for GL extension string
+* Actually save the settings used
+
+## v1.6.0
+
+* Adds Node IDs into the Attributes menu, along with a button to copy them
+* Adds a way to create and modify an AnchorLayout
+* Removes the Show Mod Index option in preparation for the new index

mod.json

@@ -1,16 +1,18 @@
 {
-	"geode": "v2.0.0-beta.23",
-	"version": "v1.6.0",
+	"geode": "4.0.0",
+	"version": "v1.7.1",
 	"gd": {
 		"win": "*",
 		"android": "*",
-		"mac": "2.200"
+		"mac": "2.206"
 	},
 	"id": "geode.devtools",
 	"name": "DevTools",
 	"developer": "Geode Team",
 	"description": "Developer tools for Geode",
-	"repository": "https://github.com/geode-sdk/DevTools",
+	"links": {
+		"source": "https://github.com/geode-sdk/DevTools"
+	},
 	"issues": {
 		"url": "https://github.com/geode-sdk/DevTools/issues",
 		"info": "If you encounter an issue using DevTools, please report it to the GitHub issues page."

src/DevTools.cpp

@@ -11,13 +11,51 @@
 #include <Geode/loader/Mod.hpp>
 #include "ImGui.hpp"
 
+template<>
+struct matjson::Serialize<Settings> {
+    static Result<Settings> fromJson(const matjson::Value& value) {
+        Settings defaults;
+
+        return Ok(Settings {
+            .GDInWindow = value["game_in_window"].asBool().unwrapOr(std::move(defaults.GDInWindow)),
+            .attributesInTree = value["attributes_in_tree"].asBool().unwrapOr(std::move(defaults.attributesInTree)),
+            .alwaysHighlight = value["always_highlight"].asBool().unwrapOr(std::move(defaults.alwaysHighlight)),
+            .highlightLayouts = value["highlight_layouts"].asBool().unwrapOr(std::move(defaults.highlightLayouts)),
+            .arrowExpand = value["arrow_expand"].asBool().unwrapOr(std::move(defaults.arrowExpand)),
+            .orderChildren = value["order_children"].asBool().unwrapOr(std::move(defaults.orderChildren)),
+            .advancedSettings = value["advanced_settings"].asBool().unwrapOr(std::move(defaults.advancedSettings)),
+            .showMemoryViewer = value["show_memory_viewer"].asBool().unwrapOr(std::move(defaults.showMemoryViewer)),
+            .theme = value["theme"].asString().unwrapOr(std::move(defaults.theme)),
+        });
+    }
+
+    static matjson::Value toJson(const Settings& settings) {
+        return matjson::makeObject({
+            { "game_in_window", settings.GDInWindow },
+            { "attributes_in_tree", settings.attributesInTree },
+            { "always_highlight", settings.alwaysHighlight },
+            { "highlight_layouts", settings.highlightLayouts },
+            { "arrow_expand", settings.arrowExpand },
+            { "order_children", settings.orderChildren },
+            { "advanced_settings", settings.advancedSettings },
+            { "show_memory_viewer", settings.showMemoryViewer },
+            { "theme", settings.theme },
+        });
+    }
+};
+
+$on_mod(DataSaved) { DevTools::get()->saveSettings(); }
+
 DevTools* DevTools::get() {
-    static auto inst = new DevTools;
+    static auto inst = new DevTools();
     return inst;
 }
 
+void DevTools::loadSettings() { m_settings = Mod::get()->getSavedValue<Settings>("settings"); }
+void DevTools::saveSettings() { Mod::get()->setSavedValue("settings", m_settings); }
+
 bool DevTools::shouldPopGame() const {
-    return m_visible && m_GDInWindow;
+    return m_visible && m_settings.GDInWindow;
 }
 
 bool DevTools::pausedGame() const {
@@ -29,7 +67,7 @@ bool DevTools::isSetup() const {
 }
 
 bool DevTools::shouldOrderChildren() const {
-    return m_orderChildren;
+    return m_settings.orderChildren;
 }
 
 CCNode* DevTools::getSelectedNode() const {
@@ -51,17 +89,9 @@ void DevTools::drawPage(const char* name, void(DevTools::*pageFun)()) {
     ImGui::End();
 }
 
-#ifndef GEODE_IS_MACOS
-
-float DevTools::retinaFactor() {
-    return 1.f;
-}
-
-#endif
-
 void DevTools::drawPages() {
     const auto size = CCDirector::sharedDirector()->getOpenGLView()->getFrameSize();
-    
+
     if ((!Mod::get()->setSavedValue("layout-loaded", true) || m_shouldRelayout)) {
         m_shouldRelayout = false;
 
@@ -97,7 +127,7 @@ void DevTools::drawPages() {
         &DevTools::drawSettings
     );
 
-    if (m_advancedSettings) {
+    if (m_settings.advancedSettings) {
         this->drawPage(
                 U8STR(FEATHER_SETTINGS " Advanced Settings###devtools/advanced/settings"),
                 &DevTools::drawAdvancedSettings
@@ -109,10 +139,13 @@ void DevTools::drawPages() {
         &DevTools::drawAttributes
     );
 
+    // TODO: fix preview tab
+#if 0
     this->drawPage(
         U8STR(FEATHER_DATABASE " Preview###devtools/preview"),
         &DevTools::drawPreview
     );
+#endif
 
     if (m_showModGraph) {
         this->drawPage(
@@ -121,23 +154,20 @@ void DevTools::drawPages() {
         );
     }
 
-    if (m_showModIndex) {
-        this->drawPage(
-            U8STR(FEATHER_LIST " Mod Index###devtools/advanced/mod-index"),
-            &DevTools::drawModIndex
-        );
+    if (m_settings.showMemoryViewer) {
+        this->drawPage("Memory viewer", &DevTools::drawMemory);
     }
 }
 
 void DevTools::draw(GLRenderCtx* ctx) {
     if (m_visible) {
         if (m_reloadTheme) {
-            applyTheme(m_theme);
+            applyTheme(m_settings.theme);
             m_reloadTheme = false;
         }
 
         m_dockspaceID = ImGui::DockSpaceOverViewport(
-            nullptr, ImGuiDockNodeFlags_PassthruCentralNode
+            0, nullptr, ImGuiDockNodeFlags_PassthruCentralNode
         );
 
         ImGui::PushFont(m_defaultFont);
@@ -154,7 +184,7 @@ void DevTools::setupFonts() {
     static const ImWchar icon_ranges[] = { FEATHER_MIN_FA, FEATHER_MAX_FA, 0 };
     static const ImWchar box_ranges[]  = { BOX_DRAWING_MIN_FA, BOX_DRAWING_MAX_FA, 0 };
     static const ImWchar* def_ranges   = ImGui::GetIO().Fonts->GetGlyphRangesDefault();
-    
+
     static constexpr auto add_font = [](
         void* font, size_t realSize, float size, const ImWchar* range
     ) {
@@ -182,16 +212,16 @@ void DevTools::setup() {
     m_setup = true;
 
     IMGUI_CHECKVERSION();
-    
+
     auto ctx = ImGui::CreateContext();
-    
+
     auto& io = ImGui::GetIO();
     io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
     // if this is true then it just doesnt work :( why
     io.ConfigDockingWithShift = false;
     // io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
     io.ConfigWindowsResizeFromEdges = true;
-        
+
     this->setupFonts();
     this->setupPlatform();
 
@@ -202,6 +232,15 @@ void DevTools::setup() {
 #endif
 }
 
+void DevTools::destroy() {
+    if (!m_setup) return;
+    m_setup = false;
+    m_visible = false;
+
+    // crashes :(
+    // ImGui::DestroyContext();
+}
+
 void DevTools::show(bool visible) {
     m_visible = visible;
 }

src/DevTools.hpp

@@ -5,8 +5,10 @@
 #include "themes.hpp"
 #include <cocos2d.h>
 #include <Geode/utils/cocos.hpp>
+#include <Geode/utils/addresser.hpp>
+#include <Geode/loader/Loader.hpp>
+#include <Geode/loader/ModMetadata.hpp>
 #include <unordered_map>
-#include <Geode/loader/Index.hpp>
 
 using namespace geode::prelude;
 
@@ -16,23 +18,27 @@ enum class HighlightMode {
     Layout,
 };
 
+struct Settings {
+    bool GDInWindow = true;
+    bool attributesInTree = false;
+    bool alwaysHighlight = true;
+    bool highlightLayouts = false;
+    bool arrowExpand = false;
+    bool orderChildren = true;
+    bool advancedSettings = false;
+    bool showMemoryViewer = false;
+    std::string theme = DARK_THEME;
+};
+
 class DevTools {
 protected:
     bool m_visible = false;
     bool m_setup = false;
     bool m_reloadTheme = true;
-    bool m_GDInWindow = true;
-    bool m_attributesInTree = false;
-    bool m_alwaysHighlight = true;
     bool m_shouldRelayout = false;
-    bool m_highlightLayouts = false;
-    bool m_arrowExpand = false;
-    bool m_advancedSettings = false;
     bool m_showModGraph = false;
-    bool m_showModIndex = false;
     bool m_pauseGame = false;
-    bool m_orderChildren = true;
-    std::string m_theme = DARK_THEME;
+    Settings m_settings;
     ImGuiID m_dockspaceID;
     ImFont* m_defaultFont  = nullptr;
     ImFont* m_smallFont    = nullptr;
@@ -58,10 +64,9 @@ class DevTools {
     void drawModGraph();
     void drawModGraphNode(Mod* node);
     ModMetadata inputMetadata(void* treePtr, ModMetadata metadata);
-    void drawModIndex();
-    void drawIndexItem(IndexItemHandle const& node);
     void drawPage(const char* name, void(DevTools::* fun)());
     void drawPages();
+    void drawMemory();
     void draw(GLRenderCtx* ctx);
 
     void newFrame();
@@ -70,8 +75,12 @@ class DevTools {
 
     bool hasExtension(const std::string& ext) const;
 
+    DevTools() { loadSettings(); }
+
 public:
     static DevTools* get();
+    void loadSettings();
+    void saveSettings();
 
     bool shouldUseGDWindow() const;
 
@@ -85,12 +94,12 @@ class DevTools {
     void highlightNode(CCNode* node, HighlightMode mode);
 
     void sceneChanged();
-    static float retinaFactor();
 
     void render(GLRenderCtx* ctx);
 
     // setup ImGui & DevTools
     void setup();
+    void destroy();
 
     void show(bool visible);
     void toggle();

src/backend.cpp

@@ -21,6 +21,10 @@ void DevTools::setupPlatform() {
     // this is a lie hehe
     io.BackendFlags |= ImGuiBackendFlags_HasMouseCursors;
 
+    // use static since imgui does not own the pointer!
+    static const auto iniPath = (Mod::get()->getSaveDir() / "imgui.ini").u8string();
+    io.IniFilename = reinterpret_cast<const char*>(iniPath.c_str());
+
     unsigned char* pixels;
     int width, height;
     io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height);
@@ -39,7 +43,7 @@ void DevTools::newFrame() {
 
     auto* director = CCDirector::sharedDirector();
     const auto winSize = director->getWinSize();
-    const auto frameSize = director->getOpenGLView()->getFrameSize() * DevTools::retinaFactor();
+    const auto frameSize = director->getOpenGLView()->getFrameSize() * geode::utils::getDisplayFactor();
 
     // glfw new frame
     io.DisplaySize = ImVec2(frameSize.width, frameSize.height);
@@ -83,7 +87,6 @@ bool DevTools::hasExtension(const std::string& ext) const {
     }
 
     std::string extsStr(exts);
-    log::debug("{}", extsStr);
     return extsStr.find(ext) != std::string::npos;
 }