Merge branch 'model_scale_fixes' into integration

TeamOpenIndustry · Sep 13, 2023 · 003279b · 003279b
2 parents 9fb8130 + 27a7d7c
commit 003279b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/main/java/cam72cam/immersiverailroading/model/StockModel.java b/src/main/java/cam72cam/immersiverailroading/model/StockModel.java
@@ -332,6 +332,7 @@ public float getRearYaw(EntityMoveableRollingStock stock) {
     }
 
     protected void postRender(ENTITY stock, RenderState state) {
+        state.scale(stock.gauge.scale(), stock.gauge.scale(), stock.gauge.scale());
         state.rotate(sway.getRollDegrees(stock), 1, 0, 0);
         controls.forEach(c -> c.postRender(stock, state));
         doors.forEach(c -> c.postRender(stock, state));

diff --git a/src/main/java/cam72cam/immersiverailroading/model/part/Control.java b/src/main/java/cam72cam/immersiverailroading/model/part/Control.java
@@ -239,12 +239,8 @@ public void postRender(T stock, RenderState state) {
             }
         }
 
-        Matrix4 m = new Matrix4().scale(stock.gauge.scale(), stock.gauge.scale(), stock.gauge.scale());
-        Matrix4 gm = this.state.getGroupMatrix(stock, modelId);
-        if (gm != null) {
-            m = m.multiply(gm);
-        }
-        Vec3d pos = m.apply(center);
+        Matrix4 m = this.state.getGroupMatrix(stock, modelId);
+        Vec3d pos = m == null ? center : m.apply(center);
         String labelstate = "";
         float percent = getValue(stock) - offset;
         switch (part.type) {

diff --git a/src/main/java/cam72cam/immersiverailroading/model/part/LightFlare.java b/src/main/java/cam72cam/immersiverailroading/model/part/LightFlare.java
@@ -143,7 +143,7 @@ public void postRender(T stock, RenderState state) {
             return;
         }
 
-        Vec3d flareOffset = new Vec3d(forward ? component.min.x - 0.02 : component.max.x + 0.02, (component.min.y + component.max.y) / 2, (component.min.z + component.max.z) / 2);//.scale(stock.gauge.scale());
+        Vec3d flareOffset = new Vec3d(forward ? component.min.x - 0.02 : component.max.x + 0.02, (component.min.y + component.max.y) / 2, (component.min.z + component.max.z) / 2);;
         if (location != null) {
             // TODO this does not actually work
             Matrix4 m = location.apply(stock);
@@ -169,9 +169,9 @@ public void postRender(T stock, RenderState state) {
 
         if (intensity > 0.01) {
             RenderState matrix = state.clone();
-            matrix.translate(flareOffset.x - (intensity / 2 /* * stock.gauge.scale()*/)*(forward ? 3 : -3), flareOffset.y, flareOffset.z);
+            matrix.translate(flareOffset.x - (intensity / 2)*(forward ? 3 : -3), flareOffset.y, flareOffset.z);
             matrix.rotate(90, 0, 1, 0);
-            double scale = Math.max((component.max.z - component.min.z) * 0.5, intensity * 2) /* * stock.gauge.scale()*/;
+            double scale = Math.max((component.max.z - component.min.z) * 0.5, intensity * 2);
             matrix.scale(scale, scale, scale);
             if (!forward) {
                 matrix.rotate(180, 0, 1, 0);
@@ -190,7 +190,7 @@ public void postRender(T stock, RenderState state) {
         RenderState matrix = state.clone();
         matrix.translate(flareOffset.x, flareOffset.y, flareOffset.z);
         matrix.rotate(90, 0, 1, 0);
-        double scale = (component.max.z - component.min.z) / 1.5 /* * stock.gauge.scale()*/;
+        double scale = (component.max.z - component.min.z) / 1.5;
         matrix.scale(scale, scale, scale);
         if (!forward) {
             matrix.rotate(180, 0, 1, 0);