🐛 mouse interactions now fucking work fuckin hell

devOS-Sanity-Edition · Aug 20, 2024 · 1b13735 · 1b13735
1 parent a8c2471
commit 1b13735
Showing 1 changed file with 37 additions and 20 deletions.
diff --git a/src/main/kotlin/gay/asoji/innerpastels/client/imgui/InnerPastelsImGuiImpl.kt b/src/main/kotlin/gay/asoji/innerpastels/client/imgui/InnerPastelsImGuiImpl.kt
@@ -1,7 +1,5 @@
 package gay.asoji.innerpastels.client.imgui
 
-import com.mojang.blaze3d.platform.GlDebug
-import com.mojang.blaze3d.systems.RenderSystem
 import imgui.ImFontConfig
 import imgui.ImFontGlyphRangesBuilder
 import imgui.ImGui
@@ -12,11 +10,8 @@ import imgui.glfw.ImGuiImplGlfw
 import imgui.internal.ImGuiContext
 import net.fabricmc.api.EnvType
 import net.fabricmc.api.Environment
-import net.fabricmc.loader.api.FabricLoader
 import net.minecraft.client.Minecraft
 import org.lwjgl.glfw.GLFW
-import org.lwjgl.opengl.GL11C
-import org.lwjgl.opengl.GL32C
 
 
 @Environment(EnvType.CLIENT)
@@ -45,7 +40,7 @@ object InnerPastelsImGuiImpl {
         imguiGl3 = ImGuiImplGl3()
 
         imGuiInitialize()
-        imguiGlfw.init(handle, true)
+        imguiGlfw.init(handle, false)
         imguiGl3.init()
 
         isInitialized = true
@@ -72,39 +67,53 @@ object InnerPastelsImGuiImpl {
             return false
         }
 
-        imguiGlfw.cursorPosCallback(Minecraft.getInstance().window.window, mouseX, mouseY)
-        //imguiGlfw.mouseButtonCallback(Minecraft.getInstance().window.window, button, GLFW.GLFW_PRESS, mods)
-        return true
+        return if (ImGui.getIO().wantCaptureMouse) {
+            updateKeyMods(mods)
+            ImGui.getIO().addMouseButtonEvent(button, true)
+            true
+        } else {
+            false
+        }
     }
 
     fun mouseRelease(mouseX: Double, mouseY: Double, button: Int, mods: Int): Boolean {
         if (!isInitialized) {
             return false
         }
 
-        imguiGlfw.cursorPosCallback(Minecraft.getInstance().window.window, mouseX, mouseY)
-        //imguiGlfw.mouseButtonCallback(Minecraft.getInstance().window.window, button, GLFW.GLFW_RELEASE, mods)
-        return true
+        return if (ImGui.getIO().wantCaptureMouse) {
+            updateKeyMods(mods)
+            ImGui.getIO().addMouseButtonEvent(button, false)
+            false
+        } else {
+            true
+        }
     }
 
     fun mouseScroll(xOff: Double, yOff: Double): Boolean {
-        if (!isInitialized || !ImGui.getIO().wantCaptureMouse) {
+        if (!isInitialized) {
             return false
         }
 
-        ImGui.getIO().mouseWheelH = xOff.toFloat()
-        ImGui.getIO().mouseWheel = yOff.toFloat()
-        return true
+        return if (ImGui.getIO().wantCaptureMouse) {
+            ImGui.getIO().addMouseWheelEvent(xOff.toFloat(), yOff.toFloat())
+            true
+        } else {
+            false
+        }
     }
 
     fun setKeyState(keyCode: Int, mods: Int, scanCode: Int, isDown: Boolean): Boolean {
-        if (!isInitialized || !ImGui.getIO().wantCaptureKeyboard) {
+        if (!isInitialized) {
             return false
         }
 
-        imguiGlfw.keyCallback(Minecraft.getInstance().window.window, keyCode, scanCode, if (isDown) GLFW.GLFW_PRESS else GLFW.GLFW_RELEASE, mods)
-
-        return true
+        return if (ImGui.getIO().wantCaptureKeyboard) {
+            imguiGlfw.keyCallback(Minecraft.getInstance().window.window, keyCode, scanCode, if (isDown) GLFW.GLFW_PRESS else GLFW.GLFW_RELEASE, mods)
+            true
+        } else {
+            false
+        }
     }
 
     fun destroy() {
@@ -175,4 +184,12 @@ object InnerPastelsImGuiImpl {
 
         fontConfig.destroy()
     }
+
+    private fun updateKeyMods(mods: Int) {
+        val io = ImGui.getIO()
+        io.addKeyEvent(ImGuiKey.ModCtrl, (mods and GLFW.GLFW_MOD_CONTROL) != 0)
+        io.addKeyEvent(ImGuiKey.ModShift, (mods and GLFW.GLFW_MOD_SHIFT) != 0)
+        io.addKeyEvent(ImGuiKey.ModSuper, (mods and GLFW.GLFW_MOD_SUPER) != 0)
+        io.addKeyEvent(ImGuiKey.ModAlt, (mods and GLFW.GLFW_MOD_ALT) != 0)
+    }
 }