Model viewer: .bsp: models:

working on fixing the origin

Author: demoth

cake-model-viewer/src/main/kotlin/org/demoth/cake/modelviewer/BspLoader.kt

@@ -18,20 +18,22 @@ import java.nio.ByteBuffer
 private const val prefix = "/home/daniil/GameDev/quake/q2/quake2/baseq2/textures/"
 
 class BspLoader {
-    fun loadBspModelTextured(file: File): ModelInstance {
+    fun loadBspModelTextured(file: File): List<ModelInstance> {
+        val result = mutableListOf<ModelInstance>()
         val bsp = Bsp(ByteBuffer.wrap(file.readBytes()))
-
-        val modelBuilder = ModelBuilder()
-        modelBuilder.begin()
+        val palette = readPaletteFile(Gdx.files.internal("q2palette.bin").read())
 
         // split all faces by texture name
 
         bsp.models.forEach { model ->
+            val modelBuilder = ModelBuilder()
+            modelBuilder.begin()
+
+
             val modelFaces = (0..<model.faceCount).map { it + model.firstFace }.map { bsp.faces[it] }
 
             val facesByTexture = modelFaces.groupBy { bsp.textures[it.textureInfoIndex].name }
 
-            val palette = readPaletteFile(Gdx.files.internal("q2palette.bin").read())
             facesByTexture.forEach { (textureName, faces) ->
                 val walTexture = WAL(findFile(textureName).readBytes())
                 val texture = Texture(WalTextureData(fromWal(walTexture, palette)))
@@ -87,9 +89,13 @@ class BspLoader {
 
             }
 
+            val instance = ModelInstance(modelBuilder.end())
+            val origin = (model.maxs - model.mins).times(0.5f)
+            instance.transform.translate(origin.x, origin.y, origin.z)
+            result.add(instance)
+
         }
-        val model = modelBuilder.end()
-        return ModelInstance(model)
+        return result
     }
 
     private fun findFile(textureName: String): File {

cake-model-viewer/src/main/kotlin/org/demoth/cake/modelviewer/CakeModelViewer.kt

@@ -65,7 +65,7 @@ class CakeModelViewer(val args: Array<String>) : ApplicationAdapter() {
             }
             "bsp" -> {
 //                models.add(BspLoader().loadBSPModelWireFrame(file).transformQ2toLibgdx())
-                models.add(BspLoader().loadBspModelTextured(file).transformQ2toLibgdx())
+                models.addAll(BspLoader().loadBspModelTextured(file).map { it.transformQ2toLibgdx(); it })
                 models.add(createOriginArrows(GRID_SIZE))
                 models.add(createGrid(GRID_SIZE, GRID_DIVISIONS))
             }

qcommon/src/main/kotlin/jake2/qcommon/filesystem/bsp.kt

@@ -124,7 +124,7 @@ class Bsp(buffer: ByteBuffer) {
                     mins = Vector3f(buffer.getFloat(), buffer.getFloat(), buffer.getFloat()),
                     maxs = Vector3f(buffer.getFloat(), buffer.getFloat(), buffer.getFloat()),
                     origin = Vector3f(buffer.getFloat(), buffer.getFloat(), buffer.getFloat()),
-                    head = buffer.getInt(),
+                    headNode = buffer.getInt(),
                     firstFace = buffer.getInt(),
                     faceCount = buffer.getInt()
                 )
@@ -208,7 +208,7 @@ data class BspModel(
     val mins: Vector3f,
     val maxs: Vector3f,
     val origin: Vector3f,
-    val head: Int,
+    val headNode: Int,
     val firstFace: Int, // unsigned
     val faceCount: Int, // unsigned
 )