refresh complete

Author: elect86

.idea/kotlinc.xml

@@ -58,7 +58,7 @@ abstract class LwjglCanvas(val glDebug: Boolean = false) : Canvas() {
         // glfwWindowHint can be used here to configure the GL context
         val glfwWindow = GlfwWindow fromWin32Window hwnd
         glWindow = GlWindow(glfwWindow, forwardCompatible = false).apply {
-            makeContextCurrent()
+            makeCurrent()
         }
 
         if (glDebug)
@@ -68,7 +68,7 @@ abstract class LwjglCanvas(val glDebug: Boolean = false) : Canvas() {
 
         init()
 
-        glfwWindow.makeContextCurrent(false)
+        glfwWindow.makeCurrent(false)
 
 //        println("/LwjglCanvas.initInternal ${Date().toInstant()}")
     }

awt/src/main/kotlin/uno/awt/LwjglCanvas.kt

@@ -4,7 +4,6 @@ import gln.cap.Caps
 import gln.misc.GlDebugSeverity
 import gln.misc.GlDebugSource
 import gln.misc.GlDebugType
-import org.lwjgl.glfw.GLFW
 import org.lwjgl.opengl.GL
 import org.lwjgl.opengl.GL43C
 import org.lwjgl.opengl.GLUtil
@@ -21,17 +20,19 @@ open class GlWindow(val glfwWindow: GlfwWindow,
      * legacy functionality by mistake.
      * LWJGL will not try to load deprecated functions, so calling them will crash but the context will actually expose them"
      */
+    init {
+        makeCurrent()
+        /*  This line is critical for LWJGL's interoperation with GLFW's OpenGL context,
+            or any context that is managed externally.
+            LWJGL detects the context that is current in the current thread, creates the GLCapabilities instance and
+            makes the OpenGL bindings available for use. */
+//        GL.createCapabilities() // useless, it's in Caps instantiation
+    }
     val caps = Caps(profile, forwardCompatible)
 
     var debugProc: Callback? = null
 
     fun init(show: Boolean = true) {
-        makeContextCurrent()
-        /*  This line is critical for LWJGL's interoperation with GLFW's OpenGL context,
-            or any context that is managed externally.
-            LWJGL detects the context that is current in the current thread, creates the GLCapabilities instance and
-            makes the OpenGL bindings available for use. */
-        GL.createCapabilities()
         glfwWindow.show(show)
         if (glfw.hints.context.debug) {
             debugProc = GLUtil.setupDebugMessageCallback()
@@ -46,17 +47,17 @@ open class GlWindow(val glfwWindow: GlfwWindow,
     }
 
     inline fun inGlContext(block: () -> Unit) {
-        makeContextCurrent()
+        makeCurrent()
         GL.setCapabilities(caps.gl)
         block()
-        makeContextCurrent(false)
+        makeCurrent(false)
     }
 
     /** for Java */
     override fun inContext(runnable: Runnable) {
-        makeContextCurrent()
+        makeCurrent()
         GL.setCapabilities(caps.gl)
         runnable.run()
-        makeContextCurrent(false)
+        makeCurrent(false)
     }
 }

core/src/main/kotlin/uno/glfw/GlWindow.kt

@@ -12,42 +12,35 @@ import org.lwjgl.glfw.*
 import org.lwjgl.glfw.GLFW.*
 import org.lwjgl.system.MemoryStack
 import org.lwjgl.system.MemoryUtil
-import org.lwjgl.system.MemoryUtil.*
+import org.lwjgl.system.MemoryUtil.memGetAddress
+import org.lwjgl.system.MemoryUtil.memUTF8
 import org.lwjgl.system.Pointer
 import uno.kotlin.*
 import java.util.*
 import java.util.function.BooleanSupplier
 import java.util.function.Consumer
-
-class Wut(dummy: Int) {
-
-    constructor() : this(0)
-    init {
-        println("init")
-    }
-}
 open class GlfwWindow(var handle: Long) {
 
     @Throws(RuntimeException::class)
     constructor(windowSize: Vec2i,
                 title: String = "Glfw Window",
                 monitor: GlfwMonitor = GlfwMonitor.NULL,
-                share: GlfwWindow = NULL,
+                share: GlfwWindow? = null,
                 position: Vec2i? = null) : this(windowSize.x, windowSize.y, title, monitor, share, position)
 
     @Throws(RuntimeException::class)
     constructor(x: Int,
                 title: String = "Glfw Window",
                 monitor: GlfwMonitor = GlfwMonitor.NULL,
-                share: GlfwWindow = NULL,
+                share: GlfwWindow? = null,
                 position: Vec2i? = null) : this(x, x, title, monitor, share, position)
 
     @Throws(RuntimeException::class)
     constructor(width: Int, height: Int,
                 title: String = "Glfw Window",
                 monitor: GlfwMonitor = GlfwMonitor.NULL,
-                share: GlfwWindow = NULL,
-                position: Vec2i? = null) : this(glfwCreateWindow(width, height, title, monitor.handle, share.handle)) {
+                share: GlfwWindow? = null,
+                position: Vec2i? = null) : this(glfwCreateWindow(width, height, title, monitor.handle, share?.handle ?: MemoryUtil.NULL)) {
 
         this.title = title
 
@@ -57,11 +50,10 @@ open class GlfwWindow(var handle: Long) {
     // --- [ glfwCreateWindow ] ---
 
     init {
-        println("init")
-//        if (handle == MemoryUtil.NULL) {
-//            glfw.terminate()
-//            throw RuntimeException("Failed to create the GLFW window")
-//        }
+        if (handle == MemoryUtil.NULL) {
+            glfw.terminate()
+            throw RuntimeException("Failed to create the GLFW window")
+        }
     }
 
     // --- [ glfwDestroyWindow ] ---
@@ -361,7 +353,8 @@ open class GlfwWindow(var handle: Long) {
     enum class CursorMode(val i: Int) {
         Normal(GLFW_CURSOR_NORMAL),
         Hidden(GLFW_CURSOR_HIDDEN),
-        Disabled(GLFW_CURSOR_DISABLED), ;
+        Disabled(GLFW_CURSOR_DISABLED),
+        Captured(GLFW_CURSOR_CAPTURED);
 
         companion object {
             infix fun of(i: Int) = values().first { it.i == i }
@@ -420,7 +413,7 @@ open class GlfwWindow(var handle: Long) {
     var keyCB: KeyCB?
         @Deprecated(message = "Write only property", level = DeprecationLevel.HIDDEN) get() = error("")
         set(value) {
-            val cb = value?.let { GLFWKeyCallbackI { wnd, key, scanCode, action, mods -> it(GlfwWindow(wnd), key, scanCode, action, mods) } }
+            val cb = value?.let { GLFWKeyCallbackI { wnd, key, scanCode, action, mods -> it(GlfwWindow(wnd), Key of key, scanCode, InputAction of action, mods) } }
             glfwSetKeyCallback(handle, cb)?.free()
         }
 
@@ -453,7 +446,7 @@ open class GlfwWindow(var handle: Long) {
     var cursorPosCB: CursorPosCB?
         @Deprecated(message = "Write only property", level = DeprecationLevel.HIDDEN) get() = error("")
         set(value) {
-            val cb = value?.let { GLFWCursorPosCallbackI { wnd, xPos, yPos -> it(GlfwWindow(wnd), Vec2(xPos, yPos)) } }
+            val cb = value?.let { GLFWCursorPosCallbackI { wnd, xPos, yPos -> it(GlfwWindow(wnd), Vec2d(xPos, yPos)) } }
             glfwSetCursorPosCallback(handle, cb)?.free()
         }
 
@@ -487,17 +480,19 @@ open class GlfwWindow(var handle: Long) {
             glfwSetDropCallback(handle, cb)?.free()
         }
 
-
     // --- [ glfwGetClipboardString ] ---
     // --- [ glfwSetClipboardString ] ---
+//    Parameters
+//    [in]	window	Deprecated. Any valid window or NULL.
+    // -> glfw object
     var clipboardString: String?
         get() = glfwGetClipboardString(handle)
         set(value) {
             value?.let { glfwSetClipboardString(handle, it) }
         }
 
     // --- [ glfwMakeContextCurrent ] ---
-    fun makeContextCurrent(current: Boolean = true) = glfwMakeContextCurrent(if (current) handle else MemoryUtil.NULL)
+    fun makeCurrent(current: Boolean = true) = glfwMakeContextCurrent(if (current) handle else MemoryUtil.NULL)
 
     // --- [ glfwSwapBuffers ] ---
 
@@ -507,16 +502,16 @@ open class GlfwWindow(var handle: Long) {
     fun present() = swapBuffers()
 
     inline fun inContext(block: () -> Unit) {
-        makeContextCurrent()
+        makeCurrent()
         block()
-        makeContextCurrent(false)
+        makeCurrent(false)
     }
 
     /** for Java */
     open fun inContext(runnable: Runnable) {
-        makeContextCurrent()
+        makeCurrent()
         runnable.run()
-        makeContextCurrent(false)
+        makeCurrent(false)
     }
 
     var autoSwap = true
@@ -573,7 +568,5 @@ open class GlfwWindow(var handle: Long) {
 
         @JvmStatic
         infix fun from(handle: Long): GlfwWindow = GlfwWindow(handle)
-
-        val NULL = GlfwWindow(MemoryUtil.NULL)
     }
 }

core/src/main/kotlin/uno/glfw/GlfwWindow.kt

@@ -277,7 +277,7 @@ object glfw {
     // -> GlfwWindow
 
     // --- [ glfwRawMouseMotionSupported ] ---
-    val isRawMouseMotionSupported: Boolean
+    val rawMouseMotionSupported: Boolean
         get() = glfwRawMouseMotionSupported()
 
     // --- [ glfwGetKeyName ] ---
@@ -294,7 +294,8 @@ object glfw {
     // -> GlfwWindow
 
     // --- [ glfwCreateCursor ] ---
-    fun createCursor(image: GLFWImage, xhot: Int, yhot: Int) = GlfwCursor(glfwCreateCursor(image, xhot, yhot))
+    // --- [ glfwDestroyCursor ] ---
+    // -> GlfwCursor
 
     // --- [ glfwCreateStandardCursor ] ---
 
@@ -349,7 +350,14 @@ object glfw {
 
     // --- [ glfwSetClipboardString ] ---
     // --- [ glfwGetClipboardString ] ---
-    // -> GlfwWindow
+//    Parameters
+//    [in]	window	Deprecated. Any valid window or NULL.
+    // -> here
+    var clipboardString: String?
+        get() = glfwGetClipboardString(NULL)
+        set(value) {
+            value?.let { glfwSetClipboardString(NULL, it) }
+        }
 
     // --- [ glfwGetTime ] ---
     // --- [ glfwSetTime ] ---

core/src/main/kotlin/uno/glfw/glfw.kt

@@ -1,15 +1,20 @@
+@file:OptIn(ExperimentalUnsignedTypes::class)
+
 package uno.glfw
 
 import glm_.vec2.Vec2
 import glm_.vec2.Vec2d
 import glm_.vec2.Vec2i
 import gln.L
 import kool.*
+import org.lwjgl.glfw.GLFW
 import org.lwjgl.glfw.GLFW.glfwDestroyCursor
 import org.lwjgl.glfw.GLFWGammaRamp
+import org.lwjgl.glfw.GLFWImage
 import org.lwjgl.system.MemoryStack
-import org.lwjgl.system.MemoryUtil.memPutAddress
-import uno.kotlin.ptrInt
+import org.lwjgl.system.MemoryUtil
+import org.lwjgl.system.MemoryUtil.*
+import uno.kotlin.ptrUByte
 import uno.kotlin.ptrUShort
 
 
@@ -27,7 +32,7 @@ operator fun Ptr<GlfwVidMode>.get(index: Int) = GlfwVidMode((adr.L + index * Glf
 
 class GlfwGammaRamp(val red: IntArray, val green: IntArray, val blue: IntArray) {
 
-    fun toStack(stack: MemoryStack): Ptr<GlfwGammaRamp> {
+    infix fun toStack(stack: MemoryStack): Ptr<GlfwGammaRamp> {
         val r = stack.ptrUShort(red.size)
         val g = stack.ptrUShort(red.size)
         val b = stack.ptrUShort(red.size)
@@ -36,13 +41,11 @@ class GlfwGammaRamp(val red: IntArray, val green: IntArray, val blue: IntArray)
             g[i] = green[i].toUShort()
             b[i] = blue[i].toUShort()
         }
-        val s = stack.ptrInt()
-        s[0] = red.size
         val ptr = stack.nmalloc(GLFWGammaRamp.ALIGNOF, GLFWGammaRamp.SIZEOF)
         memPutAddress(ptr + GLFWGammaRamp.RED, r.adr.L)
         memPutAddress(ptr + GLFWGammaRamp.GREEN, g.adr.L)
         memPutAddress(ptr + GLFWGammaRamp.BLUE, b.adr.L)
-        memPutAddress(ptr + GLFWGammaRamp.SIZE, s.adr.L)
+        memPutInt(ptr + GLFWGammaRamp.SIZE, red.size)
         return ptr.toPtr()
     }
 }
@@ -57,9 +60,21 @@ fun GlfwGammaRamp(ptr: Ptr<GlfwGammaRamp>): GlfwGammaRamp {
 
 @JvmInline
 value class GlfwCursor(val handle: Long) {
+    // --- [ glfwCreateCursor ] ---
+    constructor(image: GlfwImage, hot: Int) : this(image, hot, hot)
+    constructor(image: GlfwImage, xHot: Int, yHot: Int) : this(stack { GLFW.nglfwCreateCursor(image.toStack(it).adr.L, xHot, yHot) })
 
     // --- [ glfwDestroyCursor ] ---
     fun destroy() = glfwDestroyCursor(handle)
+
+    val isValid: Boolean
+        get() = handle != MemoryUtil.NULL
+    val isNotValid: Boolean
+        get() = !isValid
+
+    companion object {
+        val NULL = GlfwCursor(MemoryUtil.NULL)
+    }
 }
 
 typealias WindowPosCB = (window: GlfwWindow, pos: Vec2i) -> Unit
@@ -71,11 +86,11 @@ typealias WindowIconifyCB = (window: GlfwWindow, iconified: Boolean) -> Unit
 typealias WindowMaximizeCB = (window: GlfwWindow, maximized: Boolean) -> Unit
 typealias FramebufferSizeCB = (window: GlfwWindow, size: Vec2i) -> Unit
 typealias WindowContentScaleCB = (window: GlfwWindow, scale: Vec2) -> Unit
-typealias KeyCB = (window: GlfwWindow, key: Int, scanCode: Int, action: Int, mods: Int) -> Unit
+typealias KeyCB = (window: GlfwWindow, key: Key, scanCode: Int, action: InputAction, mods: Int) -> Unit
 typealias CharCB = (window: GlfwWindow, codePoint: Int) -> Unit
 typealias CharModsCB = (window: GlfwWindow, codePoint: Int, mods: Int) -> Unit
 typealias MouseButtonCB = (window: GlfwWindow, button: Int, action: Int, mods: Int) -> Unit
-typealias CursorPosCB = (window: GlfwWindow, pos: Vec2) -> Unit
+typealias CursorPosCB = (window: GlfwWindow, pos: Vec2d) -> Unit
 typealias CursorEnterCB = (window: GlfwWindow, entered: Boolean) -> Unit
 typealias ScrollCB = (window: GlfwWindow, scroll: Vec2d) -> Unit
 typealias DropCB = (window: GlfwWindow, names: Array<String>) -> Unit
@@ -88,4 +103,19 @@ enum class VSync {
     val i = ordinal - 2
 }
 
-typealias GLFWglproc = Long
+typealias GLFWglproc = Long
+
+class GlfwImage(val width: Int, val height: Int, val pixels: UByteArray) {
+    constructor(size: Int, pixels: UByteArray) : this(size, size, pixels)
+
+    infix fun toStack(stack: MemoryStack): Ptr<GlfwImage> {
+        val ptr = stack.nmalloc(GLFWImage.ALIGNOF, GLFWImage.SIZEOF)
+        memPutInt(ptr + GLFWImage.WIDTH, width)
+        memPutInt(ptr + GLFWImage.HEIGHT, height)
+        val pPixels = stack.ptrUByte(pixels.size)
+        for (i in pixels.indices)
+            pPixels[i] = pixels[i]
+        memPutAddress(ptr + GLFWImage.PIXELS, pPixels.adr.L)
+        return ptr.toPtr()
+    }
+}

core/src/main/kotlin/uno/glfw/helpers.kt

@@ -142,6 +142,13 @@ enum class Key(val i: Int) {
     }
 }
 
+enum class InputAction(val i: Int) {
+    Press(GLFW_PRESS), Release(GLFW_RELEASE), Repeat(GLFW_REPEAT);
+    companion object {
+        infix fun of(i: Int) = values().first { it.i == i }
+    }
+}
+
 enum class MouseButton(@JvmField val i: Int) {
 
     `1`(0),
@@ -152,9 +159,9 @@ enum class MouseButton(@JvmField val i: Int) {
     `6`(5),
     `7`(6),
     `8`(7),
-    LAST  (`8`.i),
-    LEFT  (`1`.i),
-    RIGHT (`2`.i),
+    LAST(`8`.i),
+    LEFT(`1`.i),
+    RIGHT(`2`.i),
     MIDDLE(`3`.i);
 
     companion object {