tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixed minor rendering glitch.

Browse source
This commit is contained in:
AlgorithmX2 2014-07-12 22:23:58 -05:00
parent 423e6be0c8
commit cd95eb49ff
3 changed files with 59 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
client/render/CableRenderHelper.java
View file

@ -24,6 +24,53 @@ public class CableRenderHelper
return instance; return instance;
} }
private void setSide(ForgeDirection s)
{
ForgeDirection ax, ay, az;
switch (s)
{
case DOWN:
ax = ForgeDirection.EAST;
ay = ForgeDirection.NORTH;
az = ForgeDirection.DOWN;
break;
case UP:
ax = ForgeDirection.EAST;
ay = ForgeDirection.SOUTH;
az = ForgeDirection.UP;
break;
case EAST:
ax = ForgeDirection.SOUTH;
ay = ForgeDirection.UP;
az = ForgeDirection.EAST;
break;
case WEST:
ax = ForgeDirection.NORTH;
ay = ForgeDirection.UP;
az = ForgeDirection.WEST;
break;
case NORTH:
ax = ForgeDirection.WEST;
ay = ForgeDirection.UP;
az = ForgeDirection.NORTH;
break;
case SOUTH:
ax = ForgeDirection.EAST;
ay = ForgeDirection.UP;
az = ForgeDirection.SOUTH;
break;
case UNKNOWN:
default:
ax = ForgeDirection.EAST;
ay = ForgeDirection.UP;
az = ForgeDirection.SOUTH;
break;
}
BusRenderHelper.instance.setOrientation( ax, ay, az );
}
public void renderStatic(CableBusContainer cableBusContainer, FacadeContainer fc) public void renderStatic(CableBusContainer cableBusContainer, FacadeContainer fc)
{ {
TileEntity te = cableBusContainer.getTile(); TileEntity te = cableBusContainer.getTile();
@ -37,12 +84,15 @@ public class CableRenderHelper
for (ForgeDirection s : ForgeDirection.values()) for (ForgeDirection s : ForgeDirection.values())
{ {
cableBusContainer.setSide( s );
IPart part = cableBusContainer.getPart( s ); IPart part = cableBusContainer.getPart( s );
if ( part != null ) if ( part != null )
{ {
setSide( s );
renderer.renderAllFaces = true; renderer.renderAllFaces = true;
renderer.flipTexture = false;
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
part.renderStatic( te.xCoord, te.yCoord, te.zCoord, BusRenderHelper.instance, renderer ); part.renderStatic( te.xCoord, te.yCoord, te.zCoord, BusRenderHelper.instance, renderer );
renderer.faces = EnumSet.allOf( ForgeDirection.class ); renderer.faces = EnumSet.allOf( ForgeDirection.class );
@ -62,7 +112,7 @@ public class CableRenderHelper
IPart part = cableBusContainer.getPart( s ); IPart part = cableBusContainer.getPart( s );
if ( part != null ) if ( part != null )
{ {
cableBusContainer.setSide( s ); setSide( s );
BusRenderHelper brh = BusRenderHelper.instance; BusRenderHelper brh = BusRenderHelper.instance;
BusCollisionHelper bch = new BusCollisionHelper( boxes, brh.getWorldX(), brh.getWorldY(), brh.getWorldZ(), null, true ); BusCollisionHelper bch = new BusCollisionHelper( boxes, brh.getWorldX(), brh.getWorldY(), brh.getWorldZ(), null, true );
part.getBoxes( bch ); part.getBoxes( bch );
@ -113,7 +163,10 @@ public class CableRenderHelper
} }
} }
cableBusContainer.setSide( s ); renderer.flipTexture = false;
renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
setSide( s );
fPart.renderStatic( te.xCoord, te.yCoord, te.zCoord, BusRenderHelper.instance, renderer, fc, b, cableBusContainer.getPart( s ) == null ); fPart.renderStatic( te.xCoord, te.yCoord, te.zCoord, BusRenderHelper.instance, renderer, fc, b, cableBusContainer.getPart( s ) == null );
} }
} }

2
client/texture/TmpFlipableIcon.java
View file

@ -21,6 +21,8 @@ public class TmpFlipableIcon extends FlipableIcon
original = nullIcon; original = nullIcon;
else else
original = i; original = i;
setFlip( false, false );
} }
} }

48
parts/CableBusContainer.java
View file

@ -37,7 +37,6 @@ import appeng.api.parts.SelectedPart;
import appeng.api.util.AECableType; import appeng.api.util.AECableType;
import appeng.api.util.AEColor; import appeng.api.util.AEColor;
import appeng.api.util.DimensionalCoord; import appeng.api.util.DimensionalCoord;
import appeng.client.render.BusRenderHelper;
import appeng.client.render.CableRenderHelper; import appeng.client.render.CableRenderHelper;
import appeng.core.AELog; import appeng.core.AELog;
import appeng.core.AppEng; import appeng.core.AppEng;
@ -526,53 +525,6 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
return part != null ? part.isProvidingStrongPower() : 0; return part != null ? part.isProvidingStrongPower() : 0;
} }
public void setSide(ForgeDirection s)
{
ForgeDirection ax, ay, az;
switch (s)
{
case DOWN:
ax = ForgeDirection.EAST;
ay = ForgeDirection.NORTH;
az = ForgeDirection.DOWN;
break;
case UP:
ax = ForgeDirection.EAST;
ay = ForgeDirection.SOUTH;
az = ForgeDirection.UP;
break;
case EAST:
ax = ForgeDirection.SOUTH;
ay = ForgeDirection.UP;
az = ForgeDirection.EAST;
break;
case WEST:
ax = ForgeDirection.NORTH;
ay = ForgeDirection.UP;
az = ForgeDirection.WEST;
break;
case NORTH:
ax = ForgeDirection.WEST;
ay = ForgeDirection.UP;
az = ForgeDirection.NORTH;
break;
case SOUTH:
ax = ForgeDirection.EAST;
ay = ForgeDirection.UP;
az = ForgeDirection.SOUTH;
break;
case UNKNOWN:
default:
ax = ForgeDirection.EAST;
ay = ForgeDirection.UP;
az = ForgeDirection.SOUTH;
break;
}
BusRenderHelper.instance.setOrientation( ax, ay, az );
}
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(double x, double y, double z) public void renderStatic(double x, double y, double z)
{ {