Reformat files

.gitignore

@@ -140,3 +140,4 @@ gradle-app.setting
 local.properties
 .idea/misc.xml
 .idea/jarRepositories.xml
+.idea/kotlinc.xml

buildSrc/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.gradle.kotlin.dsl.`kotlin-dsl`
-
 plugins {
     `kotlin-dsl`
 }

buildSrc/src/main/kotlin/ProjectVersion.kt

@@ -1,5 +1,3 @@
-import org.gradle.api.Project
-
 val currentVersion: String by lazy {
     versionInfo().versionName
 }

buildSrc/src/main/kotlin/Publishing.kt

@@ -1,6 +1,5 @@
 import org.gradle.api.Project
 import org.gradle.api.publish.PublishingExtension
-import org.gradle.kotlin.dsl.repositories
 import java.net.URI
 
 data class PublishingSetup(

kgl-android/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.danielgergely.kgl_android" />
+<manifest package="com.danielgergely.kgl_android"/>

kgl-ios/src/nativeMain/kotlin/com.danielgergely.kgl/KglIos.kt

@@ -1,6 +1,5 @@
 package com.danielgergely.kgl
 
-import kotlinx.cinterop.cstr
 import kotlinx.cinterop.*
 import platform.gles3.*
 import platform.glescommon.GLboolean

kgl-lwjgl/src/main/kotlin/com/danielgergely/kgl/KglLwjgl.kt

@@ -209,6 +209,7 @@ object KglLwjgl : Kgl {
                     type,
                     javaBuffer
                 )
+
                 is ShortBuffer -> GL.glTexImage2D(
                     target,
                     level,
@@ -220,6 +221,7 @@ object KglLwjgl : Kgl {
                     type,
                     javaBuffer
                 )
+
                 is IntBuffer -> GL.glTexImage2D(
                     target,
                     level,
@@ -231,6 +233,7 @@ object KglLwjgl : Kgl {
                     type,
                     javaBuffer
                 )
+
                 is FloatBuffer -> GL.glTexImage2D(
                     target,
                     level,
@@ -242,6 +245,7 @@ object KglLwjgl : Kgl {
                     type,
                     javaBuffer
                 )
+
                 is DoubleBuffer -> GL.glTexImage2D(
                     target,
                     level,
@@ -253,6 +257,7 @@ object KglLwjgl : Kgl {
                     type,
                     javaBuffer
                 )
+
                 else -> throw IllegalArgumentException("unknown buffer type ${javaBuffer.javaClass}")
             }
         }

kgl/src/commonMain/kotlin/com/danielgergely/kgl/DebugKgl.kt

@@ -4,7 +4,7 @@ public class DebugKgl(
     private val kgl: Kgl,
     private val runBefore: (String) -> Unit,
     private val runAfter: (String) -> Unit,
-): Kgl {
+) : Kgl {
 
     override fun createShader(type: Int): Shader? {
         runBefore("createShader")
@@ -188,7 +188,14 @@ public class DebugKgl(
         return ret
     }
 
-    override fun vertexAttribPointer(location: Int, size: Int, type: Int, normalized: Boolean, stride: Int, offset: Int) {
+    override fun vertexAttribPointer(
+        location: Int,
+        size: Int,
+        type: Int,
+        normalized: Boolean,
+        stride: Int,
+        offset: Int
+    ) {
         runBefore("vertexAttribPointer")
         val ret = kgl.vertexAttribPointer(location, size, type, normalized, stride, offset)
         runAfter("vertexAttribPointer")
@@ -485,7 +492,12 @@ public class DebugKgl(
         return ret
     }
 
-    override fun framebufferRenderbuffer(target: Int, attachment: Int, renderbuffertarget: Int, renderbuffer: Renderbuffer) {
+    override fun framebufferRenderbuffer(
+        target: Int,
+        attachment: Int,
+        renderbuffertarget: Int,
+        renderbuffer: Renderbuffer
+    ) {
         runBefore("framebufferRenderbuffer")
         val ret = kgl.framebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer)
         runAfter("framebufferRenderbuffer")

kgl/src/commonMain/kotlin/com/danielgergely/kgl/Kgl.kt

@@ -8,8 +8,8 @@ public interface Kgl {
 
     public fun getShaderParameter(shader: Shader, pname: Int): Int
 
-    public fun getProgramInfoLog(program: Program) : String?
-    public fun getShaderInfoLog(shaderId: Shader) : String?
+    public fun getProgramInfoLog(program: Program): String?
+    public fun getShaderInfoLog(shaderId: Shader): String?
 
     public fun createProgram(): Program?
     public fun attachShader(programId: Program, shaderId: Shader)
@@ -63,10 +63,21 @@ public interface Kgl {
     public fun clear(mask: Int)
 
     public fun createTexture(): Texture
-    public fun createTextures(n: Int) : Array<Texture>
+    public fun createTextures(n: Int): Array<Texture>
     public fun deleteTexture(texture: Texture)
     public fun texImage2D(target: Int, level: Int, internalFormat: Int, border: Int, resource: TextureResource)
-    public fun texImage2D(target: Int, level: Int, internalFormat: Int, width: Int, height: Int, border: Int, format: Int, type: Int, buffer: Buffer)
+    public fun texImage2D(
+        target: Int,
+        level: Int,
+        internalFormat: Int,
+        width: Int,
+        height: Int,
+        border: Int,
+        format: Int,
+        type: Int,
+        buffer: Buffer
+    )
+
     public fun activeTexture(texture: Int)
     public fun bindTexture(target: Int, texture: Texture?)
     public fun generateMipmap(target: Int)
@@ -91,7 +102,13 @@ public interface Kgl {
     public fun bindRenderbuffer(target: Int, renderbuffer: Renderbuffer?)
     public fun createRenderbuffer(): Renderbuffer
     public fun deleteRenderbuffer(renderbuffer: Renderbuffer)
-    public fun framebufferRenderbuffer(target: Int, attachment: Int, renderbuffertarget: Int, renderbuffer: Renderbuffer)
+    public fun framebufferRenderbuffer(
+        target: Int,
+        attachment: Int,
+        renderbuffertarget: Int,
+        renderbuffer: Renderbuffer
+    )
+
     public fun isRenderbuffer(renderbuffer: Renderbuffer): Boolean
     public fun renderbufferStorage(target: Int, internalformat: Int, width: Int, height: Int)
 

kgl/src/jsMain/kotlin/com/danielgergely/kgl/Kgl.kt

@@ -43,7 +43,9 @@ public class KglJs(private val gl: WebGLRenderingContext) : Kgl {
     public override fun linkProgram(programId: Program): Unit = gl.linkProgram(programId.unsafeCast<WebGLProgram>())
     public override fun useProgram(programId: Program): Unit = gl.useProgram(programId.unsafeCast<WebGLProgram>())
 
-    public override fun detachShader(programId: Program, shaderId: Shader): Unit = gl.detachShader(programId.unsafeCast<WebGLProgram>(), shaderId.unsafeCast<WebGLShader>())
+    public override fun detachShader(programId: Program, shaderId: Shader): Unit =
+        gl.detachShader(programId.unsafeCast<WebGLProgram>(), shaderId.unsafeCast<WebGLShader>())
+
     public override fun deleteProgram(programId: Program): Unit = gl.deleteProgram(programId.unsafeCast<WebGLProgram>())
 
     public override fun getUniformLocation(programId: Program, name: String): UniformLocation? =
@@ -147,7 +149,17 @@ public class KglJs(private val gl: WebGLRenderingContext) : Kgl {
         type: Int,
         buffer: Buffer
     ) {
-        gl.texImage2D(target, level, internalFormat, width, height, border, format, type, buffer.getJsBufferWithOffset())
+        gl.texImage2D(
+            target,
+            level,
+            internalFormat,
+            width,
+            height,
+            border,
+            format,
+            type,
+            buffer.getJsBufferWithOffset()
+        )
     }
 
 

kgl/src/jvmMain/kotlin/com/danielgergely/kgl/Buffer.kt

@@ -72,6 +72,7 @@ public actual class ByteBuffer(buffer: ByteBuffer) : Buffer(buffer) {
         put(buffer)
         position(0)
     })
+
     public actual constructor(size: Int) : this(alloc(size))
 
     private companion object {
@@ -121,6 +122,7 @@ public actual class IntBuffer(private val buffer: IntBuffer) : Buffer(buffer) {
         put(buffer)
         position(0)
     })
+
     public actual constructor(size: Int) : this(alloc(size))
 
     private companion object {

kgl/src/jvmMain/kotlin/com/danielgergely/kgl/Types.kt

@@ -1,7 +1,5 @@
 package com.danielgergely.kgl
 
-import java.io.InputStream
-
 public actual typealias Shader = Int
 
 public actual typealias Program = Int
@@ -19,7 +17,7 @@ public actual class TextureResource(
     public val type: Int,
     public val data: Buffer,
 ) {
-    public actual fun dispose() { }
+    public actual fun dispose() {}
 }
 
 public actual typealias VertexArrayObject = Int

kgl/src/nativeMain/kotlin/com/danielgergely/kgl/Types.kt

@@ -18,7 +18,9 @@ public actual class TextureResource(
     public val type: Int,
     public val data: Buffer,
 ) {
-    public actual fun dispose() { data.dispose() }
+    public actual fun dispose() {
+        data.dispose()
+    }
 }
 
 public actual typealias VertexArrayObject = Int