diff --git a/src/main/java/com/hbm/render/entity/item/RenderTrainCargoTram.java b/src/main/java/com/hbm/render/entity/item/RenderTrainCargoTram.java index 36a19e415..5612b2a93 100644 --- a/src/main/java/com/hbm/render/entity/item/RenderTrainCargoTram.java +++ b/src/main/java/com/hbm/render/entity/item/RenderTrainCargoTram.java @@ -16,11 +16,16 @@ public class RenderTrainCargoTram extends Render { GL11.glPushMatrix(); GL11.glTranslated(x, y, z); - GL11.glRotated( -entity.rotationYaw, 0, 1, 0); - GL11.glRotated(-entity.rotationPitch, 0, 0, 1); + float yaw = entity.rotationYaw; + float prevYaw = entity.prevRotationYaw; - MainRegistry.proxy.displayTooltip("Render Yaw: " + entity.rotationYaw, 666); - MainRegistry.proxy.displayTooltip("Render Pitch: " + entity.rotationPitch, 667); + if(yaw - prevYaw > 180) yaw -= 360; + if(prevYaw - yaw > 180) prevYaw -= 360; + + float yawInterp = prevYaw + (yaw - prevYaw) * interp - 720; + + GL11.glRotated(-yawInterp, 0, 1, 0); + GL11.glRotated(-entity.rotationPitch, 0, 0, 1); GL11.glDisable(GL11.GL_CULL_FACE); bindTexture(ResourceManager.train_tram); diff --git a/src/main/resources/assets/hbm/models/vehicles/tram.obj b/src/main/resources/assets/hbm/models/vehicles/tram.obj index 7ec0c8733..e8d11cf51 100644 --- a/src/main/resources/assets/hbm/models/vehicles/tram.obj +++ b/src/main/resources/assets/hbm/models/vehicles/tram.obj @@ -270,7 +270,7 @@ vt 0.777778 0.318182 vt 0.716049 0.500000 vt 0.716901 0.318679 vt 0.697531 0.500000 -vt 0.629630 0.534091 +vt 0.629630 0.522727 vt 0.629630 0.500000 vt 0.777778 0.522727 vt 0.716049 0.522727 @@ -278,7 +278,7 @@ vt 0.697531 0.318182 vt 0.796296 0.500000 vt 0.777778 0.500000 vt 0.864198 0.500000 -vt 0.796296 0.534091 +vt 0.796296 0.522727 vt 0.617284 0.454545 vt 0.604938 0.318182 vt 0.617284 0.318182 @@ -438,9 +438,9 @@ vt 0.222222 0.545455 vt 0.148148 0.772727 vt 0.271605 0.909091 vt 0.222222 0.545455 -vt 0.697531 0.534091 +vt 0.697531 0.522727 vt 0.796296 0.318182 -vt 0.864198 0.534091 +vt 0.864198 0.522727 vt 0.901235 0.477273 vt 0.901235 0.500000 vt 0.913580 0.613636 diff --git a/src/main/resources/assets/hbm/textures/models/trains/tram.png b/src/main/resources/assets/hbm/textures/models/trains/tram.png index 51683c637..58721d316 100644 Binary files a/src/main/resources/assets/hbm/textures/models/trains/tram.png and b/src/main/resources/assets/hbm/textures/models/trains/tram.png differ