more small track rendering improvements

EternalBlueFlame · Oct 12, 2023 · f6530f1 · f6530f1
1 parent a3d9a96
commit f6530f1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/src/main/java/ebf/tim/render/models/Model1x1Rail.java b/src/main/java/ebf/tim/render/models/Model1x1Rail.java
@@ -108,8 +108,8 @@ public static void Model3DRail(World world, int xPos, int yPos, int zPos, RailSh
         //renders the rails, also defines min and max width
         //GL11.glEnable(GL11.GL_NORMALIZE);
         GL11.glPushMatrix();
-        GL11.glColor4f(1,1,1,1);
         GL11.glDisable(GL_TEXTURE_2D);
+        GL11.glColor4f(1,1,1,1);
         switch (ClientProxy.railSkin){
             case 0:{ModelRail.modelPotatoRail(shape, shape.renderScale, colors); break;}
             case 1:{ModelRail.modelExtrudedRail(shape, shape.renderScale, colors); break;}
@@ -138,9 +138,7 @@ public static void Model3DRail(World world, int xPos, int yPos, int zPos, RailSh
             GL11.glPushMatrix();
             if(ClientProxy.railSkin==0){
                 ModelTies.modelPotatoTies(BlockRailCore.getShape(world,xPos,yPos,zPos),  maxWidth, minWidth, shape.renderScale, shape.ties);
-            } else if (ClientProxy.railSkin<3) {
-                ModelTies.model3DTies(BlockRailCore.getShape(world, xPos, yPos, zPos), maxWidth, minWidth, shape.renderScale, shape.ties);
-            } else if (ClientProxy.railSkin==3) {
+            } if (ClientProxy.railSkin==3) {
                 ModelTies.modelHDTies(BlockRailCore.getShape(world, xPos, yPos, zPos), maxWidth, minWidth, shape.renderScale, shape.ties, colors);
             } else {
                 ModelTies.model3DTies(BlockRailCore.getShape(world,xPos,yPos,zPos), maxWidth, minWidth, shape.renderScale, shape.ties);

diff --git a/src/main/java/ebf/tim/render/models/ModelRail.java b/src/main/java/ebf/tim/render/models/ModelRail.java
@@ -104,7 +104,6 @@ public static void model3DRail(RailShapeCore shape, float scale,  int[] color) {
         GL11.glTranslated(0, 0.225*scale, 0);
 
         for(float rail : shape.getGaugePositions()) {
-            GL11.glPushMatrix();
             centerShading(rail,color,20,true);
             drawFace(shape.activePath, rail, 0.0625f, 0,0,0, scale);
             drawFace(shape.activePath, rail, 0.0625f, 0.0625f,-0.025f,0, scale);
@@ -186,7 +185,6 @@ public static void model3DRail(RailShapeCore shape, float scale,  int[] color) {
                 Tessellator.getInstance().draw();
 
             }
-            GL11.glPopMatrix();
         }
     }
 
@@ -196,7 +194,6 @@ public static void modelHDRail(RailShapeCore shape, float scale, int[] color) {
 
         for(float rail : shape.getGaugePositions()) {
             rail = rail * 1.0625f;
-            GL11.glPushMatrix();
             railShading(rail,color, 33, 43, 58, true);
             drawFace(shape.activePath, rail, -0.0125f,-0.021875f,0,0, scale);//railhead top dull
 
@@ -281,7 +278,6 @@ public static void modelHDRail(RailShapeCore shape, float scale, int[] color) {
                 Tessellator.getInstance().draw();
 
             }
-            GL11.glPopMatrix();
         }
     }
 }
diff --git a/src/main/java/fexcraft/tmt/slim/Tessellator.java b/src/main/java/fexcraft/tmt/slim/Tessellator.java
@@ -2,15 +2,9 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ebf.tim.utility.DebugUtil;
-import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Vec3;
 import org.lwjgl.opengl.GL11;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
 * @Author EternalBlueFlame
 *