fixed

Author: elect86

build.gradle

@@ -33,7 +33,7 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
-    implementation 'com.github.kotlin-graphics:uno-sdk:1cef9449254e9e3b49dad569cd5f9161b573d83c'
+    implementation 'com.github.kotlin-graphics:uno-sdk:4f00f5f4a69720be1906f88305d190280da04fb1'
 
     testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.0.6'
 

imgui.ini

@@ -1,10 +1,10 @@
-[Window][ImGui Demo]
-Pos=650,20
-Size=550,680
-Collapsed=0
-
 [Window][Debug##Default]
 Pos=60,60
 Size=400,400
 Collapsed=0
 
+[Window][ImGui Demo]
+Pos=650,20
+Size=550,680
+Collapsed=0
+

src/main/kotlin/imgui/impl/LwjglGL3.kt

@@ -29,7 +29,6 @@ import org.lwjgl.opengl.GL20.*
 import org.lwjgl.opengl.GL30.*
 import org.lwjgl.opengl.GL33.GL_SAMPLER_BINDING
 import org.lwjgl.opengl.GL33.glBindSampler
-import uno.buffer.intBufferBig
 import uno.glfw.GlfwWindow
 import uno.glfw.glfw
 
@@ -151,7 +150,7 @@ object LwjglGL3 {
             // Update gamepad inputs
             val buttons = window.getJoystickButtons(GLFW_JOYSTICK_1)!!
             val buttonsCount = buttons.capacity()
-            val axes = glfwGetJoystickAxes(GLFW_JOYSTICK_1)!!
+            val axes = window.getJoystickAxes(GLFW_JOYSTICK_1)!!
             val axesCount = axes.capacity()
             fun mapButton(nav: NavInput, button: Int) {
                 if (buttonsCount > button && buttons[button] == GLFW_PRESS.b)

src/test/java/imgui/Test_lwjgl.java

@@ -1,14 +1,16 @@
 package imgui;
 
 import glm_.vec2.Vec2;
+import glm_.vec2.Vec2i;
 import glm_.vec4.Vec4;
 import imgui.impl.LwjglGL3;
+import kotlin.Unit;
 import org.lwjgl.opengl.GL;
 import uno.glfw.GlfwWindow;
-import static imgui.impl.CommonKt.setGlslVersion;
 
 import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT;
 import static org.lwjgl.opengl.GL11.glClear;
+import static org.lwjgl.system.MemoryUtil.NULL;
 
 public class Test_lwjgl {
 
@@ -24,6 +26,14 @@ public static void main(String[] args) {
     private ImGui imgui = ImGui.INSTANCE;
     private IO io;
 
+
+    private float[] f = {0f};
+    private Vec4 clearColor = new Vec4(0.45f, 0.55f, 0.6f, 1f);
+    private boolean[] showAnotherWindow = {false};
+    private boolean[] showDemo = {true};
+    private int[] counter = {0};
+
+
     public void run() {
 
         init();
@@ -59,7 +69,10 @@ public void run() {
 //        Font font = io.getFonts().addFontFromFileTTF("misc/fonts/ArialUni.ttf", 18f, new FontConfig(), io.getFonts().getGlyphRangesJapanese());
 //        assert (font != null);
 
-        while (window.isOpen()) loop();
+        window.loop(() -> {
+            loop();
+            return Unit.INSTANCE;
+        });
 
         lwjglGL3.shutdown();
         ContextKt.destroy(ctx);
@@ -73,11 +86,11 @@ private void init() {
         windowHint.getContext().setVersion("3.2");
         windowHint.setProfile("core");
 
-        window = new GlfwWindow(1280, 720, "ImGui Lwjgl OpenGL3 example");
+        window = new GlfwWindow(1280, 720, "ImGui Lwjgl OpenGL3 example", NULL, new Vec2i(Integer.MIN_VALUE), true);
 
         window.makeContextCurrent();
         glfw.setSwapInterval(1);    // Enable vsync
-        window.show();
+        window.show(true);
 
         /*  This line is critical for LWJGL's interoperation with GLFW's OpenGL context, or any context that is
             managed externally.
@@ -86,11 +99,6 @@ private void init() {
         GL.createCapabilities();
     }
 
-    private float[] f = {0f};
-    private Vec4 clearColor = new Vec4(0.45f, 0.55f, 0.6f, 1f);
-    private boolean[] showAnotherWindow = {false};
-    private boolean[] showDemo = {true};
-    private int[] counter = {0};
 
     private void loop() {
 
@@ -100,7 +108,6 @@ private void loop() {
             - when Io.wantCaptureKeyboard is true, do not dispatch keyboard input data to your main application.
             Generally you may always pass all inputs to dear imgui, and hide them from your application based on those
             two flags.  */
-        glfw.pollEvents();
         lwjglGL3.newFrame();
 
 
@@ -144,7 +151,6 @@ private void loop() {
 
         imgui.render();
         lwjglGL3.renderDrawData(imgui.getDrawData());
-        window.swapBuffers();
 
         gln.GlnKt.checkError("loop", true); // TODO remove
     }

src/test/kotlin/imgui/test lwjgl.kt

@@ -6,9 +6,8 @@ import glm_.vec4.Vec4
 import gln.checkError
 import gln.glClearColor
 import gln.glViewport
-import imgui.functionalProgramming.button
 import imgui.impl.LwjglGL3
-import imgui.impl.glslVersion
+import org.lwjgl.glfw.GLFW.glfwSwapBuffers
 import org.lwjgl.opengl.GL
 import org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT
 import org.lwjgl.opengl.GL11.glClear
@@ -77,7 +76,7 @@ class HelloWorld_lwjgl {
 //        val a = IO.fonts.addFontFromFileTTF("misc/fonts/ArialUni.ttf", 18f)!!
 //        val b = IO.fonts.addFontFromFileTTF("misc/fonts/ArialUni.ttf", 30f)!!
 
-        while (window.isOpen) loop()
+        window.loop(this::loop)
 
         LwjglGL3.shutdown()
         ctx.destroy()
@@ -100,7 +99,6 @@ class HelloWorld_lwjgl {
             - when Io.wantCaptureKeyboard is true, do not dispatch keyboard input data to your main application.
             Generally you may always pass all inputs to dear imgui, and hide them from your application based on those
             two flags.  */
-        glfw.pollEvents()
         LwjglGL3.newFrame()
 
         with(ImGui) {
@@ -151,8 +149,7 @@ class HelloWorld_lwjgl {
 
         ImGui.render()
         LwjglGL3.renderDrawData(ImGui.drawData!!)
-        window.swapBuffers()
 
-        checkError("loop") // TODO remove
+        checkError("loop") // TODO remove in production
     }
 }