0.8.3.0-16+23

Author: elect86

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: burrunan/gradle-cache-action@v1
         name: Build scenery
         with:
-          arguments: build -x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar
+          arguments: build #-x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar
   #      - name: Cleanup Gradle Cache
   #        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
   #        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
@@ -45,7 +45,7 @@ jobs:
       - uses: burrunan/gradle-cache-action@v1
         name: Build scenery
         with:
-          arguments: build -x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar
+          arguments: build #-x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar
   #      - name: Cleanup Gradle Cache
   #        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
   #        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
@@ -71,7 +71,7 @@ jobs:
       - uses: burrunan/gradle-cache-action@v1
         name: Build scenery
         with:
-          arguments: build -x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar
+          arguments: build #-x dokkaHtml -x dokkaHtmlJar -x javadoc -x dokkaJavadocJar
 #      - name: Cleanup Gradle Cache
 #        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
 #        # Restoring these files from a GitHub Actions cache might cause problems for future builds.

build.gradle.kts

@@ -1,22 +1,23 @@
-import kx.LwjglModules.*
-import kx.KxProject.*
-import kx.kxImplementation
-import kx.lwjglImplementation
+import kx.KxProject.glm
+import kx.KxProject.kool
+import kx.KxProject.unsigned
+import kx.Lwjgl
+import kx.Lwjgl.Modules.jemalloc
+import kx.Lwjgl.Modules.opengl
+import kx.implementation
 
 plugins {
-    val build = "0.7.0+79"
-    id("kx.kotlin.11") version build
-    id("kx.lwjgl") version build
-    id("kx.dokka") version build
+    val build = "0.7.3+41"
+    id("kx.kotlin") version build
+//    id("kx.dokka") version build
     id("kx.publish") version build
-    java
+    id("kx.dynamic-align") version build
+    id("kx.util") version build
 }
 
-version = "0.8.3.0-16+22"
-
 dependencies {
 
-    kxImplementation(unsigned, kool, glm)
+    implementation(unsigned, kool, glm)
 
     // https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-core
     listOf(/*"-batik",*/ "-bmp", "-core", "-icns", "-iff", "-jpeg", "-metadata", "-pcx", "-pdf", "-pict", "-pnm",
@@ -26,5 +27,5 @@ dependencies {
     // https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-transcoder
     //implementation "org.apache.xmlgraphics:batik-transcoder:1.12"
 
-    lwjglImplementation(jemalloc, opengl)
+    Lwjgl { implementation(jemalloc, opengl) }
 }

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g
 org.gradle.daemon=false
-platformVersion=0.2.8+44
+#systemProp.dynamicAlignVerbose=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
-distributionSha256Sum=7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205
+distributionUrl=https://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionSha256Sum=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd

settings.gradle.kts

@@ -5,4 +5,9 @@ pluginManagement {
         gradlePluginPortal()
         maven("https://raw.githubusercontent.com/kotlin-graphics/mary/master")
     }
+}
+
+gradle.rootProject {
+    group = "kotlin.graphics"
+    version = "0.8.3.0-16+23"
 }

src/main/kotlin/gli_/Storage.kt

@@ -89,7 +89,7 @@ class Storage {
         val layerSize = layerSize(0, faces - 1, 0, levels - 1)
         val faceSize = faceSize(0, levels - 1)
 
-        return layerSize * layer + faceSize * face + (0 until level).sumBy { levelSize(it) }
+        return layerSize * layer + faceSize * face + (0 until level).sumOf { levelSize(it) }
     }
 
     fun imageOffset(coord: Int, extend: Int): Int {
@@ -146,7 +146,7 @@ class Storage {
         assert(baseLevel in 0 until levels)
         assert(baseLevel <= maxLevel)
         // The size of a face is the sum of the size of each level.
-        return (baseLevel..maxLevel).sumBy { levelSize(it) }
+        return (baseLevel..maxLevel).sumOf { levelSize(it) }
     }
 
     fun layerSize(baseFace: Int, maxFace: Int, baseLevel: Int, maxLevel: Int): Int {

src/main/kotlin/gli_/misc.kt

@@ -10,6 +10,7 @@ import java.net.URI
 import java.nio.ByteBuffer
 import java.nio.file.Path
 import java.nio.file.Paths
+import java.util.*
 import javax.imageio.ImageIO
 
 infix fun Int.has(b: Int) = (this and b) != 0
@@ -18,7 +19,7 @@ infix fun Int.hasnt(b: Int) = (this and b) == 0
 fun pathOf(filename: String, vararg more: String): Path = Paths.get(filename, *more)
 //fun URI.toPath(): Path = Paths.get(this)
 
-val Path.extension get() = toString().substringAfterLast(".").toLowerCase()
+val Path.extension get() = toString().substringAfterLast(".").lowercase(Locale.getDefault())
 
 fun ByteBuffer.flipY(size: Vec2i) = flipY(size.x, size.y)