Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'facade' of https://github.com/dmillerw/BuildCraft into dmillerw-facade

Browse source
This commit is contained in:
SpaceToad 2014-04-10 08:48:08 +02:00
commit 039e49175b
3 changed files with 148 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -8,14 +8,25 @@
*/ */
package buildcraft.transport; package buildcraft.transport;
import java.util.ArrayList; import buildcraft.BuildCraftTransport;
import java.util.Arrays; import buildcraft.api.gates.GateExpansions;
import java.util.HashMap; import buildcraft.api.gates.IGateExpansion;
import java.util.List; import buildcraft.api.tools.IToolWrench;
import java.util.Locale; import buildcraft.api.transport.PipeWire;
import java.util.Map; import buildcraft.core.*;
import java.util.Random; import buildcraft.core.robots.AIDocked;
import buildcraft.core.robots.EntityRobot;
import buildcraft.core.utils.BCLog;
import buildcraft.core.utils.MatrixTranformations;
import buildcraft.core.utils.Utils;
import buildcraft.transport.gates.GateDefinition;
import buildcraft.transport.gates.GateFactory;
import buildcraft.transport.gates.ItemGate;
import buildcraft.transport.render.PipeRendererWorld;
import buildcraft.transport.utils.FacadeMatrix;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@ -37,28 +48,8 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import buildcraft.BuildCraftTransport;
import buildcraft.api.gates.GateExpansions; import java.util.*;
import buildcraft.api.gates.IGateExpansion;
import buildcraft.api.tools.IToolWrench;
import buildcraft.api.transport.PipeWire;
import buildcraft.core.BlockBuildCraft;
import buildcraft.core.BlockIndex;
import buildcraft.core.CoreConstants;
import buildcraft.core.CreativeTabBuildCraft;
import buildcraft.core.ItemRobot;
import buildcraft.core.robots.AIDocked;
import buildcraft.core.robots.EntityRobot;
import buildcraft.core.utils.BCLog;
import buildcraft.core.utils.MatrixTranformations;
import buildcraft.core.utils.Utils;
import buildcraft.transport.gates.GateDefinition;
import buildcraft.transport.gates.GateFactory;
import buildcraft.transport.gates.ItemGate;
import buildcraft.transport.utils.FacadeMatrix;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockGenericPipe extends BlockBuildCraft { public class BlockGenericPipe extends BlockBuildCraft {
@ -109,6 +100,17 @@ public class BlockGenericPipe extends BlockBuildCraft {
return TransportProxy.pipeModel; return TransportProxy.pipeModel;
} }
@Override
public boolean canRenderInPass(int pass) {
PipeRendererWorld.renderPass = pass;
return true;
}
@Override
public int getRenderBlockPass() {
return 1;
}
@Override @Override
public boolean isOpaqueCube() { public boolean isOpaqueCube() {
return false; return false;

6
common/buildcraft/transport/render/FacadeRenderHelper.java
View file

@ -92,6 +92,8 @@ public class FacadeRenderHelper {
Block renderBlock = state.facadeMatrix.getFacadeBlock(direction); Block renderBlock = state.facadeMatrix.getFacadeBlock(direction);
if (renderBlock != null) { if (renderBlock != null) {
// If the facade is meant to render in the current pass
if (renderBlock.canRenderInPass(PipeRendererWorld.renderPass)) {
int renderMeta = state.facadeMatrix.getFacadeMetaId(direction); int renderMeta = state.facadeMatrix.getFacadeMetaId(direction);
for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { for (ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
@ -167,6 +169,7 @@ public class FacadeRenderHelper {
renderblocks.uvRotateBottom = 0; renderblocks.uvRotateBottom = 0;
} }
} }
}
BlockGenericPipe.facadeRenderColor = -1; BlockGenericPipe.facadeRenderColor = -1;
} }
@ -176,6 +179,8 @@ public class FacadeRenderHelper {
state.currentTexture = BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.TYPE.PipeStructureCobblestone.ordinal()); // Structure Pipe state.currentTexture = BuildCraftTransport.instance.pipeIconProvider.getIcon(PipeIconProvider.TYPE.PipeStructureCobblestone.ordinal()); // Structure Pipe
// Always render connectors in pass 0
if (PipeRendererWorld.renderPass == 0) {
for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) { for (ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) {
if (state.facadeMatrix.getFacadeBlock(direction) != null && !state.pipeConnectionMatrix.isConnected(direction)) { if (state.facadeMatrix.getFacadeBlock(direction) != null && !state.pipeConnectionMatrix.isConnected(direction)) {
float[][] rotated = MatrixTranformations.deepClone(zeroStateSupport); float[][] rotated = MatrixTranformations.deepClone(zeroStateSupport);
@ -186,4 +191,5 @@ public class FacadeRenderHelper {
} }
} }
} }
}
} }

10
common/buildcraft/transport/render/PipeRendererWorld.java
View file

@ -23,6 +23,8 @@ import net.minecraftforge.common.util.ForgeDirection;
public class PipeRendererWorld implements ISimpleBlockRenderingHandler { public class PipeRendererWorld implements ISimpleBlockRenderingHandler {
public static int renderPass = -1;
public void renderPipe(RenderBlocks renderblocks, IBlockAccess iblockaccess, BlockGenericPipe block, TileGenericPipe tile, int x, int y, int z) { public void renderPipe(RenderBlocks renderblocks, IBlockAccess iblockaccess, BlockGenericPipe block, TileGenericPipe tile, int x, int y, int z) {
PipeRenderState state = tile.renderState; PipeRenderState state = tile.renderState;
IIconProvider icons = tile.getPipeIcons(); IIconProvider icons = tile.getPipeIcons();
@ -31,6 +33,8 @@ public class PipeRendererWorld implements ISimpleBlockRenderingHandler {
return; return;
} }
// Force pipe render into pass 0
if (renderPass == 0) {
int connectivity = state.pipeConnectionMatrix.getMask(); int connectivity = state.pipeConnectionMatrix.getMask();
float[] dim = new float[6]; float[] dim = new float[6];
@ -67,13 +71,19 @@ public class PipeRendererWorld implements ISimpleBlockRenderingHandler {
renderTwoWayBlock(renderblocks, block, x, y, z, dim, renderMask); renderTwoWayBlock(renderblocks, block, x, y, z, dim, renderMask);
} }
}
renderblocks.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); renderblocks.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
// Facade renderer handles rendering in both passes
pipeFacadeRenderer(renderblocks, block, state, x, y, z); pipeFacadeRenderer(renderblocks, block, state, x, y, z);
// Force other opaque renders into pass 0
if (renderPass == 0) {
pipePlugRenderer(renderblocks, block, state, x, y, z); pipePlugRenderer(renderblocks, block, state, x, y, z);
pipeRobotStationRenderer(renderblocks, block, state, x, y, z); pipeRobotStationRenderer(renderblocks, block, state, x, y, z);
} }
}
private void resetToCenterDimensions(float[] dim) { private void resetToCenterDimensions(float[] dim) {
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {