⬆️

elect86 · elect86 · commit b396d33ef10e · 2018-04-23T14:12:31.000+02:00
Kotlin 1.2.40
Gradle 4.7
KotlinTest 3.0.4
Shadow Plugin 2.0.3
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ group = 'com.github.kotlin-graphics'
 
 buildscript {
 
-    ext.kotlinVersion = '1.2.40-eap-51'
+    ext.kotlinVersion = '1.2.40'
 
     repositories {
         jcenter()
@@ -20,7 +20,8 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.3'
+        classpath "org.junit.platform:junit-platform-gradle-plugin:1.1.0"
     }
 }
 
@@ -32,9 +33,9 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlin:kotlin-reflect"
 
-    implementation 'com.github.kotlin-graphics:uno-sdk:b885fad02bbcced22aa2ef4958050e871bc6e219'
+    implementation 'com.github.kotlin-graphics:uno-sdk:f97f9853e6158a86550268b63ad2800e0e08737f'
 
-    testCompile 'io.kotlintest:kotlintest:2.0.7'
+    testCompile 'io.kotlintest:kotlintest-runner-junit5:3.0.4'
 
     implementation 'io.github.microutils:kotlin-logging:1.4.6'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
diff --git a/src/main/kotlin/assimp/Importer.kt b/src/main/kotlin/assimp/Importer.kt
@@ -324,13 +324,12 @@ constructor() {
                     if (impl.scene == null) return null
                 }
             // Preprocess the scene and prepare it for post-processing
-//            if (profiler) { profiler ->
-//                BeginRegion("preprocess");
-//            }
+//            if (profiler) profiler.BeginRegion("preprocess")
+
             ScenePreprocessor.processScene(impl.scene!!)
-//            if (profiler) { profiler ->
-//                EndRegion("preprocess");
-//            }
+
+//            if (profiler) profiler.EndRegion("preprocess")
+
             // Ensure that the validation process won't be called twice
             applyPostProcessing(flags wo Pps.ValidateDataStructure)
         }
diff --git a/src/test/kotlin/X/helpers.kt b/src/test/kotlin/X/helpers.kt
@@ -3,7 +3,7 @@ package X
 import assimp.*
 import gli_.Cache
 import gli_.Texture
-import io.kotlintest.matchers.*
+import io.kotlintest.*
 
 val x = "$models/X/"
 val x_ass = "$models/models-assbin-db/X/"
