From adc651eecc7d918ad3de1db739d9581ae01e1698 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 9 May 2023 22:52:17 +0200 Subject: [PATCH] aesthetically prodigious train man --- .../entity/item/RenderTrainCargoTram.java | 13 +++++++++---- .../assets/hbm/models/vehicles/tram.obj | 8 ++++---- .../hbm/textures/models/trains/tram.png | Bin 2686 -> 4395 bytes 3 files changed, 13 insertions(+), 8 deletions(-) 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 51683c6374206a1918939b0d9e0abd1958fa6def..58721d3169cdc745d701188a80a5bb51475d3641 100644 GIT binary patch delta 4385 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 b2^s$mWp7873x*KO00000NkvXXu0mjfl@)Nn delta 2662 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