From 4203e7426f9b1597e8e5d427f7fc8392317c67b8 Mon Sep 17 00:00:00 2001 From: Paul Fulham Date: Sun, 17 Sep 2017 19:28:11 -0700 Subject: [PATCH] Fix lightmap calculation vertex clamping (#4387) --- .../client/model/pipeline/VertexLighterSmoothAo.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterSmoothAo.java b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterSmoothAo.java index 397396e302..ebb894fb8a 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterSmoothAo.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterSmoothAo.java @@ -71,18 +71,15 @@ public class VertexLighterSmoothAo extends VertexLighterFlat float e1 = 1 + 1e-4f; if(ax > 2 - 1e-4f && ay <= e1 && az <= e1) { - if(x > -2 + 1e-4f) x = -2 + 1e-4f; - if(x < 2 - 1e-4f) x = 2 - 1e-4f; + x = x < 0 ? -2 + 1e-4f : 2 - 1e-4f; } else if(ay > 2 - 1e-4f && az <= e1 && ax <= e1) { - if(y > -2 + 1e-4f) y = -2 + 1e-4f; - if(y < 2 - 1e-4f) y = 2 - 1e-4f; + y = y < 0 ? -2 + 1e-4f : 2 - 1e-4f; } else if(az > 2 - 1e-4f && ax <= e1 && ay <= e1) { - if(z > -2 + 1e-4f) z = -2 + 1e-4f; - if(z < 2 - 1e-4f) z = 2 - 1e-4f; + z = z < 0 ? -2 + 1e-4f : 2 - 1e-4f; } ax = x > 0 ? x : -x; ay = y > 0 ? y : -y;