diff --git a/src/test/kotlin/X/implementation_test.kt b/src/test/kotlin/X/implementation_test.kt
@@ -4,7 +4,7 @@ import assimp.format.X.Pointer
 import assimp.format.X.XFileParser
 import io.kotlintest.specs.StringSpec
 import assimp.format.X.fast_atoreal_move
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 
 class implementation_test : StringSpec() {
 
diff --git a/src/test/kotlin/assimp/blender/blenderDefault_250_compressed.kt b/src/test/kotlin/assimp/blender/blenderDefault_250_compressed.kt
@@ -6,7 +6,7 @@ import assimp.AiShadingMode
 import assimp.Importer
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import uno.kotlin.uri
 import uno.kotlin.url
 
diff --git a/src/test/kotlin/assimp/collada/animFullRot.kt b/src/test/kotlin/assimp/collada/animFullRot.kt
@@ -5,7 +5,7 @@ import assimp.Importer
 import glm_.mat4x4.Mat4
 import glm_.quat.Quat
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import java.net.URL
 
 object animFullRot {
diff --git a/src/test/kotlin/assimp/collada/cameras.kt b/src/test/kotlin/assimp/collada/cameras.kt
@@ -3,7 +3,7 @@ package assimp.collada
 import assimp.Importer
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 
 object cameras {
 
diff --git a/src/test/kotlin/assimp/collada/concavePoly.kt b/src/test/kotlin/assimp/collada/concavePoly.kt
@@ -4,7 +4,7 @@ import assimp.AiShadingMode
 import assimp.Importer
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 
 object concavePoly {
 
diff --git a/src/test/kotlin/assimp/fbx/animFullRot.kt b/src/test/kotlin/assimp/fbx/animFullRot.kt
@@ -4,7 +4,7 @@ import assimp.Importer
 import assimp.getResource
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 
 object animFullRot {
 
diff --git a/src/test/kotlin/assimp/fbx/concavePolygon.kt b/src/test/kotlin/assimp/fbx/concavePolygon.kt
@@ -5,7 +5,7 @@ import assimp.Importer
 import assimp.getResource
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 
 object concavePolygon {
 
diff --git a/src/test/kotlin/assimp/md2/faerie.kt b/src/test/kotlin/assimp/md2/faerie.kt
@@ -6,7 +6,7 @@ import assimp.Importer
 import assimp.getResource
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 
 object faerie {
 
diff --git a/src/test/kotlin/assimp/md3/europeanFnt.kt b/src/test/kotlin/assimp/md3/europeanFnt.kt
@@ -3,7 +3,7 @@ package assimp.md3
 import assimp.*
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 
 object europeanFnt {
 
diff --git a/src/test/kotlin/assimp/md3/watercan.kt b/src/test/kotlin/assimp/md3/watercan.kt
@@ -6,7 +6,7 @@ import assimp.Importer
 import assimp.getResource
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 
 object watercan {
 
diff --git a/src/test/kotlin/assimp/md5/boarMan.kt b/src/test/kotlin/assimp/md5/boarMan.kt
@@ -6,7 +6,7 @@ import assimp.Importer
 import assimp.getResource
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 
 object boarMan {
 
diff --git a/src/test/kotlin/assimp/md5/simpleCube.kt b/src/test/kotlin/assimp/md5/simpleCube.kt
@@ -6,7 +6,7 @@ import assimp.Importer
 import assimp.getResource
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 
 object simpleCube {
 
diff --git a/src/test/kotlin/assimp/obj/box.kt b/src/test/kotlin/assimp/obj/box.kt
@@ -3,7 +3,7 @@ package assimp.obj
 import assimp.*
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import uno.kotlin.uri
 import uno.kotlin.url
 
diff --git a/src/test/kotlin/assimp/obj/nanosuit.kt b/src/test/kotlin/assimp/obj/nanosuit.kt
@@ -3,7 +3,7 @@ package assimp.obj
 import assimp.*
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import java.util.*
 
 object nanosuit {
diff --git a/src/test/kotlin/assimp/obj/obj.kt b/src/test/kotlin/assimp/obj/obj.kt
@@ -8,6 +8,7 @@ class obj : StringSpec() {
     val path = "$models/OBJ/"
 
     init {
+        "wall"{ wall(path + "wall.obj") }
         "box"{ box(path + "box.obj") }
         "spider"{ spider(path + "spider.obj") }
         "nanosuit" { nanosuit(path + "nanosuit/nanosuit.obj") }
diff --git a/src/test/kotlin/assimp/obj/shelter.kt b/src/test/kotlin/assimp/obj/shelter.kt
@@ -3,7 +3,7 @@ package assimp.obj
 import assimp.*
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import java.io.File
 import java.net.URI
 
diff --git a/src/test/kotlin/assimp/obj/spider.kt b/src/test/kotlin/assimp/obj/spider.kt
@@ -6,7 +6,7 @@ import assimp.Importer
 import assimp.getResource
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import java.util.*
 
 object spider {
diff --git a/src/test/kotlin/assimp/obj/wall.kt b/src/test/kotlin/assimp/obj/wall.kt
@@ -0,0 +1,64 @@
+package assimp.obj
+
+import assimp.*
+import glm_.mat4x4.Mat4
+import glm_.vec3.Vec3
+import io.kotlintest.shouldBe
+
+object wall {
+
+    operator fun invoke(fileName: String) {
+
+        with(Importer().readFile(getResource(fileName))!!) {
+            println()
+//            with(rootNode) {
+//
+//                name shouldBe "box.obj"
+//                transformation shouldBe Mat4()
+//                numChildren shouldBe 1
+//
+//                with(children[0]) {
+//
+//                    name shouldBe "1"
+//                    transformation shouldBe Mat4()
+//                    numChildren shouldBe 0
+//                    numMeshes shouldBe 1
+//                    meshes[0] shouldBe 0
+//                }
+//                numMeshes shouldBe 0
+//            }
+//            numMeshes shouldBe 1
+//            with(meshes[0]) {
+//                primitiveTypes shouldBe AiPrimitiveType.POLYGON.i
+//                numVertices shouldBe 24
+//                numFaces shouldBe 6
+//
+//                vertices[0] shouldBe Vec3(-0.5, +0.5, +0.5)
+//                vertices[5] shouldBe Vec3(+0.5, -0.5, -0.5)
+//                vertices[10] shouldBe Vec3(+0.5, -0.5, -0.5)
+//                vertices[15] shouldBe Vec3(-0.5, +0.5, +0.5)
+//                vertices[20] shouldBe Vec3(+0.5, -0.5, -0.5)
+//                vertices[23] shouldBe Vec3(+0.5, -0.5, +0.5)
+//
+//                var i = 0
+//                faces.forEach {
+//                    it.size shouldBe 4
+//                    it shouldBe mutableListOf(i++, i++, i++, i++)
+//                }
+//            }
+//            with(materials[0]) {
+//                name shouldBe AI_DEFAULT_MATERIAL_NAME
+//                shadingModel shouldBe AiShadingMode.gouraud
+//                with(color!!) {
+//                    ambient shouldBe Vec3()
+//                    diffuse shouldBe Vec3(0.6)
+//                    specular shouldBe Vec3()
+//                    emissive shouldBe Vec3()
+//                    shininess shouldBe 0f
+//                    opacity shouldBe 1f
+//                    refracti shouldBe 1f
+//                }
+//            }
+        }
+    }
+}
diff --git a/src/test/kotlin/assimp/ply/cube.kt b/src/test/kotlin/assimp/ply/cube.kt
@@ -2,7 +2,7 @@ package assimp.ply
 
 import assimp.*
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import io.kotlintest.specs.StringSpec
 import java.util.*
 
diff --git a/src/test/kotlin/assimp/ply/ply.kt b/src/test/kotlin/assimp/ply/ply.kt
@@ -5,7 +5,7 @@ import assimp.AiShadingMode
 import assimp.Importer
 import assimp.models
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import io.kotlintest.specs.StringSpec
 import java.util.*
 
diff --git a/src/test/kotlin/assimp/ply/pond0.kt b/src/test/kotlin/assimp/ply/pond0.kt
@@ -2,7 +2,7 @@ package assimp.ply
 
 import assimp.*
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import io.kotlintest.specs.StringSpec
 import java.util.*
 
diff --git a/src/test/kotlin/assimp/ply/wuson.kt b/src/test/kotlin/assimp/ply/wuson.kt
@@ -2,7 +2,7 @@ package assimp.ply
 
 import assimp.*
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import io.kotlintest.specs.StringSpec
 import java.util.*
 
diff --git a/src/test/kotlin/assimp/stl/sphereWithHole.kt b/src/test/kotlin/assimp/stl/sphereWithHole.kt
@@ -6,7 +6,7 @@ import assimp.getResource
 import assimp.models
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import io.kotlintest.specs.StringSpec
 
 object sphereWithHole {
diff --git a/src/test/kotlin/assimp/stl/spiderBinary.kt b/src/test/kotlin/assimp/stl/spiderBinary.kt
@@ -6,7 +6,7 @@ import assimp.getResource
 import assimp.models
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import io.kotlintest.specs.StringSpec
 
 object spiderBinary {
diff --git a/src/test/kotlin/assimp/stl/triangle.kt b/src/test/kotlin/assimp/stl/triangle.kt
@@ -6,7 +6,7 @@ import assimp.getResource
 import assimp.models
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
-import io.kotlintest.matchers.shouldBe
+import io.kotlintest.shouldBe
 import io.kotlintest.specs.StringSpec
 
 object triangle {
diff --git a/src/test/resources/models/OBJ/wall.obj b/src/test/resources/models/OBJ/wall.obj
