Merge remote-tracking branch 'origin/master'

Author: elect86

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

@@ -19,6 +19,8 @@ import org.lwjgl.opengl.GLUtil
 import org.lwjgl.system.Callback
 import org.lwjgl.system.MemoryUtil.*
 import org.lwjgl.vulkan.VkInstance
+import uno.kotlin.first
+import uno.kotlin.getOrfirst
 import java.nio.ByteBuffer
 import java.nio.FloatBuffer
 
@@ -255,10 +257,12 @@ open class GlfwWindow(var handle: GlfwWindowHandle) {
 
     // ------------------- Callbacks -------------------
 
+    val defaultKey = "0 - default"
 
     var charCallback: CharCallbackT? = null
+        get() = charCallbacks.getOrfirst(defaultKey)
         set(value) {
-            charCallbacks["0 - default"] = value
+            charCallbacks[defaultKey] = value
             field = value
         }
 
@@ -267,8 +271,9 @@ open class GlfwWindow(var handle: GlfwWindowHandle) {
 
 
     var cursorPosCallback: CursorPosCallbackT? = null
+        get() = cursorPosCallbacks.getOrfirst(defaultKey)
         set(value) {
-            cursorPosCallbacks["0 - default"] = value
+            cursorPosCallbacks[defaultKey] = value
             field = value
         }
 
@@ -277,53 +282,59 @@ open class GlfwWindow(var handle: GlfwWindowHandle) {
 
 
     var framebufferSizeCallback: FramebufferSizeCallbackT? = null
+        get() = framebufferSizeCallbacks.getOrfirst(defaultKey)
         set(value) {
-            framebufferSizeCallbacks["0 - default"] = value
+            framebufferSizeCallbacks[defaultKey] = value
             field = value
         }
     val framebufferSizeCallbacks = sortedMapOf<String, FramebufferSizeCallbackT>()
     val nFramebufferSizeCallback = GLFWFramebufferSizeCallbackI { _, width, height -> framebufferSizeCallbacks.values.forEach { it(Vec2i(width, height)) } }
 
 
     var keyCallback: KeyCallbackT? = null
+        get() = keyCallbacks.getOrfirst(defaultKey)
         set(value) {
-            keyCallbacks["0 - default"] = value
+            keyCallbacks[defaultKey] = value
             field = value
         }
     val keyCallbacks = sortedMapOf<String, KeyCallbackT>()
     val nKeyCallback = GLFWKeyCallbackI { _, key, scanCode, action, mods -> keyCallbacks.values.forEach { it(key, scanCode, action, mods) } }
 
 
     var mouseButtonCallback: MouseButtonCallbackT? = null
+        get() = mouseButtonCallbacks.getOrfirst(defaultKey)
         set(value) {
-            mouseButtonCallbacks["0 - default"] = value
+            mouseButtonCallbacks[defaultKey] = value
             field = value
         }
     val mouseButtonCallbacks = sortedMapOf<String, MouseButtonCallbackT>()
     val nMouseButtonCallback = GLFWMouseButtonCallbackI { _, button, action, mods -> mouseButtonCallbacks.values.forEach { it(button, action, mods) } }
 
 
     var scrollCallback: ScrollCallbackT? = null
+        get() = scrollCallbacks.getOrfirst(defaultKey)
         set(value) {
-            scrollCallbacks["0 - default"] = value
+            scrollCallbacks[defaultKey] = value
             field = value
         }
     val scrollCallbacks = sortedMapOf<String, ScrollCallbackT>()
     val nScrollCallback = GLFWScrollCallbackI { _, xOffset, yOffset -> scrollCallbacks.values.forEach { it(Vec2d(xOffset, yOffset)) } }
 
 
     var windowCloseCallback: WindowCloseCallbackT? = null
+        get() = windowCloseCallbacks.getOrfirst(defaultKey)
         set(value) {
-            windowCloseCallbacks["0 - default"] = value
+            windowCloseCallbacks[defaultKey] = value
             field = value
         }
     val windowCloseCallbacks = sortedMapOf<String, WindowCloseCallbackT>()
     val nWindowCloseCallback = GLFWWindowCloseCallbackI { windowCloseCallbacks.values.forEach { it() } }
 
 
     var windowContentScaleCallback: WindowContentScaleCallbackT? = null
+        get() = windowContentScaleCallbacks.getOrfirst(defaultKey)
         set(value) {
-            windowContentScaleCallbacks["0 - default"] = value
+            windowContentScaleCallbacks[defaultKey] = value
             field = value
         }
     val windowContentScaleCallbacks = sortedMapOf<String, WindowContentScaleCallbackT>()

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

@@ -14,6 +14,7 @@ import org.lwjgl.system.MemoryUtil.*
 import org.lwjgl.system.Platform
 import org.lwjgl.vulkan.VkInstance
 import uno.glfw.windowHint.Profile
+import uno.kotlin.parseInt
 import vkk.VK_CHECK_RESULT
 import vkk.VkSurfaceKHR
 import vkk.adr
@@ -38,7 +39,9 @@ object glfw {
         init(installDefaultErrorCallback)
         windowHint {
             context.version = version
-            windowHint.profile = profile
+            val v = version[0].parseInt() * 10 + version[1].parseInt()
+            if(v >= 32) // The concept of a core profile does not exist prior to OpenGL 3.2
+                windowHint.profile = profile
         }
     }
 

src/main/kotlin/uno/kotlin/util.kt

@@ -3,6 +3,7 @@ package uno.kotlin
 import java.awt.event.KeyEvent
 import java.io.File
 import java.lang.Appendable
+import java.util.*
 
 /**
  * Created by GBarbieri on 30.03.2017.
@@ -54,4 +55,7 @@ infix operator fun <T>StringBuilder.plusAssign(element: T) {
     append(element)
 }
 
-fun <T>treeSetOf() = java.util.TreeSet<T>()
+fun <T>treeSetOf() = java.util.TreeSet<T>()
+
+fun <K, V>SortedMap<K, V>.getOrfirst(key: K): V? = get(key) ?: first
+val <K, V>SortedMap<K, V>.first: V?  get() = get(firstKey())