From d1724fa307dc6e540fd0691f62da8b23cd3ad151 Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 30 Apr 2018 11:49:29 +0200 Subject: [PATCH] Rendering is super annoying, I agree >.> --- .../minelittlepony/model/AbstractPonyModel.java | 7 +++++-- .../minelittlepony/render/plane/ModelPlane.java | 16 ++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java index ce81c541..a3b667f6 100644 --- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java @@ -71,6 +71,9 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel { @Override public void setRotationAngles(float move, float swing, float age, float headYaw, float headPitch, float scale, Entity entity) { + this.boxList.clear(); + this.init(0, 0); + super.setRotationAngles(move, swing, age, headYaw, headPitch, scale, entity); float headRotateAngleY = isSleeping ? 1.4f : headYaw / 57.29578F; @@ -490,8 +493,8 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel { .tex(36, 16) .addBackPlane(-4, -4, 8, 8, 4, stretch) .addBackPlane(-4, 0, 8, 8, 4, stretch) .addBottomPlane(-4, 4, 4, 8, 4, stretch) - .flipZ().tex(24, 0).addWestPlane(-4, -4, -4, 8, 8, stretch) - .tex(32, 20).addTopPlane(-4, -4, -4, 8, 12, stretch) + .flipZ().tex(32, 20).addTopPlane(-4, -4, -4, 8, 12, stretch) + .tex(24, 0).addWestPlane(-4, -4, -4, 8, 8, stretch) .tex(4, 0) .addWestPlane(-4, -4, 4, 8, 4, stretch) // Tail stub .child(0) diff --git a/src/main/java/com/minelittlepony/render/plane/ModelPlane.java b/src/main/java/com/minelittlepony/render/plane/ModelPlane.java index 0d713740..ebf41c03 100644 --- a/src/main/java/com/minelittlepony/render/plane/ModelPlane.java +++ b/src/main/java/com/minelittlepony/render/plane/ModelPlane.java @@ -42,14 +42,14 @@ public class ModelPlane extends Box { } // w:west e:east d:down u:up s:south n:north - Vertex wds = vert(xMin , yMin , zMin , 0, 0); - Vertex eds = vert(xMax, yMin , zMin , 0, 8); - Vertex eus = vert(xMax, yMax, zMin , 8, 8); - Vertex wus = vert(xMin , yMax, zMin , 8, 0); - Vertex wdn = vert(xMin , yMin , zMax, 0, 0); - Vertex edn = vert(xMax, yMin , zMax, 0, 8); + Vertex wds = vert(xMin, yMin, zMin, 0, 0); + Vertex eds = vert(xMax, yMin, zMin, 0, 8); + Vertex eus = vert(xMax, yMax, zMin, 8, 8); + Vertex wus = vert(xMin, yMax, zMin, 8, 0); + Vertex wdn = vert(xMin, yMin, zMax, 0, 0); + Vertex edn = vert(xMax, yMin, zMax, 0, 8); Vertex eun = vert(xMax, yMax, zMax, 8, 8); - Vertex wun = vert(xMin , yMax, zMax, 8, 0); + Vertex wun = vert(xMin, yMax, zMax, 8, 0); if (face == Face.EAST) { quad = quad(textureX, d, textureY, h, edn, eds, eus, eun); @@ -58,7 +58,7 @@ public class ModelPlane extends Box { quad = quad(textureX, d, textureY, h, wds, wdn, wun, wus); } if (face == Face.UP) { - quad = quad(textureX, w, textureY, h, edn, wdn, wds, eds); + quad = quad(textureX, w, textureY, d, edn, wdn, wds, eds); } if (face == Face.DOWN) { quad = quad(textureX, w, textureY, d, eus, wus, wun, eun);