From b0b66fc386d977c446513ae3bc4842edc8a5a581 Mon Sep 17 00:00:00 2001 From: qolq <5130165+qolq@users.noreply.github.com> Date: Fri, 14 Jan 2022 15:20:28 +0000 Subject: [PATCH] Fix Indigo UV rotation (#1945) * Fix Indigo UV rotation * Update MutableQuadView bakeFlags javadocs --- .../fabricmc/fabric/api/renderer/v1/mesh/MutableQuadView.java | 4 ++-- .../impl/client/indigo/renderer/helper/TextureHelper.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fabric-renderer-api-v1/src/main/java/net/fabricmc/fabric/api/renderer/v1/mesh/MutableQuadView.java b/fabric-renderer-api-v1/src/main/java/net/fabricmc/fabric/api/renderer/v1/mesh/MutableQuadView.java index d50764311..8b66476a3 100644 --- a/fabric-renderer-api-v1/src/main/java/net/fabricmc/fabric/api/renderer/v1/mesh/MutableQuadView.java +++ b/fabric-renderer-api-v1/src/main/java/net/fabricmc/fabric/api/renderer/v1/mesh/MutableQuadView.java @@ -45,7 +45,7 @@ public interface MutableQuadView extends QuadView { int BAKE_ROTATE_NONE = 0; /** - * Causes texture to appear rotated 90 deg. relative to nominal face. + * Causes texture to appear rotated 90 deg. clockwise relative to nominal face. * Pass in bakeFlags parameter to {@link #spriteBake(int, Sprite, int)}. */ int BAKE_ROTATE_90 = 1; @@ -57,7 +57,7 @@ public interface MutableQuadView extends QuadView { int BAKE_ROTATE_180 = 2; /** - * Causes texture to appear rotated 270 deg. relative to nominal face. + * Causes texture to appear rotated 270 deg. clockwise relative to nominal face. * Pass in bakeFlags parameter to {@link #spriteBake(int, Sprite, int)}. */ int BAKE_ROTATE_270 = 3; diff --git a/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/helper/TextureHelper.java b/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/helper/TextureHelper.java index 5b3e53d76..94c5c1b1c 100644 --- a/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/helper/TextureHelper.java +++ b/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/helper/TextureHelper.java @@ -91,7 +91,9 @@ public class TextureHelper { } } - private static final VertexModifier[] ROTATIONS = new VertexModifier[] { null, (q, i, t) -> q.sprite(i, t, q.spriteV(i, t), q.spriteU(i, t)), //90 + private static final VertexModifier[] ROTATIONS = new VertexModifier[] { + null, + (q, i, t) -> q.sprite(i, t, q.spriteV(i, t), 1 - q.spriteU(i, t)), //90 (q, i, t) -> q.sprite(i, t, 1 - q.spriteU(i, t), 1 - q.spriteV(i, t)), //180 (q, i, t) -> q.sprite(i, t, 1 - q.spriteV(i, t), q.spriteU(i, t)) // 270 };