- moved everything from default package

Author: elect86

build.gradle.kts

@@ -31,7 +31,7 @@ dependencies {
     testCompile("io.kotlintest:kotlintest:1.3.5")
 //    testCompile("io.kotlintest:kotlintest:2.0-SNAPSHOT")
     compile("com.github.elect86:kotlin-unsigned:-SNAPSHOT")
-    compile("com.github.elect86:glm:245ba298c4")
+    compile("com.github.elect86:glm:30982dc750")
 }
 
 allprojects {

src/main/kotlin/collada/ColladaLoader.kt

@@ -1,19 +1,11 @@
-package collada
+package format.collada
 
 /**
  * Created by elect on 23/01/2017.
  */
 
-import AiLightSourceType
-import AiColor3D
-import AiColor4D
-import AiVector3D
-import java.nio.ByteBuffer
-import AiUVTransform
-import com.sun.deploy.xml.XMLNode
 import i
-import org.w3c.dom.Element
-
+import main.*
 import org.w3c.dom.Node as XmlNode
 
 /** Collada file versions which evolved during the years ...  */

src/main/kotlin/collada/ColladaHelper.kt renamed to src/main/kotlin/format/collada/ColladaHelper.kt

@@ -0,0 +1,125 @@
+package format.collada
+
+import main.BaseImporter
+import java.net.URI
+import main.AiScene
+import main.AiMesh
+import main.AiMaterial
+import main.*
+
+/**
+ * Created by elect on 23/01/2017.
+ */
+
+class ColladaLoader : BaseImporter() {
+
+    companion object {
+
+        val desc = AiImporterDesc(
+                mName = "Collada Importer",
+                mComments = "http://collada.org",
+                mFlags = main.AiImporterFlags.SupportTextFlavour.i,
+                mMinMajor = 1, mMinMinor = 3,
+                mMaxMajor = 1, mMaxMinor = 5,
+                mFileExtensions = "dae"
+        )
+    }
+
+    /** Filename, for a verbose error message */
+    lateinit var mFileName: URI
+
+    /** Which mesh-material compound was stored under which mesh ID */
+    val mMeshIndexByID = mutableMapOf<ColladaMeshIndex, Int>()
+
+    /** Which material was stored under which index in the scene */
+    val mMaterialIndexByName = mutableMapOf<String, Int>()
+
+    /** Accumulated meshes for the target scene */
+    val mMeshes = ArrayList<AiMesh>()
+
+    /** Temporary material list */
+    val newMats = ArrayList<Pair<Effect, AiMaterial>>()
+
+    /** Temporary camera list */
+    val mCameras = ArrayList<AiCamera>()
+
+    /** Temporary light list */
+    val mLights = ArrayList<AiLightSourceType>()
+
+    /** Temporary texture list */
+    val mTextures = ArrayList<AiTexture>()
+
+    /** Accumulated animations for the target scene */
+//    val mAnims = ArrayList<AiAnimation>()
+
+    val noSkeletonMesh = false
+    val ignoreUpDirection = false
+
+    /** Used by FindNameForNode() to generate unique node names */
+    val mNodeNameCounter = 0
+
+    // ------------------------------------------------------------------------------------------------
+    // Returns whether the class can handle the format of the given file.
+    override fun canRead(pFile: URI, checkSig: Boolean): Boolean {
+
+        // check file extension
+        val extension = pFile.s.substring(pFile.s.lastIndexOf('.') + 1)
+
+        if (extension == "dae")
+            return true
+
+        // XML - too generic, we need to open the file and search for typical keywords
+        if (extension == "xml" || extension.isEmpty() || checkSig) {
+            //TODO
+        }
+        return false
+    }
+
+    // ------------------------------------------------------------------------------------------------
+    // Imports the given file into the given scene structure.
+    override fun internReadFile(pFile: URI, pScene: AiScene) {
+
+        mFileName = pFile
+
+        // parse the input file
+        val parser = ColladaParser(pFile)
+
+        if (parser.mRootNode == null)
+            throw Error("Collada: File came out empty. Something is wrong here.")
+
+        // create the materials first, for the meshes to find
+        buildMaterials(parser)
+    }
+
+    /** Constructs materials from the collada material definitions  */
+    protected fun buildMaterials(pParser: ColladaParser) = pParser.mMaterialLibrary.forEach { id, material ->
+
+        // a material is only a reference to an effect
+        pParser.mEffectLibrary[material.mEffect]?.let { effect ->
+
+            // create material
+            val mat = AiMaterial(name = if (material.mName.isEmpty()) id else material.mName)
+
+            // store the material
+//            mMaterialIndexByName[matIt->first] = newMats.size();
+//            newMats.push_back(std::pair < Collada::Effect *, aiMaterial * >(& effect, mat) );
+        }
+    }
+
+
+    class ColladaMeshIndex(
+
+            var mMeshID: String = "",
+            var mSubMesh: Int = 0,
+            var mMaterial: String = "") {
+
+        operator fun compareTo(p: ColladaMeshIndex): Int =
+                if (mMeshID == p.mMeshID)
+                    if (mSubMesh == p.mSubMesh)
+                        mMaterial.compareTo(p.mMaterial)
+                    else
+                        mSubMesh.compareTo(p.mSubMesh)
+                else
+                    mMeshID.compareTo(p.mMeshID)
+    }
+}