From a05afb68e905dbaba314c74f4b9f010ac4b03c10 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Wed, 8 Jan 2014 02:06:07 +0000 Subject: [PATCH] Mechanical Pipe rendering adjustments. Couldn't be bothered to make 100 different models in blender. Maybe I'll write a python script to do it for me. Might make a bigger version of the shaped in/out model to better fit the mechanical pipe. --- .../client/render/RenderPartTransmitter.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/common/mekanism/client/render/RenderPartTransmitter.java b/common/mekanism/client/render/RenderPartTransmitter.java index c0dc2bf79..391d53ac8 100644 --- a/common/mekanism/client/render/RenderPartTransmitter.java +++ b/common/mekanism/client/render/RenderPartTransmitter.java @@ -293,7 +293,7 @@ public class RenderPartTransmitter implements IIconRegister for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - if(pipe.getConnectionType(side) != ConnectionType.NONE && PartTransmitter.connectionMapContainsSide(pipe.getAllCurrentConnections(), side)) + if(pipe.getConnectionType(side) == ConnectionType.NORMAL) { DisplayInteger[] displayLists = getListAndRender(side, fluid); @@ -309,6 +309,13 @@ public class RenderPartTransmitter implements IIconRegister } } } + else if(pipe.getConnectionType(side) != ConnectionType.NONE) { + GL11.glCullFace(GL11.GL_FRONT); + CCRenderState.startDrawing(7); + renderFluidInOut(side, pipe); + CCRenderState.draw(); + GL11.glCullFace(GL11.GL_BACK); + } } DisplayInteger[] displayLists = getListAndRender(ForgeDirection.UNKNOWN, fluid); @@ -528,14 +535,18 @@ public class RenderPartTransmitter implements IIconRegister public void renderEnergySide(ForgeDirection side, PartUniversalCable cable) { CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); - boolean connected = PartTransmitter.connectionMapContainsSide(cable.getAllCurrentConnections(), side); renderTransparency(MekanismRenderer.energyIcon, cable.getModelForSide(side, true), new ColourRGBA(1.0, 1.0, 1.0, cable.currentPower)); } + public void renderFluidInOut(ForgeDirection side, PartMechanicalPipe pipe) + { + CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); + renderTransparency(pipe.getTransmitterNetwork().refFluid.getIcon(), pipe.getModelForSide(side, true), new ColourRGBA(1.0, 1.0, 1.0, pipe.currentScale)); + } + public void renderGasSide(ForgeDirection side, PartPressurizedTube tube) { CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); - boolean connected = PartTransmitter.connectionMapContainsSide(tube.getAllCurrentConnections(), side); renderTransparency(tube.getTransmitterNetwork().refGas.getIcon(), tube.getModelForSide(side, true), new ColourRGBA(1.0, 1.0, 1.0, tube.currentScale)); }