fix yaw, pitch, roll

Geodan · Jun 10, 2024 · 89e5b67 · 89e5b67
1 parent 6ec7fd2
commit 89e5b67
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/TileHandler.cs b/src/TileHandler.cs
@@ -135,6 +135,8 @@ private static byte[] GetGpuGlb(object model, List<Instance> positions, bool Use
             m4.M13 = forward.X;
             m4.M23 = forward.Y;
             m4.M33 = forward.Z;
+
+            var instanceQuaternion = Quaternion.CreateFromYawPitchRoll((float)p.Yaw, (float)p.Pitch, (float)p.Roll);
             var res = Quaternion.CreateFromRotationMatrix(m4);
 
             var position = new Vector3((float)p1.X, (float)p1.Y, (float)p1.Z);
@@ -147,12 +149,9 @@ private static byte[] GetGpuGlb(object model, List<Instance> positions, bool Use
 
             var position2 = position - translation;
 
-            // todo: use quaternion for yaw/pitch/roll
-            // var quaternion = Quaternion.CreateFromYawPitchRoll((float)p.Yaw, (float)p.Pitch, (float)p.Roll);
-
             var transformation = new AffineTransform(
                 scale,
-                new Quaternion(-res.X, -res.Z, res.Y, res.W),
+                new Quaternion(-res.X, -res.Z, res.Y, res.W) * instanceQuaternion,
                 position2);
             var json = "{\"_FEATURE_ID_0\":" + pointId + "}";
             sceneBuilder.AddRigidMesh(meshBuilder, transformation).WithExtras(JsonNode.Parse(json));