From ef8b6c1c78f8081be3f4ef687a134a57977553b0 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 3 Dec 2013 11:24:23 -0500 Subject: [PATCH] Fix gas render in mech pipe --- .../client/render/RenderPartTransmitter.java | 31 ++++++++++++++---- .../blocks/models/LogisticalTransporter.png | Bin 1724 -> 0 bytes .../models/LogisticalTransporterActive.png | Bin 1724 -> 0 bytes 3 files changed, 24 insertions(+), 7 deletions(-) delete mode 100644 resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png delete mode 100644 resources/assets/mekanism/textures/blocks/models/LogisticalTransporterActive.png diff --git a/common/mekanism/client/render/RenderPartTransmitter.java b/common/mekanism/client/render/RenderPartTransmitter.java index af2be598c..77e76644d 100644 --- a/common/mekanism/client/render/RenderPartTransmitter.java +++ b/common/mekanism/client/render/RenderPartTransmitter.java @@ -49,6 +49,7 @@ public class RenderPartTransmitter implements IIconRegister private static final int stages = 40; private static final double height = 0.45; private static final double offset = 0.015; + private HashMap> cachedLiquids = new HashMap>(); static @@ -131,11 +132,11 @@ public class RenderPartTransmitter implements IIconRegister public void renderContents(PartMechanicalPipe pipe, Vector3 pos) { - if(pipe.getTransmitterNetwork().fluidScale > 0) - { - Fluid fluid = pipe.getTransmitterNetwork().refFluid; - float scale = pipe.getTransmitterNetwork().fluidScale; - + Fluid fluid = pipe.getTransmitterNetwork().refFluid; + float scale = pipe.getTransmitterNetwork().fluidScale; + + if(scale > 0 && fluid != null) + { push(); MekanismRenderer.glowOn(fluid.getLuminosity()); @@ -143,6 +144,8 @@ public class RenderPartTransmitter implements IIconRegister CCRenderState.changeTexture((MekanismRenderer.getBlocksTexture())); GL11.glTranslated(pos.x, pos.y, pos.z); + boolean gas = fluid.isGaseous(); + for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { if(PartTransmitter.connectionMapContainsSide(pipe.getAllCurrentConnections(), side)) @@ -151,7 +154,14 @@ public class RenderPartTransmitter implements IIconRegister if(displayLists != null) { - displayLists[Math.max(3, (int)((float)scale*(stages-1)))].render(); + if(!gas) + { + displayLists[Math.max(3, (int)((float)scale*(stages-1)))].render(); + } + else { + GL11.glColor4f(1F, 1F, 1F, scale); + displayLists[stages-1].render(); + } } } } @@ -160,7 +170,14 @@ public class RenderPartTransmitter implements IIconRegister if(displayLists != null) { - displayLists[Math.max(3, (int)((float)scale*(stages-1)))].render(); + if(!gas) + { + displayLists[Math.max(3, (int)((float)scale*(stages-1)))].render(); + } + else { + GL11.glColor4f(1F, 1F, 1F, scale); + displayLists[stages-1].render(); + } } MekanismRenderer.glowOff(); diff --git a/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png b/resources/assets/mekanism/textures/blocks/models/LogisticalTransporter.png deleted file mode 100644 index eb77c616f522fc8cc75ad9796c661267b0e8a722..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1724 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 S@v+4K0000