GeyserMC-Mirror/Rainbow
1
0
Fork 0
mirror of https://github.com/GeyserMC/Rainbow.git synced 2025-12-19 14:59:16 +00:00
Code Issues Releases Activity

Update GeometryMapper to support new model rotation capabilities

Browse Source
This commit is contained in:
Eclipse
2025-11-12 14:03:16 +00:00
parent d452de0bf1
commit fc58393acc
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rainbow/src/main/java/org/geysermc/rainbow/mapping/geometry/GeometryMapper.java
View File

@@ -115,16 +115,23 @@ public class GeometryMapper {
// Same as above for inverting the X axis (thanks again Blockbench!!) // Same as above for inverting the X axis (thanks again Blockbench!!)
builder.withPivot(rotation.origin().div(0.0625F, new Vector3f()).sub(CENTRE_OFFSET).mul(-1.0F, 1.0F, 1.0F)); builder.withPivot(rotation.origin().div(0.0625F, new Vector3f()).sub(CENTRE_OFFSET).mul(-1.0F, 1.0F, 1.0F));
builder.withRotation(getBedrockRotation(rotation.value()));
// Same as above but for some reason the Z axis too (thanks again, so much, Blockbench!!!) // TODO translate rescale property?
Vector3f bedrockRotation = switch (rotation.axis()) {
case X -> new Vector3f(-rotation.angle(), 0.0F, 0.0F);
case Y -> new Vector3f(0.0F, rotation.angle(), 0.0F);
case Z -> new Vector3f(0.0F, 0.0F, -rotation.angle());
};
builder.withRotation(bedrockRotation);
} }
return builder; return builder;
} }
private static Vector3fc getBedrockRotation(BlockElementRotation.RotationValue rotation) {
// Same as in the method above, but for some reason the Z axis too: X and Z axes have to be inverted (thanks again, so much, Blockbench!!!)
return switch (rotation) {
case BlockElementRotation.EulerXYZRotation(float x, float y, float z) -> new Vector3f(-x, y, -z); // TODO check if these angle transformations are right, they should be
case BlockElementRotation.SingleAxisRotation(Direction.Axis axis, float angle) -> switch (axis) {
case X -> new Vector3f(-angle, 0.0F, 0.0F);
case Y -> new Vector3f(0.0F, angle, 0.0F);
case Z -> new Vector3f(0.0F, 0.0F, -angle);
};
default -> throw new IllegalArgumentException("Don't know how to transform rotation of type " + rotation.getClass() + " to bedrock rotation");
};
}
} }