up

Author: elect86

build.gradle.kts

@@ -5,18 +5,18 @@ import java.net.URL
 
 plugins {
     java
-    kotlin("jvm") version "1.4.10"
+    kotlin("jvm") version "1.4.0"
     `maven-publish`
     //    id "org.jetbrains.kotlin.kapt" version "1.3.10"
-    id("org.jetbrains.dokka") version "1.4.10"
-    id("com.github.johnrengelman.shadow") version "6.1.0"
+    id("org.jetbrains.dokka") version "1.4.0"
+    id("com.github.johnrengelman.shadow") version "6.0.0"
 }
 
 // jitpack
 group = "com.github.kotlin_graphics"
 val moduleName = "$group.assimp"
 
-val kotestVersion = "4.2.5"
+val kotestVersion = "4.2.0"
 val kx = "com.github.kotlin-graphics"
 val unsignedVersion = "1e2fda82"
 val koolVersion = "b393e4c2"
@@ -52,7 +52,8 @@ dependencies {
         runtimeOnly("org.lwjgl", "lwjgl$it", classifier = lwjglNatives)
     }
 
-    implementation("io.github.microutils:kotlin-logging:1.7.8")
+//    implementation("io.github.microutils:kotlin-logging:1.7.8")
+    implementation("io.github.microutils:kotlin-logging-jvm:2.0.3")
     implementation("org.slf4j:slf4j-api:1.7.29")
 
     testImplementation("org.slf4j:slf4j-simple:1.7.29")

gradle.properties

@@ -8,4 +8,4 @@ unoVersion = d5c433de
 lwjglVersion = 3.2.3
 kotestVersion = 4.2.0
 
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g
+org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g -Xmx16g -XX:MaxPermSize=16g

src/main/java/module-info.java

@@ -10,7 +10,7 @@
     requires com.github.kotlin_graphics.kotlin_unsigned;
     requires com.github.kotlin_graphics.kool;
 
-    requires kotlin.logging;
+    requires kotlin.logging.jvm;
 
     exports assimp;
     exports assimp.format;

src/main/kotlin/assimp/format/obj/ObjFileImporter.kt

@@ -18,12 +18,11 @@ class ObjFileImporter : BaseImporter() {
             fileExtensions = listOf("obj"))
 
     /**  Returns true, if file is an obj file.  */
-    override fun canRead(file: String, ioSystem: IOSystem, checkSig: Boolean): Boolean {
-
-        if (!checkSig)   //Check File Extension
-            return file.substring(file.lastIndexOf('.') + 1) == "obj"
-        else //Check file Header
-            return false
+    override fun canRead(file: String, ioSystem: IOSystem, checkSig: Boolean): Boolean = when {
+        //Check File Extension
+        !checkSig -> file.substring(file.lastIndexOf('.') + 1) == "obj"
+        //Check file Header
+        else -> false
     }
 
     //  reference to load textures later
@@ -219,7 +218,7 @@ class ObjFileImporter : BaseImporter() {
         else if (pMesh.numVertices > AI_MAX_ALLOC(AiVector3D.size))
             throw Exception("OBJ:" + pModel.m_ModelName + " | " + pMesh.name + " --> Too many vertices, would run out of memory")
 
-        pMesh.vertices = MutableList(pMesh.numVertices, { AiVector3D() })
+        pMesh.vertices = MutableList(pMesh.numVertices) { AiVector3D() }
 
         // Allocate buffer for normal vectors
         if (pModel.m_Normals.isNotEmpty() && pObjMesh.m_hasNormals) {
@@ -232,7 +231,7 @@ class ObjFileImporter : BaseImporter() {
         // Allocate buffer for vertex-color vectors
 
         if (pModel.m_VertexColors.isNotEmpty())
-            pMesh.colors.add(Array(pMesh.numVertices, { AiColor4D() }).toMutableList())
+            pMesh.colors.add(Array(pMesh.numVertices) { AiColor4D() }.toMutableList())
         //pMesh.colors[0] = Array(pMesh.numVertices, { AiColor4D() }).toMutableList()
 
         // Allocate buffer for texture coordinates
@@ -284,7 +283,7 @@ class ObjFileImporter : BaseImporter() {
 
                 // Get destination face
                 val faceIndex = outIndex;
-                val pDestFace = pMesh.faces.getOrElse(faceIndex, { mutableListOf() })
+                val pDestFace = pMesh.faces.getOrElse(faceIndex) { mutableListOf() }
 
                 val last = vertexIndex == pSourceFace.m_vertices.lastIndex
 

src/test/kotlin/X/BCN_Epileptic.kt

@@ -1,7 +1,7 @@
 package X
 
 import assimp.*
-import io.kotlintest.specs.StringSpec
+import io.kotest.core.spec.style.StringSpec
 
 
 

src/test/kotlin/X/Testwuson.kt

@@ -1,7 +1,7 @@
 package X
 
 import assimp.*
-import io.kotlintest.specs.StringSpec
+import io.kotest.core.spec.style.StringSpec
 
 class Testwuson : StringSpec() {
     init {

src/test/kotlin/X/anim_test.kt

@@ -1,7 +1,7 @@
 package X
 
 import assimp.*
-import io.kotlintest.specs.StringSpec
+import io.kotest.core.spec.style.StringSpec
 
 class anim_test : StringSpec() {
 

src/test/kotlin/X/helpers.kt

@@ -3,12 +3,13 @@ package X
 import assimp.*
 import gli_.Cache
 import gli_.Texture
-import io.kotlintest.*
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNotBe
 
 val x = "$models/X/"
 val x_ass = "$models/models-assbin-db/X/"
 
-fun printNodeNames(n : AiNode, done : MutableList<AiNode> = MutableList<AiNode>(0, { AiNode() })) {
+fun printNodeNames(n : AiNode, done : MutableList<AiNode> = mutableListOf()) {
     println(n.name); done.add(n)
     for(a in n.children){
 //        if(a in done) {
@@ -251,7 +252,7 @@ fun compareAnimations(anim1: AiAnimation, anim2: AiAnimation) {
 fun compareMeshMorphAnim(a1: AiMeshMorphAnim, a2: AiMeshMorphAnim) {
     a1.name shouldBe a2.name
     a1.numKeys shouldBe a2.numKeys
-    for(i in 0 until a1.keys.size) {
+    for(i in a1.keys.indices) {
         compareMeshMorphKey(a1.keys[i], a2.keys[i])
     }
 }
@@ -265,7 +266,7 @@ fun compareMeshMorphKey(a1: AiMeshMorphKey, a2: AiMeshMorphKey) {
 
 fun compareIntArray(v1: IntArray, v2: IntArray) {
     v1.size shouldBe v2.size
-    for(i in 0 until v1.size) {
+    for(i in v1.indices) {
         v1[i] shouldBe v2[i]
     }
 }

src/test/kotlin/X/implementation_test.kt

@@ -2,9 +2,9 @@ package X
 
 import assimp.format.X.Pointer
 import assimp.format.X.XFileParser
-import io.kotlintest.specs.StringSpec
+import io.kotest.core.spec.style.StringSpec
 import assimp.format.X.fast_atoreal_move
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 
 class implementation_test : StringSpec() {
 

src/test/kotlin/X/kwxport_test_cubewithvcolors.kt

@@ -1,7 +1,7 @@
 package X
 
 import assimp.*
-import io.kotlintest.specs.StringSpec
+import io.kotest.core.spec.style.StringSpec
 
 class kwxport_test_cubewithvcolors : StringSpec() {
     init {