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

Author: HJfod

.github/workflows/build.yml

@@ -6,119 +6,49 @@ on:
     branches:
       - '**'
 
-env:
-  GEODE_SDK: ${{ github.workspace }}/sdk
-  GEODE_VERSION: nightly
-  CLI_VERSION: v2.2.2
-  MOD_NAME: DevTools
-  MOD_ID: geode.devtools
-
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
         config:
-        - name: "Windows"
-          bin_folder: "windows"
-          os: windows-2019
-          extra_flags: '-T host=x64 -A win32'
-          out_paths:  './build/Release/*.dll'
-          platform_suffix: 'win'
-          
-        - name: "macOS"
-          bin_folder: "macos"
-          os: macos-latest
-          extra_flags: ""
-          out_paths: './build/*.dylib'
-          platform_suffix: 'mac'
+        - name: Windows
+          os: windows-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 }}
 
     steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
+      - uses: actions/checkout@v3
 
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-        repository: geode-sdk/geode
-        # ref: v0.4.8
-        path: ${{ env.GEODE_SDK }}
-     
-    - uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x86
+      - name: Build the mod
+        uses: geode-sdk/build-geode-mod@main
+        with:
+          sdk: nightly
+          combine: true
+          target: ${{ matrix.config.target }}
 
-    - name: Download Geode SDK binaries
-      run: |
-        cd ${{ github.workspace }}/sdk
-        mkdir bin
-        mkdir bin/nightly
-        cd bin/nightly
-        curl -L https://github.com/geode-sdk/geode/releases/download/${{ env.GEODE_VERSION }}/geode-${{ env.GEODE_VERSION }}-${{ matrix.config.platform_suffix }}.zip -o geode-sdk.zip
-        tar -xf geode-sdk.zip
-
-    - name: Configure CMake
-      run: |
-        cd ${{ github.workspace }}
-        cmake -B build ${{ matrix.config.extra_flags }} -DGEODE_DISABLE_CLI_CALLS=1
-    
-    - name: Build
-      run: |
-        cd ${{ github.workspace }}/build
-        cmake --build . --config Release
-    
-    - uses: actions/upload-artifact@v3
-      with:
-        name: "build-${{ matrix.config.bin_folder }}"
-        path: "${{ matrix.config.out_paths }}"
-        
-        
   package:
-    name: "Package both builds"
-    # would use linux but theres no cli build for it
-    runs-on: windows-2019
+    name: Package builds
+    runs-on: ubuntu-latest
     needs: ['build']
-    
-    steps:          
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      
-      - name: Download and Unzip CLI
-        run: |
-          curl -L https://github.com/geode-sdk/cli/releases/download/${{ env.CLI_VERSION }}/geode-cli-${{ env.CLI_VERSION }}-win.zip -o geode-cli.zip
-          tar -xf geode-cli.zip
 
-      - uses: actions/download-artifact@v3
-        with:
-          name: build-windows
-          
-      - uses: actions/download-artifact@v3
-        with:
-          name: build-macos
-      
-      - name: Merge
-        shell: bash
-        run: |
-          mv $MOD_NAME.dll $MOD_ID.dll
-          mv lib$MOD_NAME.dylib $MOD_ID.dylib
-          ./geode.exe package new . --binary $MOD_ID.dll --binary $MOD_ID.dylib --output $MOD_ID.geode
-         
+    steps:
+      - uses: geode-sdk/build-geode-mod@combine
+        id: build
+
       - uses: actions/upload-artifact@v3
         with:
           name: Build Output
-          path: "${{ env.MOD_ID }}.geode"
-          
-      - uses: geekyeggo/delete-artifact@v2
-        with:
-            name: build-windows
-            failOnError: false
-          
-      - uses: geekyeggo/delete-artifact@v2
-        with:
-            name: build-macos
-            failOnError: false
+          path: ${{ steps.build.outputs.build-output }}

.gitignore

@@ -10,6 +10,11 @@ Source/Geode/pkg/uber-apk-signer.jar
 
 # ILY vscode
 **/.vscode
