Merge remote-tracking branch 'origin/master'

Author: Sunny1337

build.gradle

@@ -16,7 +16,7 @@ ext{
     kotlin = 'org.jetbrains.kotlin:kotlin'
     kotlin_version = '1.3.11'
     kotlintest_version = '3.1.11'
-    gln_version = '8082ce6286faeb842813c86af4b46adc430c12dd'
+    gln_version = '980c4b28f15aabf881b30805e454d9df31b7f20c'
     vkk_version = 'a0d037b48e'
     lwjgl_version = "3.2.1"
     lwjgl_natives = current() == WINDOWS ? "windows" : current() == LINUX ? "linux" : "macos"
@@ -34,8 +34,8 @@ dependencies {
     testImplementation "io.kotlintest:kotlintest-runner-junit5:$kotlintest_version".toString()
 
     def joglVersion = '2.3.2'
-    implementation "org.jogamp.gluegen:gluegen-rt-main:$joglVersion".toString()
-    implementation "org.jogamp.jogl:jogl-all-main:$joglVersion".toString()
+    testImplementation "org.jogamp.gluegen:gluegen-rt-main:$joglVersion".toString()
+    testImplementation "org.jogamp.jogl:jogl-all-main:$joglVersion".toString()
 
     ["", "-glfw", "-jemalloc", "-openal", "-opengl", "-stb", "-vulkan", "-jawt"].each {
         implementation "org.lwjgl:lwjgl$it:$lwjgl_version"

src/main/kotlin/uno/al/openAL.kt

@@ -17,60 +17,6 @@ import java.nio.Buffer
 import java.nio.IntBuffer
 import java.nio.ShortBuffer
 
-fun main(args: Array<String>) {
-
-    val device = ALCdevice.open()
-
-    val context = device.createContext().apply { makeCurrent() }
-
-    val alcCapabilities = device.createCapabilities()
-    val alCapabilities = AL.createCapabilities(alcCapabilities)
-
-    val stack = stackPush()
-    //Allocate space to store return information from the function
-    val channelsBuffer = stack.mallocInt(1)
-    val sampleRateBuffer = stack.mallocInt(1)
-
-    val (rawAudioBuffer, channels, sampleRate) = stbVorbis.decodeFilename("C:\\Users\\elect\\Downloads\\sample.ogg")
-
-    //Find the correct OpenAL format
-    val format = when (channels) {
-        1 -> al.Format.MONO16
-        2 -> al.Format.STEREO16
-        else -> al.Format.UNDEFINED
-    }
-
-    //Request space for the buffer
-    val buffer = al.genBuffer()
-
-    //Send the data to OpenAL
-    buffer.data(format, rawAudioBuffer, sampleRate)
-
-    //Free the memory allocated by STB
-    rawAudioBuffer.free()
-
-    //Request a source
-    val source = al.genSource()
-
-    //Assign the sound we just loaded to the source
-    source.buffer = buffer
-
-    //Play the sound
-    source.play()
-
-    try {
-        //Wait for a second
-        Thread.sleep(100_000)
-    } catch (ignored: InterruptedException) {
-    }
-
-    //Terminate OpenAL
-    source.delete()
-    buffer.delete()
-    context.destroy()
-    device.close()
-}
-
 object alc {
 
     val currentContext: ALCcontext

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

@@ -47,7 +47,7 @@ object windowHint {
 
     var maximized = false
         set(value) {
-            glfwWindowHint(GLFW_FLOATING, value.i)
+            glfwWindowHint(GLFW_MAXIMIZED, value.i)
             field = value
         }
 
@@ -255,4 +255,4 @@ object windowHint {
             })
             field = value
         }
-}
+}

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

@@ -1,10 +1,6 @@
 package uno.kotlin
 
 import glm_.i
-import kool.Adr
-import org.lwjgl.opengl.GL
-import org.lwjgl.opengl.GLCapabilities
-import org.lwjgl.system.Pointer
 import java.awt.event.KeyEvent
 import java.io.File
 import java.lang.Appendable

src/test/java/main/Prova.java

@@ -1,7 +1,7 @@
 package main;
 
 import org.lwjgl.system.Platform;
-import uno.awt.LwjglCanvas;
+import uno.jawt.LwjglCanvas;
 
 import javax.swing.*;
 import java.awt.*;

src/test/kotlin/uno/AwtTest.kt

@@ -4,7 +4,7 @@ import glm_.f
 import org.lwjgl.opengl.GL
 import org.lwjgl.opengl.GL11.*
 import uno.awt.AWTGLCanvas
-import uno.awt.AbstractGears
+import uno.jawt.AbstractGears
 import uno.awt.GLData
 import java.awt.BorderLayout
 import java.awt.Dimension

src/test/kotlin/uno/al/openAL.kt

@@ -0,0 +1,60 @@
+package uno.al
+
+import kool.free
+import org.lwjgl.openal.AL
+import org.lwjgl.system.MemoryStack
+
+
+fun main(args: Array<String>) {
+
+    val device = ALCdevice.open()
+
+    val context = device.createContext().apply { makeCurrent() }
+
+    val alcCapabilities = device.createCapabilities()
+    val alCapabilities = AL.createCapabilities(alcCapabilities)
+
+    val stack = MemoryStack.stackPush()
+    //Allocate space to store return information from the function
+    val channelsBuffer = stack.mallocInt(1)
+    val sampleRateBuffer = stack.mallocInt(1)
+
+    val (rawAudioBuffer, channels, sampleRate) = stbVorbis.decodeFilename("C:\\Users\\elect\\Downloads\\sample.ogg")
+
+    //Find the correct OpenAL format
+    val format = when (channels) {
+        1 -> al.Format.MONO16
+        2 -> al.Format.STEREO16
+        else -> al.Format.UNDEFINED
+    }
+
+    //Request space for the buffer
+    val buffer = al.genBuffer()
+
+    //Send the data to OpenAL
+    buffer.data(format, rawAudioBuffer, sampleRate)
+
+    //Free the memory allocated by STB
+    rawAudioBuffer.free()
+
+    //Request a source
+    val source = al.genSource()
+
+    //Assign the sound we just loaded to the source
+    source.buffer = buffer
+
+    //Play the sound
+    source.play()
+
+    try {
+        //Wait for a second
+        Thread.sleep(100_000)
+    } catch (ignored: InterruptedException) {
+    }
+
+    //Terminate OpenAL
+    source.delete()
+    buffer.delete()
+    context.destroy()
+    device.close()
+}

src/main/kotlin/uno/awt/AbstractGears.kt renamed to src/test/kotlin/uno/jawt/AbstractGears.kt

@@ -1,4 +1,4 @@
-package uno.awt
+package uno.jawt
 
 
 import glm_.d

src/main/kotlin/uno/awt/JawtDemo.kt renamed to src/test/kotlin/uno/jawt/JawtDemo.kt

@@ -1,10 +1,8 @@
-package uno.awt
+package uno.jawt
 
 import gli_.has
 import glm_.vec2.Vec2i
-import gln.cap.Caps
 import org.lwjgl.glfw.GLFWErrorCallback
-import org.lwjgl.opengl.GLCapabilities
 import org.lwjgl.opengl.GLUtil
 import org.lwjgl.system.Callback
 import org.lwjgl.system.MemoryUtil.NULL