Fix JSON model root transforms (#9410)

This commit is contained in:
Dennis C authored and GitHub committed 2023-03-22 11:09:41 +01:00
1 parent c58d922324
commit 434c1ec4f8
5 files changed
+40 -20

No files matched your search

@@ -212,16 +212,9 @@ public final class TransformationHelper
elements.remove("origin");
}
if (!elements.isEmpty()) throw new JsonParseException("TRSR: can either have single 'matrix' key, or a combination of 'translation', 'rotation' OR 'left_rotation', 'scale', 'post-rotation' (legacy) OR 'right_rotation', 'origin'. Found: " + String.join(", ", elements));
Transformation matrix = new Transformation(translation, leftRot, scale, rightRot);
// Use a different origin if needed.
if (!TransformOrigin.CENTER.getVector().equals(origin))
{
Vector3f originFromCenter = new Vector3f(origin);
originFromCenter.sub(TransformOrigin.CENTER.getVector());
matrix = matrix.applyOrigin(originFromCenter);
}
return matrix;
Transformation matrix = new Transformation(translation, leftRot, scale, rightRot);
return matrix.applyOrigin(new Vector3f(origin));
}
private static Vector3f parseOrigin(JsonObject obj) {