Implement entity model part rotation (fixes rendering of pigs, villag…

…ers, etc)
stackotter · Jun 5, 2024 · 72bdb3f · 72bdb3f
1 parent a796dc8
commit 72bdb3f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/Sources/Core/Renderer/Mesh/BlockMeshBuilder.swift b/Sources/Core/Renderer/Mesh/BlockMeshBuilder.swift
@@ -199,7 +199,8 @@ struct BlockMeshBuilder {
       indices.append(
         contentsOf: geometry.indices.map { index in
           return index + startingIndex
-        })
+        }
+      )
     }
 
     let geometry = Geometry(vertices: vertices, indices: indices)

diff --git a/Sources/Core/Renderer/Mesh/EntityMeshBuilder.swift b/Sources/Core/Renderer/Mesh/EntityMeshBuilder.swift
@@ -24,24 +24,40 @@ public struct EntityMeshBuilder {
   func buildSubmodel(
     _ submodel: JSONEntityModel.Submodel,
     index: Int,
+    transformation: Mat4x4f = MatrixUtil.identity,
     into geometry: inout Geometry<EntityVertex>
   ) {
+    var transformation = transformation
+    if let rotation = submodel.rotate {
+      let translation = submodel.translate ?? .zero
+      transformation =
+        MatrixUtil.rotationMatrix(-MathUtil.radians(from: rotation))
+        * MatrixUtil.translationMatrix(translation)
+    }
+
     for box in submodel.boxes ?? [] {
       buildBox(
         box,
         color: index < Self.colors.count ? Self.colors[index] : [0.5, 0.5, 0.5],
+        transformation: transformation,
         into: &geometry
       )
     }
 
     for (nestedIndex, nestedSubmodel) in (submodel.submodels ?? []).enumerated() {
-      buildSubmodel(nestedSubmodel, index: nestedIndex, into: &geometry)
+      buildSubmodel(
+        nestedSubmodel,
+        index: nestedIndex,
+        transformation: transformation,
+        into: &geometry
+      )
     }
   }
 
   func buildBox(
     _ box: JSONEntityModel.Box,
     color: Vec3f,
+    transformation: Mat4x4f,
     into geometry: inout Geometry<EntityVertex>
   ) {
     var boxPosition = Vec3f(
@@ -61,8 +77,6 @@ public struct EntityMeshBuilder {
       boxSize += 2 * growth
     }
 
-    boxPosition = boxPosition / 16 + position
-    boxSize /= 16
     for direction in Direction.allDirections {
       // The index of the first vertex of this face
       let offset = UInt32(geometry.vertices.count)
@@ -72,7 +86,10 @@ public struct EntityMeshBuilder {
 
       let faceVertexPositions = CubeGeometry.faceVertices[direction.rawValue]
       for vertexPosition in faceVertexPositions {
-        let position = vertexPosition * boxSize + boxPosition
+        var position = vertexPosition * boxSize + boxPosition
+        position = (Vec4f(position, 1) * transformation).xyz
+        position /= 16
+        position += self.position
         let vertex = EntityVertex(
           x: position.x,
           y: position.y,

diff --git a/Sources/Core/Sources/Resources/Model/Entity/JSON/JSONEntityModel.swift b/Sources/Core/Sources/Resources/Model/Entity/JSON/JSONEntityModel.swift
@@ -10,7 +10,9 @@ public struct JSONEntityModel: Codable {
     public var id: String?
     public var invertAxis: String?
     public var mirrorTexture: String?
+    /// Translation to apply post-rotation (ignored if ``rotate`` is `nil`).
     public var translate: Vec3f?
+    /// Rotation in degrees.
     public var rotate: Vec3f?
     public var boxes: [Box]?
     public var submodels: [Submodel]?
@@ -42,7 +44,7 @@ public struct JSONEntityModel: Codable {
 
     var models: [Identifier: JSONEntityModel] = [:]
     for file in files where file.pathExtension == "jem" {
-      var identifier = Identifier(
+      let identifier = Identifier(
         namespace: namespace,
         name: file.deletingPathExtension().lastPathComponent
       )