jvm-graphics-labs
diff --git a/‎build.gradle
Copy file name to clipboardExpand all lines: build.gradle
+1-1Lines changed: 1 addition & 1 deletion b/‎build.gradle
Copy file name to clipboardExpand all lines: build.gradle
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/kotlin/learnOpenGL/common/Model.kt
Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/common/Model.kt
+19-5Lines changed: 19 additions & 5 deletions b/‎src/main/kotlin/learnOpenGL/common/Model.kt
Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/common/Model.kt
+19-5Lines changed: 19 additions & 5 deletions
diff --git a/‎src/main/kotlin/learnOpenGL/common/mesh.kt
Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/common/mesh.kt
+5Lines changed: 5 additions & 0 deletions b/‎src/main/kotlin/learnOpenGL/common/mesh.kt
Copy file name to clipboardExpand all lines: src/main/kotlin/learnOpenGL/common/mesh.kt
+5Lines changed: 5 additions & 0 deletions
@@ -25,7 +25,7 @@ dependencies {
     compile 'com.github.kotlin-graphics:glm:4711d0f44930262d53f4c3b9a799edb4f6a4401d'
     compile 'com.github.kotlin-graphics:gli:4f94c22fac4a6fad4cf84a8d3a436b2ade10453c'
     compile 'com.github.kotlin-graphics:uno-sdk:3faa2cb28044564b80e8e2d2b4342a007142a083'
-    compile 'com.github.java-graphics:assimp:v0.12'
+    compile 'com.github.java-graphics:assimp:ab7cf7e5a6ead86e3ef726e17b053164b3312f1c'
 
 //    testCompile("io.kotlintest:kotlintest:2.0.0")
 
 
@@ -1,10 +1,7 @@
 package learnOpenGL.common
 
-import assimp.AiMesh
-import assimp.AiNode
-import assimp.Importer
+import assimp.*
 import assimp.AiPostProcessSteps.*
-import assimp.AiScene
 import glm.vec2.Vec2
 
 /**
@@ -20,7 +17,7 @@ class Model(path: String, val gammaCorrection: Boolean = false) {
     init {
         // Read file via ASSIMP
         val importer = Importer()
-        val scene = importer.readFile(this::class.java, "objects/nanosuit/nanosuit.obj", Triangulate.i or FlipUVs.i or CalcTangentSpace.i)
+        val scene = importer.readFile(this::class.java, path, Triangulate.i or FlipUVs.i or CalcTangentSpace.i)
         // Check for errors
         if (scene == null) // if is Not Zero
 //        if(!scene || scene->mFlags & AI_SCENE_FLAGS_INCOMPLETE || !scene->mRootNode) // if is Not Zero
@@ -33,6 +30,9 @@ class Model(path: String, val gammaCorrection: Boolean = false) {
 //
 //        // Process ASSIMP's root node recursively
         processNode(scene.mRootNode, scene)
+
+        // Load all Diffuse, Specular, Normal and Height maps
+
     }
 
     /** Processes a node in a recursive fashion. Processes each individual mesh located at the node and repeats this
@@ -52,6 +52,7 @@ class Model(path: String, val gammaCorrection: Boolean = false) {
         // Data to fill
         val vertices = ArrayList<Vertex>()
         val indices = ArrayList<Int>()
+        val textures = ArrayList<Texture>()
 
         // Walk through each of the mesh's vertices
         for (i in 0 until mesh.mNumVertices)
@@ -86,6 +87,19 @@ class Model(path: String, val gammaCorrection: Boolean = false) {
                 Specular: texture_specularN
                 Normal: texture_normalN */
 
+            // Load all Diffuse, Specular, Normal and Height maps
+            textures.addAll(loadMaterialTextures(material, AiTexture.Type.diffuse, "texture_diffuse"))
         }
     }
+
+    /**
+     * Checks all material textures of a given type and loads the textures if they're not loaded yet.
+     * The required info is returned as a Texture struct.
+     */
+    fun loadMaterialTextures(mat: AiMaterial, type: AiTexture.Type, typeName: String): List<Texture> {
+
+        val textures = ArrayList<Texture>()
+
+
+    }
 }
@@ -19,4 +19,9 @@ class Vertex(
         // Bitangent
         val bitangent: Vec3)
 
+class Texture(
+        val id: Int,
+        val type: String,
+        val path: String)
+
 class mesh