From 13bbb7779be6d4535990920604975fd5b068dcc4 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 4 Feb 2017 19:50:59 -0600 Subject: [PATCH] Fix some things not being rendered fullbright --- .../client/core/proxy/ClientProxy.java | 13 +++++++++ .../client/render/entity/RenderSparkBase.java | 29 +++++++++---------- .../render/tile/RenderTileAlfPortal.java | 12 ++++---- .../render/tile/RenderTileEnchanter.java | 12 ++++---- .../render/tile/RenderTileLightRelay.java | 26 ++++++++--------- .../client/render/tile/RenderTilePool.java | 12 ++++---- .../render/tile/RenderTileTerraPlate.java | 12 ++++---- 7 files changed, 64 insertions(+), 52 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index ec567542a..71fbdaddc 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -25,6 +25,8 @@ import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -172,6 +174,17 @@ import vazkii.botania.common.lib.LibObfuscation; public class ClientProxy implements IProxy { + public static final VertexFormat POSITION_TEX_LMAP_NORMAL = + new VertexFormat() + .addElement(DefaultVertexFormats.POSITION_3F) + .addElement(DefaultVertexFormats.TEX_2F) + .addElement(DefaultVertexFormats.TEX_2S) + .addElement(DefaultVertexFormats.NORMAL_3B); + public static final VertexFormat POSITION_TEX_LMAP = + new VertexFormat() + .addElement(DefaultVertexFormats.POSITION_3F) + .addElement(DefaultVertexFormats.TEX_2F) + .addElement(DefaultVertexFormats.TEX_2S); public static boolean jingleTheBells = false; public static boolean dootDoot = false; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 2a0ebb0d2..dd85d6ea7 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -22,12 +22,12 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.network.datasync.DataParameter; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.proxy.ClientProxy; public abstract class RenderSparkBase extends Render { @@ -62,14 +62,14 @@ public abstract class RenderSparkBase extends Render { float r = 180.0F - renderManager.playerViewY; GlStateManager.rotate(r, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(-renderManager.playerViewX, 1F, 0F, 0F); - func_77026_a(tessellator, iicon); + renderIcon(tessellator, iicon); TextureAtlasSprite spinningIcon = getSpinningIcon(tEntity); if(spinningIcon != null) { GlStateManager.translate(-0.02F + (float) Math.sin(time / 20) * 0.2F, 0.24F + (float) Math.cos(time / 20) * 0.2F, 0.005F); GlStateManager.scale(0.2F, 0.2F, 0.2F); colorSpinningIcon(tEntity, a); - func_77026_a(tessellator, spinningIcon); + renderIcon(tessellator, spinningIcon); } GlStateManager.popMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); @@ -100,22 +100,21 @@ public abstract class RenderSparkBase extends Render { return TextureMap.LOCATION_BLOCKS_TEXTURE; } - private void func_77026_a(Tessellator p_77026_1_, TextureAtlasSprite p_77026_2_) { - float f = p_77026_2_.getMinU(); - float f1 = p_77026_2_.getMaxU(); - float f2 = p_77026_2_.getMinV(); - float f3 = p_77026_2_.getMaxV(); + private void renderIcon(Tessellator tess, TextureAtlasSprite icon) { + float f = icon.getMinU(); + float f1 = icon.getMaxU(); + float f2 = icon.getMinV(); + float f3 = icon.getMaxV(); float f4 = 1.0F; float f5 = 0.5F; float f6 = 0.25F; - p_77026_1_.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); - //p_77026_1_.getBuffer().setBrightness(240); - p_77026_1_.getBuffer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.getBuffer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.getBuffer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.getBuffer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.draw(); + tess.getBuffer().begin(GL11.GL_QUADS, ClientProxy.POSITION_TEX_LMAP_NORMAL); + tess.getBuffer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).lightmap(240, 240).normal(0.0F, 1.0F, 0.0F).endVertex(); + tess.getBuffer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).lightmap(240, 240).normal(0.0F, 1.0F, 0.0F).endVertex(); + tess.getBuffer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).lightmap(240, 240).normal(0.0F, 1.0F, 0.0F).endVertex(); + tess.getBuffer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).lightmap(240, 240).normal(0.0F, 1.0F, 0.0F).endVertex(); + tess.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index 3a466f6db..0e9b43191 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -25,6 +25,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; @@ -78,12 +79,11 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - //tessellator.getBuffer().setBrightness(brightness); - tessellator.getBuffer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); - tessellator.getBuffer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); - tessellator.getBuffer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); - tessellator.getBuffer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); + tessellator.getBuffer().begin(GL11.GL_QUADS, ClientProxy.POSITION_TEX_LMAP); + tessellator.getBuffer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).lightmap(brightness, brightness).endVertex(); + tessellator.getBuffer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).lightmap(brightness, brightness).endVertex(); + tessellator.getBuffer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).lightmap(brightness, brightness).endVertex(); + tessellator.getBuffer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).lightmap(brightness, brightness).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java index 8ec2811ad..6665e4eb7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -25,6 +25,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.block.tile.TileTerraPlate; public class RenderTileTerraPlate extends TileEntitySpecialRenderer { @@ -68,12 +69,11 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer