Merge branch 'main' into Relative-Mouse-Pos

Author: Alphalaneous

.github/workflows/build.yml

@@ -2,6 +2,7 @@ name: Build Geode Mod
 
 on:
   workflow_dispatch:
+  pull_request:
   push:
     branches:
       - '**'

CMakeLists.txt

@@ -34,6 +34,13 @@ target_sources(${PROJECT_NAME} PRIVATE
     ${imgui_SOURCE_DIR}/misc/cpp/imgui_stdlib.cpp
 )
 
+# Love you imgui
+include(CheckCXXCompilerFlag)
+check_cxx_compiler_flag(-Wnontrivial-memcall HAVE_NONTRIVIAL_MEMCALL)
+if (HAVE_NONTRIVIAL_MEMCALL)
+    target_compile_options(${PROJECT_NAME} PRIVATE -Wno-nontrivial-memcall)
+endif()
+
 # i still dont like this (alk)
 target_compile_definitions(geode-sdk INTERFACE GEODE_EXPOSE_SECRET_INTERNALS_IN_HEADERS_DO_NOT_DEFINE_PLEASE)
 

mod.json

@@ -1,5 +1,5 @@
 {
-	"geode": "4.0.0-beta.1",
+	"geode": "4.3.1",
 	"version": "v1.8.0",
 	"gd": {
 		"win": "*",

src/DevTools.cpp

@@ -1,4 +1,3 @@
-
 #include <imgui_internal.h>
 #include "DevTools.hpp"
 #include "fonts/FeatherIcons.hpp"
@@ -189,11 +188,15 @@ void DevTools::setupFonts() {
         void* font, size_t realSize, float size, const ImWchar* range
     ) {
         auto& io = ImGui::GetIO();
+        // AddFontFromMemoryTTF assumes ownership of the passed data unless you configure it not to.
+        // Our font data has static lifetime, so we're handling the ownership.
+
         ImFontConfig config;
-        config.MergeMode = true;
+        config.FontDataOwnedByAtlas = false;
         auto* result = io.Fonts->AddFontFromMemoryTTF(
-            font, realSize, size, nullptr, range
+            font, realSize, size, &config, range
         );
+        config.MergeMode = true;
         io.Fonts->AddFontFromMemoryTTF(
             Font_FeatherIcons, sizeof(Font_FeatherIcons), size - 4.f, &config, icon_ranges
         );
@@ -213,7 +216,7 @@ void DevTools::setup() {
 
     IMGUI_CHECKVERSION();
 
-    auto ctx = ImGui::CreateContext();
+    ImGui::CreateContext();
 
     auto& io = ImGui::GetIO();
     io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
@@ -234,23 +237,27 @@ void DevTools::setup() {
 
 void DevTools::destroy() {
     if (!m_setup) return;
-    m_setup = false;
-    m_visible = false;
+    this->show(false);
+    auto& io = ImGui::GetIO();
+    io.BackendPlatformUserData = nullptr;
+    m_fontTexture->release();
+    m_fontTexture = nullptr;
 
-    // crashes :(
-    // ImGui::DestroyContext();
+    ImGui::DestroyContext();
+    m_setup = false;
+    m_reloadTheme = true;
 }
 
 void DevTools::show(bool visible) {
     m_visible = visible;
+
+    auto& io = ImGui::GetIO();
+    io.WantCaptureMouse = visible;
+    io.WantCaptureKeyboard = visible;
 }
 
 void DevTools::toggle() {
     this->show(!m_visible);
-    if (!m_visible) {
-        ImGui::GetIO().WantCaptureMouse = false;
-        ImGui::GetIO().WantCaptureKeyboard = false;
-    }
 }
 
 void DevTools::sceneChanged() {

src/DevTools.hpp

@@ -8,7 +8,6 @@
 #include <Geode/utils/addresser.hpp>
 #include <Geode/loader/Loader.hpp>
 #include <Geode/loader/ModMetadata.hpp>
-#include <unordered_map>
 
 using namespace geode::prelude;
 
@@ -44,6 +43,7 @@ class DevTools {
     ImFont* m_smallFont    = nullptr;
     ImFont* m_monoFont     = nullptr;
     ImFont* m_boxFont      = nullptr;
+    CCTexture2D* m_fontTexture = nullptr;
     Ref<CCNode> m_selectedNode;
     std::vector<std::pair<CCNode*, HighlightMode>> m_toHighlight;
 

src/backend.cpp

@@ -35,8 +35,6 @@ CCPoint getMousePos_H() {
 }
 
 void DevTools::setupPlatform() {
-    ImGui::CreateContext();
-
     auto& io = ImGui::GetIO();
 
     io.BackendPlatformUserData = this;
@@ -52,13 +50,11 @@ void DevTools::setupPlatform() {
     int width, height;
     io.Fonts->GetTexDataAsRGBA32(&pixels, &width, &height);
 
-    auto* tex2d = new CCTexture2D;
-    tex2d->initWithData(pixels, kCCTexture2DPixelFormat_RGBA8888, width, height, CCSize(width, height));
-
-    // TODO: not leak this :-)
-    tex2d->retain();
+    m_fontTexture = new CCTexture2D;
+    m_fontTexture->initWithData(pixels, kCCTexture2DPixelFormat_RGBA8888, width, height, CCSize(width, height));
+    m_fontTexture->retain();
 
-    io.Fonts->SetTexID(reinterpret_cast<ImTextureID>(static_cast<intptr_t>(tex2d->getName())));
+    io.Fonts->SetTexID(reinterpret_cast<ImTextureID>(static_cast<intptr_t>(m_fontTexture->getName())));
 
     // fixes getMousePos to be relative to the GD view
     #ifndef GEODE_IS_MOBILE
@@ -68,7 +64,6 @@ void DevTools::setupPlatform() {
         "geode::cocos::getMousePos"
     );
     #endif
-}
 
 void DevTools::newFrame() {
     auto& io = ImGui::GetIO();

src/pages/Attributes.cpp

@@ -4,6 +4,8 @@
 #include <misc/cpp/imgui_stdlib.h>
 #include <Geode/binding/CCMenuItemSpriteExtra.hpp>
 #include "../platform/utils.hpp"
+#include <ccTypes.h>
+#include <Geode/ui/Layout.hpp>
 
 using namespace geode::prelude;
 
@@ -132,7 +134,7 @@ void DevTools::drawNodeAttributes(CCNode* node) {
         auto color = rgbaNode->getColor();
         float _color[4] = { color.r / 255.f, color.g / 255.f, color.b / 255.f, rgbaNode->getOpacity() / 255.f };
         if (ImGui::ColorEdit4("Color", _color)) {
-            rgbaNode->setColor({
+            rgbaNode->setColor(ccColor3B {
                 static_cast<GLubyte>(_color[0] * 255),
                 static_cast<GLubyte>(_color[1] * 255),
                 static_cast<GLubyte>(_color[2] * 255)

src/pages/GeometryDash.cpp

@@ -4,6 +4,7 @@
 #include <Geode/utils/ranges.hpp>
 #include <Geode/binding/FLAlertLayer.hpp>
 #include <Geode/binding/GJDropDownLayer.hpp>
+#include <Geode/ui/Layout.hpp>
 
 void drawRowAxisArrow(
     ImDrawList& foreground,
@@ -285,8 +286,8 @@ void DevTools::drawGD(GLRenderCtx* gdCtx) {
 
             auto pad = ImGui::GetStyle().FramePadding.x;
 
-            auto winPos = ImGui::GetCursorScreenPos();
-            auto winSize = ImGui::GetContentRegionAvail();
+            auto winPos = ImGui::GetCursorScreenPos();
+            auto winSize = ImGui::GetContentRegionAvail();
 
             ImVec2 imgSize = {
                 (winSize.y - pad * 2) * ratio,

src/pages/Settings.cpp

@@ -6,6 +6,7 @@
 #include <Geode/modify/AppDelegate.hpp>
 #include <fmod.hpp>
 #include <numeric>
+#include <Geode/binding/GameManager.hpp>
 
 using namespace geode::prelude;