Merge pull request #1947 from EverMine/rendering_fix

Replace manual matrix restoration in haze and radiation fog particle renderers to glPushMatrix and glPopMatrix
HbmMods · Feb 20, 2025 · 4fd9d5b · 4fd9d5b
2 parents 4c82dfc + a5fa13c
commit 4fd9d5b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/src/main/java/com/hbm/particle/ParticleHaze.java b/src/main/java/com/hbm/particle/ParticleHaze.java
@@ -21,8 +21,8 @@
 public class ParticleHaze extends EntityFX {
 
 	private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/particle/haze.png");
-	private TextureManager theRenderEngine;
-	private int maxAge;
+	private final TextureManager theRenderEngine;
+	private final int maxAge;
 
 	public ParticleHaze(TextureManager p_i1213_1_, World p_i1218_1_, double p_i1218_2_, double p_i1218_4_, double p_i1218_6_) {
 		super(p_i1218_1_, p_i1218_2_, p_i1218_4_, p_i1218_6_);
@@ -94,6 +94,7 @@ public void renderParticle(Tessellator tess, float p_70539_2_, float p_70539_3_,
 
 		Random rand = new Random(50);
 
+		GL11.glPushMatrix();
 		for(int i = 0; i < 25; i++) {
 
 			double dX = rand.nextGaussian() * 2.5D;
@@ -115,9 +116,8 @@ public void renderParticle(Tessellator tess, float p_70539_2_, float p_70539_3_,
 			tess.addVertexWithUV((double) (pX + p_70539_3_ * size + p_70539_6_ * size), (double) (pY + p_70539_4_ * size), (double) (pZ + p_70539_5_ * size + p_70539_7_ * size), 0, 0);
 			tess.addVertexWithUV((double) (pX + p_70539_3_ * size - p_70539_6_ * size), (double) (pY - p_70539_4_ * size), (double) (pZ + p_70539_5_ * size - p_70539_7_ * size), 0, 1);
 			tess.draw();
-
-			GL11.glTranslatef((float) -dX, (float) -dY, (float) -dZ);
 		}
+		GL11.glPopMatrix();
 
 		GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
 		GL11.glDisable(GL12.GL_RESCALE_NORMAL);

diff --git a/src/main/java/com/hbm/particle/ParticleRadiationFog.java b/src/main/java/com/hbm/particle/ParticleRadiationFog.java
@@ -21,14 +21,14 @@
 public class ParticleRadiationFog extends EntityFX {
 
 	private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/particle/fog.png");
-	private TextureManager theRenderEngine;
+	private final TextureManager theRenderEngine;
 	private int maxAge;
 
 	public ParticleRadiationFog(TextureManager p_i1213_1_, World p_i1218_1_, double p_i1218_2_, double p_i1218_4_, double p_i1218_6_) {
 		super(p_i1218_1_, p_i1218_2_, p_i1218_4_, p_i1218_6_);
 		theRenderEngine = p_i1213_1_;
 		maxAge = 100 + rand.nextInt(40);
-		
+
         this.particleRed = this.particleGreen = this.particleBlue = 0;
         this.particleScale = 7.5F;
 	}
@@ -41,22 +41,22 @@ public ParticleRadiationFog(TextureManager p_i1213_1_, World p_i1218_1_, double
         this.particleRed = red;
         this.particleGreen = green;
         this.particleBlue = blue;
-        
+
         this.particleScale = scale;
 	}
 
 	public void onUpdate() {
         this.prevPosX = this.posX;
         this.prevPosY = this.posY;
         this.prevPosZ = this.posZ;
-        
+
         if(maxAge < 400)
         {
         	maxAge = 400;
         }
 
         this.particleAge++;
-        
+
         if (this.particleAge >= maxAge)
         {
             this.setDead();
@@ -78,11 +78,11 @@ public int getFXLayer() {
 	}
 
 	public void renderParticle(Tessellator tess, float p_70539_2_, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) {
-		
+
 		this.theRenderEngine.bindTexture(texture);
-		
+
 		float alpha = 0;
-		
+
 		alpha = (float) Math.sin(particleAge * Math.PI / (400F)) * 0.125F;
 
         GL11.glColor4f(0.85F, 0.9F, 0.5F, alpha);
@@ -92,22 +92,23 @@ public void renderParticle(Tessellator tess, float p_70539_2_, float p_70539_3_,
 		GL11.glDepthMask(false);
         OpenGlHelper.glBlendFunc(770, 771, 1, 0);
 		RenderHelper.disableStandardItemLighting();
-		
+
 		Random rand = new Random(50);
-
+
+		GL11.glPushMatrix();
 		for(int i = 0; i < 25; i++) {
 
 			double dX = (rand.nextGaussian() - 1D) * 2.5D;
 			double dY = (rand.nextGaussian() - 1D) * 0.15D;
 			double dZ = (rand.nextGaussian() - 1D) * 2.5D;
 			double size = rand.nextDouble() * particleScale;
-	        
+
 			GL11.glTranslatef((float) dX, (float) dY, (float) dZ);
-			
+
 	        float pX = (float) ((this.prevPosX + (this.posX - this.prevPosX) * (double)p_70539_2_ - interpPosX) + rand.nextGaussian() * 0.5);
 	        float pY = (float) ((this.prevPosY + (this.posY - this.prevPosY) * (double)p_70539_2_ - interpPosY) + rand.nextGaussian() * 0.5);
 	        float pZ = (float) ((this.prevPosZ + (this.posZ - this.prevPosZ) * (double)p_70539_2_ - interpPosZ) + rand.nextGaussian() * 0.5);
-			
+
 			tess.startDrawingQuads();
 			tess.setNormal(0.0F, 1.0F, 0.0F);
 			tess.setBrightness(240);
@@ -116,14 +117,13 @@ public void renderParticle(Tessellator tess, float p_70539_2_, float p_70539_3_,
 			tess.addVertexWithUV((double)(pX + p_70539_3_ * size + p_70539_6_ * size), (double)(pY + p_70539_4_ * size), (double)(pZ + p_70539_5_ * size + p_70539_7_ * size), 0, 0);
 			tess.addVertexWithUV((double)(pX + p_70539_3_ * size - p_70539_6_ * size), (double)(pY - p_70539_4_ * size), (double)(pZ + p_70539_5_ * size - p_70539_7_ * size), 0, 1);
 			tess.draw();
-
-			GL11.glTranslatef((float) -dX, (float) -dY, (float) -dZ);
 		}
-
+		GL11.glPopMatrix();
+
 		GL11.glDisable(GL12.GL_RESCALE_NORMAL);
 		GL11.glEnable(GL11.GL_LIGHTING);
         GL11.glDepthMask(true);
-		
+
 		GL11.glPolygonOffset(0.0F, 0.0F);
 		GL11.glEnable(GL11.GL_LIGHTING);
 	}