- fixed fucking tests

- md3 relies now on os-indipendent path separator char

Author: elect86

build.gradle

@@ -90,9 +90,9 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     from javadoc.destinationDir
 }
 
-test {
-	workingDir = "src/test/resources"
-}
+//test {
+//	workingDir = "src/test/resources"
+//}
 
 artifacts {
     archives sourcesJar

src/main/kotlin/assimp/DefaultIOSystem.kt

@@ -1,32 +1,33 @@
 package assimp
 
 import java.io.*
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
 
-class DefaultIOSystem : IOSystem{
+class DefaultIOSystem : IOSystem {
 
     override fun exists(pFile: String) = File(pFile).exists()
 
     override fun open(pFile: String): IOStream {
-        val file = File(pFile)
-        println(File(".").absolutePath)
-        if(!file.exists())
+
+        val path: Path = Paths.get(pFile)
+        if (!Files.exists(path))
             throw IOException("File doesn't exist: $pFile")
 
 
-        return FileIOStream(file)
+        return FileIOStream(path)
     }
 
-    class FileIOStream(val file: File) : IOStream{
-        override fun read() = FileInputStream(file)
+    class FileIOStream(override val path: Path) : IOStream {
 
-        override fun reader() = BufferedReader(FileReader(file))
+        override fun read() = FileInputStream(path.toFile())
 
-        override val path: String
-            get() = file.absolutePath
+        override fun reader() = BufferedReader(FileReader(path.toFile()))
 
         override val filename: String
-            get() = file.name
+            get() = path.fileName.toString()
 
-        override fun parentPath() = file.parentFile.absolutePath
+        override fun parentPath() = path.parent.toAbsolutePath().toString()
     }
 }

src/main/kotlin/assimp/IOStream.kt

@@ -2,10 +2,11 @@ package assimp
 
 import java.io.BufferedReader
 import java.io.InputStream
-import java.io.Reader
+import java.nio.file.Path
 
 interface IOStream {
-    val path : String
+
+    val path : Path
 
     val filename: String
 

src/main/kotlin/assimp/IOSystem.kt

@@ -4,11 +4,12 @@ import java.io.File
 
 /** Interface to the file system. */
 interface IOSystem {
+
     fun exists(pFile: String): Boolean
 
     fun open(pFile : String): IOStream
 
-    fun close(ioStream: IOStream) = Unit //unused ?
+    fun close(ioStream: IOStream) = Unit // TODO unused ?
 
-    fun getOsSeperator() = File.separator
+    fun getOsSeperator(): String = File.separator
 }

src/main/kotlin/assimp/Importer.kt

@@ -44,18 +44,16 @@ package assimp
 
 import assimp.format.ProgressHandler
 import glm_.BYTES
-import glm_.bool
 import glm_.i
-import glm_.mat4x4.Mat4
 import glm_.size
 import assimp.AiPostProcessSteps as Pps
-import uno.kotlin.uri
 import java.io.File
-import java.io.FileNotFoundException
 import java.net.URI
+import java.net.URL
 import java.nio.ByteBuffer
+import java.nio.file.Path
+import java.nio.file.Paths
 import kotlin.reflect.KMutableProperty0
-import kotlin.reflect.KMutableProperty1
 
 /** CPP-API: The Importer class forms an C++ interface to the functionality of the Open Asset Import Library.
  *
@@ -226,7 +224,10 @@ constructor() {
     /** Get the currently set progress handler  */
     val progressHandler get() = impl.progressHandler
 
-    fun readFile(uri: URI, flags: Int = 0) = readFile(uri.path, flags)
+    fun readFile(url: URL, flags: Int = 0) = readFile(url.toURI(), flags)
+    fun readFile(uri: URI, flags: Int = 0) = readFile(Paths.get(uri), flags)
+    fun readFile(path: Path, flags: Int = 0) = readFile(path.toAbsolutePath().toString(), flags)
+    fun readFile(file: String, flags: Int = 0) = readFile(file, ioHandler, flags)
 
     /** Reads the given file and returns its contents if successful.
      *
@@ -245,9 +246,6 @@ constructor() {
      *
      * @note Assimp is able to determine the file format of a file automatically.
      */
-    //fun readFile(file: URI, flags: Int = 0): AiScene? {
-    fun readFile(file: String, flags: Int = 0) = readFile(file, ioHandler, flags)
-
     fun readFile(file: String, ioSystem: IOSystem = this.ioHandler, flags: Int = 0): AiScene? {
 
         writeLogOpening(file)

src/main/kotlin/assimp/assimp.kt

@@ -3,7 +3,10 @@ package assimp
 import glm_.mat4x4.Mat4
 import glm_.vec3.Vec3
 import mu.KotlinLogging
+import java.net.URL
 import java.nio.ByteBuffer
+import java.nio.file.Path
+import java.nio.file.Paths
 import kotlin.math.abs
 
 val logger = KotlinLogging.logger {}

src/main/kotlin/assimp/format/md3/Md3Loader.kt

@@ -385,9 +385,9 @@ class Md3Importer : BaseImporter() {
 
         // get base path and file name
         // todo ... move to PathConverter
-        filename = this.file.substringAfterLast('/').toLowerCase()
-        val last = this.file.lastIndexOf('/')
-        path = if (last == -1) this.file else this.file.substring(0, last + 1)
+        filename = file.substringAfterLast(File.separatorChar).toLowerCase()
+        val last = file.lastIndexOf(File.separatorChar)
+        path = if (last == -1) file else file.substring(0, last + 1)
 
         // Load multi-part model file, if necessary
         if (configHandleMP && readMultipartFile()) return
@@ -522,7 +522,7 @@ class Md3Importer : BaseImporter() {
                 textureCoords.add(mutableListOf())
             }
 
-            // Fill in all pTriangles
+            // Fill in all triangles
             var iCurrent = 0
             for (i in 0 until surfaces.numTriangles) {
                 mesh.faces.add(MutableList(3, { 0 }))
@@ -749,7 +749,7 @@ class Md3Importer : BaseImporter() {
      *  @param fill Receives output information     */
     fun readShader(fill: Q3Shader.ShaderData) {
         // Determine Q3 model name from given path
-        val last = path.substring(0, path.length - 2).lastIndexOf('/')
+        val last = path.substring(0, path.length - 2).lastIndexOf(File.separatorChar)
         val modelFile = path.substring(last + 1, path.length - 1)
 
         // If no specific dir or file is given, use our default search behaviour

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

@@ -421,32 +421,34 @@ class ObjFileImporter : BaseImporter() {
                     val cleaned = name.substring(i) //  e.g: .\wal67ar_small.jpg -> wal67ar_small.jpg
 
                     if(ioSystem is DefaultIOSystem) {
+
                         //If the default io system is in place, we can use the java.io.File api and list directories
                         //to match files even where case is mangled
 
-                        val dios = ioSystem as DefaultIOSystem
-                        val actualFile = (dios.open(file) as DefaultIOSystem.FileIOStream).file
+                        val actualFile = (ioSystem.open(file) as DefaultIOSystem.FileIOStream).path.toFile()
 
-                        if (actualFile.parentFile.listFiles().any { it.name == cleaned }) {
+                        when {
+                            actualFile.parentFile.listFiles().any { it.name == cleaned } -> {
 
-                            val texFile = actualFile.parentFile.listFiles().first { it.name == cleaned }!!
-                            scene.textures[name] = gli.load(texFile.toPath())
+                                val texFile = actualFile.parentFile.listFiles().first { it.name == cleaned }!!
+                                scene.textures[name] = gli.load(texFile.toPath())
 
-                        } else if(actualFile.parentFile.listFiles().any { it.name.toUpperCase() == cleaned.toUpperCase() }){
-                            // try case insensitive
-                            val texFile = actualFile.parentFile.listFiles().first { it.name.toUpperCase() == cleaned.toUpperCase() }!!
-                            scene.textures[name] = gli.load(texFile.toPath())
+                            }
+                            actualFile.parentFile.listFiles().any { it.name.toUpperCase() == cleaned.toUpperCase() } -> {
+                                // try case insensitive
+                                val texFile = actualFile.parentFile.listFiles().first { it.name.toUpperCase() == cleaned.toUpperCase() }!!
+                                scene.textures[name] = gli.load(texFile.toPath())
 
-                        } else {
-                            logger.warn { "OBJ/MTL: Texture image not found --> " + cleaned }
+                            }
+                            else -> logger.warn { "OBJ/MTL: Texture image not found --> $cleaned" }
                         }
                     } else {
                         //no such luck with custom io systems i'm afraid
                         //TODO gli load from bytebuf ?
                     }
 
                 } else {
-                    logger.warn { "OBJ/MTL: Scene contains  --> " + name  + " already"}
+                    logger.warn { "OBJ/MTL: Scene contains  --> $name already" }
                 }
             }
         }

src/test/kotlin/X/BCN_Epileptic.kt

@@ -1,6 +1,7 @@
 package X
 
 import assimp.Importer
+import assimp.getResource
 import io.kotlintest.specs.StringSpec
 
 
@@ -11,7 +12,7 @@ class BCN_Epileptic : StringSpec() {
         val BCN_Epileptic = "BCN_Epileptic.X"
 
         BCN_Epileptic {
-            with(Importer().readFile(x + BCN_Epileptic)!!) {
+            with(Importer().readFile(getResource("$x/$BCN_Epileptic"))!!) {
                 println("Node names: ")
                 printNodeNames(rootNode)
                 with(rootNode) {

src/test/kotlin/X/Testwuson.kt

@@ -1,14 +1,15 @@
 package X
 
 import assimp.Importer
+import assimp.getResource
 import io.kotlintest.specs.StringSpec
 
 class Testwuson : StringSpec() {
     init {
         val testwuson = "Testwuson.X"
 
         testwuson {
-            with(Importer().readFile(x + testwuson)!!) {
+            with(Importer().readFile(getResource("$x/$testwuson"))!!) {
                 with(rootNode) {
                     X.printNodeNames(rootNode)
                 }