+**/.idea
+
+**/.idea
 
 imgui/**
 imgui
+
+.cache/

CMakeLists.txt

@@ -18,10 +18,7 @@ else()
     message(STATUS "Found Geode: $ENV{GEODE_SDK}")
 endif()
 
-set(GEODE_LINK_NIGHTLY ON)
-add_subdirectory($ENV{GEODE_SDK} $ENV{GEODE_SDK}/build)
-
-include(cmake/CPM.cmake)
+add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
 
 CPMAddPackage("gh:ocornut/imgui#c191faf")
 
@@ -44,6 +41,8 @@ elseif(ANDROID)
     target_link_libraries(${PROJECT_NAME} GLESv2)
 endif()
 
+# i still dont like this (alk)
+target_compile_definitions(geode-sdk INTERFACE GEODE_EXPOSE_SECRET_INTERNALS_IN_HEADERS_DO_NOT_DEFINE_PLEASE)
 
-target_link_libraries(${PROJECT_NAME} geode-sdk)
-create_geode_file(${PROJECT_NAME})
+# Set up dependencies, resources, link Geode
+setup_geode_mod(${PROJECT_NAME})

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
 

mod.json

@@ -1,6 +1,6 @@
 {
-	"geode": "v1.0.0",
-	"version": "v1.1.1",
+	"geode": "v2.0.0",
+	"version": "v1.3.0",
 	"id": "geode.devtools",
 	"name": "DevTools",
 	"developer": "Geode Team",

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;
 }
@@ -61,9 +69,12 @@ void DevTools::drawPages() {
 
         ImGui::DockBuilderDockWindow("###devtools/tree", topLeftDock);
         ImGui::DockBuilderDockWindow("###devtools/settings", topLeftDock);
+        ImGui::DockBuilderDockWindow("###devtools/advanced/settings", topLeftDock);
         ImGui::DockBuilderDockWindow("###devtools/attributes", bottomLeftTopHalfDock);
         ImGui::DockBuilderDockWindow("###devtools/preview", leftDock);
         ImGui::DockBuilderDockWindow("###devtools/geometry-dash", id);
+        ImGui::DockBuilderDockWindow("###devtools/advanced/mod-graph", topLeftDock);
+        ImGui::DockBuilderDockWindow("###devtools/advanced/mod-index", topLeftDock);
 
         ImGui::DockBuilderFinish(id);
     }
@@ -78,6 +89,13 @@ void DevTools::drawPages() {
         &DevTools::drawSettings
     );
 
+    if (m_advancedSettings) {
+        this->drawPage(
+                U8STR(FEATHER_SETTINGS " Advanced Settings###devtools/advanced/settings"),
+                &DevTools::drawAdvancedSettings
+        );
+    }
+
     this->drawPage(
         U8STR(FEATHER_TOOL " Attributes###devtools/attributes"),
         &DevTools::drawAttributes
@@ -87,6 +105,20 @@ void DevTools::drawPages() {
         U8STR(FEATHER_DATABASE " Preview###devtools/preview"),
         &DevTools::drawPreview
     );
+
+    if (m_showModGraph) {
+        this->drawPage(
+            U8STR(FEATHER_SHARE_2 " Mod Graph###devtools/advanced/mod-graph"),
+            &DevTools::drawModGraph
+        );
+    }
+
+    if (m_showModIndex) {
+        this->drawPage(
+            U8STR(FEATHER_LIST " Mod Index###devtools/advanced/mod-index"),
+            &DevTools::drawModIndex
+        );
+    }
 }
 
 void DevTools::draw(GLRenderCtx* ctx) {
@@ -154,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) {

src/DevTools.hpp

@@ -6,6 +6,7 @@
 #include <cocos2d.h>
 #include <Geode/utils/cocos.hpp>
 #include <unordered_map>
+#include <Geode/loader/Index.hpp>
 
 using namespace geode::prelude;
 
@@ -25,7 +26,12 @@ class DevTools {
     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;
     ImGuiID m_dockspaceID;
     ImFont* m_defaultFont  = nullptr;
@@ -41,13 +47,19 @@ class DevTools {
     void drawTree();
     void drawTreeBranch(CCNode* node, size_t index);
     void drawSettings();
+    void drawAdvancedSettings();
     void drawNodeAttributes(CCNode* node);
     void drawAttributes();
     void drawPreview();
     void drawNodePreview(CCNode* node);
     void drawHighlight(CCNode* node, HighlightMode mode);
     void drawLayoutHighlights(CCNode* node);
     void drawGD(GLRenderCtx* ctx);
+    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 draw(GLRenderCtx* ctx);
@@ -60,6 +72,8 @@ class DevTools {
 
     bool shouldPopGame() const;
     bool pausedGame() const;
+    bool isSetup() const;
+    bool shouldOrderChildren() const;
 
     CCNode* getSelectedNode() const;
     void selectNode(CCNode* node);

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);
 
@@ -156,6 +160,14 @@ class $modify(CCTouchDispatcher) {
     void touches(CCSet* touches, CCEvent* event, unsigned int type) {
         auto& io = ImGui::GetIO();
         auto* touch = static_cast<CCTouch*>(touches->anyObject());
+
+        // for some reason mac can filter out out of touches i think?
+        if (touch == nullptr) {
+            // i am very lazy to find ccset count
+            // i don't even know if the std set in gnustl and libc++ are the same struct
+            return;
+        }
+
         const auto pos = toVec2(touch->getLocation());
         io.AddMousePosEvent(pos.x, pos.y);
         if (io.WantCaptureMouse) {
@@ -204,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());