Removed old rendering system
Removed old rendering system. Some parts may be left over, but they won't affect testing. 1.10-R todo tag marks things to do with rendering.
This commit is contained in:
elix-x
@@ -19,18 +19,9 @@
|
||||
package appeng.parts.networking;
|
||||
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import appeng.api.AEApi;
|
||||
import appeng.api.networking.GridFlags;
|
||||
import appeng.api.networking.IGridHost;
|
||||
import appeng.api.networking.IGridNode;
|
||||
@@ -39,18 +30,8 @@ import appeng.api.networking.events.MENetworkEventSubscribe;
|
||||
import appeng.api.networking.events.MENetworkPowerStatusChange;
|
||||
import appeng.api.parts.BusSupport;
|
||||
import appeng.api.parts.IPartCollisionHelper;
|
||||
import appeng.api.parts.IPartHost;
|
||||
import appeng.api.parts.IPartRenderHelper;
|
||||
import appeng.api.util.AECableType;
|
||||
import appeng.api.util.AEColor;
|
||||
import appeng.api.util.AEPartLocation;
|
||||
import appeng.api.util.IAESprite;
|
||||
import appeng.api.util.ModelGenerator;
|
||||
import appeng.block.AEBaseBlock;
|
||||
import appeng.client.texture.CableBusTextures;
|
||||
import appeng.client.texture.FlippableIcon;
|
||||
import appeng.client.texture.OffsetIcon;
|
||||
import appeng.client.texture.TaughtIcon;
|
||||
import appeng.helpers.Reflected;
|
||||
import appeng.util.Platform;
|
||||
|
||||
@@ -154,306 +135,6 @@ public class PartDenseCable extends PartCable
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly( Side.CLIENT )
|
||||
public void renderInventory( final IPartRenderHelper rh, final ModelGenerator renderer )
|
||||
{
|
||||
GL11.glTranslated( -0.0, -0.0, 0.3 );
|
||||
rh.setBounds( 4.0f, 4.0f, 2.0f, 12.0f, 12.0f, 14.0f );
|
||||
|
||||
float offU = 0;
|
||||
float offV = 9;
|
||||
|
||||
OffsetIcon main = new OffsetIcon( this.getTexture( this.getCableColor(), renderer ), offU, offV );
|
||||
OffsetIcon ch1 = new OffsetIcon( this.getChannelTex( 4, false ).getIcon(), offU, offV );
|
||||
OffsetIcon ch2 = new OffsetIcon( this.getChannelTex( 4, true ).getIcon(), offU, offV );
|
||||
|
||||
for( final EnumFacing side : EnumSet.of( EnumFacing.UP, EnumFacing.DOWN ) )
|
||||
{
|
||||
rh.renderInventoryFace( main, side, renderer );
|
||||
rh.renderInventoryFace( ch1, side, renderer );
|
||||
rh.renderInventoryFace( ch2, side, renderer );
|
||||
}
|
||||
|
||||
offU = 9;
|
||||
offV = 0;
|
||||
main = new OffsetIcon( this.getTexture( this.getCableColor(), renderer ), offU, offV );
|
||||
ch1 = new OffsetIcon( this.getChannelTex( 4, false ).getIcon(), offU, offV );
|
||||
ch2 = new OffsetIcon( this.getChannelTex( 4, true ).getIcon(), offU, offV );
|
||||
|
||||
for( final EnumFacing side : EnumSet.of( EnumFacing.EAST, EnumFacing.WEST ) )
|
||||
{
|
||||
rh.renderInventoryFace( main, side, renderer );
|
||||
rh.renderInventoryFace( ch1, side, renderer );
|
||||
rh.renderInventoryFace( ch2, side, renderer );
|
||||
}
|
||||
|
||||
main = new OffsetIcon( this.getTexture( this.getCableColor(), renderer ), 0, 0 );
|
||||
ch1 = new OffsetIcon( this.getChannelTex( 4, false ).getIcon(), 0, 0 );
|
||||
ch2 = new OffsetIcon( this.getChannelTex( 4, true ).getIcon(), 0, 0 );
|
||||
|
||||
for( final EnumFacing side : EnumSet.of( EnumFacing.SOUTH, EnumFacing.NORTH ) )
|
||||
{
|
||||
rh.renderInventoryFace( main, side, renderer );
|
||||
rh.renderInventoryFace( ch1, side, renderer );
|
||||
rh.renderInventoryFace( ch2, side, renderer );
|
||||
}
|
||||
|
||||
rh.setTexture( null );
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAESprite getTexture( final AEColor c, final ModelGenerator renderer )
|
||||
{
|
||||
if( c == AEColor.Transparent )
|
||||
{
|
||||
return renderer.getIcon( AEApi.instance().definitions().parts().cableSmart().stack( AEColor.Transparent, 1 ) );
|
||||
}
|
||||
|
||||
return this.getSmartTexture( c, renderer );
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly( Side.CLIENT )
|
||||
public void renderStatic( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer )
|
||||
{
|
||||
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
|
||||
|
||||
final EnumSet<AEPartLocation> sides = this.getConnections().clone();
|
||||
|
||||
boolean hasBuses = false;
|
||||
for( final AEPartLocation of : this.getConnections() )
|
||||
{
|
||||
if( !this.isDense( of ) )
|
||||
{
|
||||
hasBuses = true;
|
||||
}
|
||||
}
|
||||
|
||||
if( sides.size() != 2 || !this.nonLinear( sides ) || hasBuses )
|
||||
{
|
||||
for( final AEPartLocation of : this.getConnections() )
|
||||
{
|
||||
if( this.isDense( of ) )
|
||||
{
|
||||
this.renderDenseConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
|
||||
}
|
||||
else if( this.isSmart( of ) )
|
||||
{
|
||||
this.renderSmartConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
|
||||
}
|
||||
else
|
||||
{
|
||||
this.renderCoveredConnection( pos, rh, renderer, this.getChannelsOnSide( of.ordinal() ), of );
|
||||
}
|
||||
}
|
||||
|
||||
rh.setTexture( this.getDenseTexture( this.getCableColor(), renderer ) );
|
||||
rh.setBounds( 3, 3, 3, 13, 13, 13 );
|
||||
rh.renderBlock( pos, renderer );
|
||||
}
|
||||
else
|
||||
{
|
||||
AEPartLocation selectedSide = AEPartLocation.INTERNAL;
|
||||
|
||||
for( final AEPartLocation of : this.getConnections() )
|
||||
{
|
||||
selectedSide = of;
|
||||
break;
|
||||
}
|
||||
|
||||
final int channels = this.getChannelsOnSide( selectedSide.ordinal() );
|
||||
final IAESprite def = this.getTexture( this.getCableColor(), renderer );
|
||||
final IAESprite off = new OffsetIcon( def, 0, -12 );
|
||||
|
||||
final IAESprite firstIcon = new TaughtIcon( this.getChannelTex( channels, false ).getIcon(), -0.2f );
|
||||
final IAESprite firstOffset = new OffsetIcon( firstIcon, 0, -12 );
|
||||
|
||||
final IAESprite secondIcon = new TaughtIcon( this.getChannelTex( channels, true ).getIcon(), -0.2f );
|
||||
final IAESprite secondOffset = new OffsetIcon( secondIcon, 0, -12 );
|
||||
|
||||
switch( selectedSide )
|
||||
{
|
||||
case DOWN:
|
||||
case UP:
|
||||
renderer.setRenderBounds( 3 / 16.0, 0, 3 / 16.0, 13 / 16.0, 16 / 16.0, 13 / 16.0 );
|
||||
rh.setTexture( def, def, off, off, off, off );
|
||||
rh.renderBlockCurrentBounds( pos, renderer );
|
||||
|
||||
renderer.setUvRotateTop( 0 );
|
||||
renderer.setUvRotateBottom( 0 );
|
||||
renderer.setUvRotateSouth( 3 );
|
||||
renderer.setUvRotateEast( 3 );
|
||||
|
||||
renderer.setBrightness( 15 << 20 | 15 << 4 );
|
||||
|
||||
renderer.setColorOpaque_I( this.getCableColor().blackVariant );
|
||||
rh.setTexture( firstIcon, firstIcon, firstOffset, firstOffset, firstOffset, firstOffset );
|
||||
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
|
||||
|
||||
renderer.setColorOpaque_I( this.getCableColor().whiteVariant );
|
||||
rh.setTexture( secondIcon, secondIcon, secondOffset, secondOffset, secondOffset, secondOffset );
|
||||
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
|
||||
break;
|
||||
case EAST:
|
||||
case WEST:
|
||||
rh.setTexture( off, off, off, off, def, def );
|
||||
renderer.setUvRotateEast( 2 );
|
||||
renderer.setUvRotateWest( 1 );
|
||||
renderer.setUvRotateBottom( 2 );
|
||||
renderer.setUvRotateTop( 1 );
|
||||
renderer.setUvRotateSouth( 0 );
|
||||
renderer.setUvRotateNorth( 0 );
|
||||
|
||||
final AEBaseBlock blk = (AEBaseBlock) rh.getBlock();
|
||||
final FlippableIcon ico = blk.getRendererInstance().getTexture( AEPartLocation.EAST );
|
||||
ico.setFlip( false, true );
|
||||
|
||||
renderer.setRenderBounds( 0, 3 / 16.0, 3 / 16.0, 16 / 16.0, 13 / 16.0, 13 / 16.0 );
|
||||
rh.renderBlockCurrentBounds( pos, renderer );
|
||||
|
||||
renderer.setBrightness( 15 << 20 | 15 << 4 );
|
||||
|
||||
final FlippableIcon fpA = new FlippableIcon( firstIcon );
|
||||
final FlippableIcon fpB = new FlippableIcon( secondIcon );
|
||||
|
||||
fpA.setFlip( true, false );
|
||||
fpB.setFlip( true, false );
|
||||
|
||||
renderer.setColorOpaque_I( this.getCableColor().blackVariant );
|
||||
rh.setTexture( firstOffset, firstOffset, firstOffset, firstOffset, firstIcon, fpA );
|
||||
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
|
||||
|
||||
renderer.setColorOpaque_I( this.getCableColor().whiteVariant );
|
||||
rh.setTexture( secondOffset, secondOffset, secondOffset, secondOffset, secondIcon, fpB );
|
||||
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
|
||||
break;
|
||||
case NORTH:
|
||||
case SOUTH:
|
||||
rh.setTexture( off, off, def, def, off, off );
|
||||
renderer.setUvRotateTop( 3 );
|
||||
renderer.setUvRotateBottom( 3 );
|
||||
renderer.setUvRotateNorth( 1 );
|
||||
renderer.setUvRotateSouth( 2 );
|
||||
renderer.setUvRotateWest( 1 );
|
||||
renderer.setRenderBounds( 3 / 16.0, 3 / 16.0, 0, 13 / 16.0, 13 / 16.0, 16 / 16.0 );
|
||||
rh.renderBlockCurrentBounds( pos, renderer );
|
||||
|
||||
renderer.setBrightness( 15 << 20 | 15 << 4 );
|
||||
|
||||
renderer.setColorOpaque_I( this.getCableColor().blackVariant );
|
||||
rh.setTexture( firstOffset, firstOffset, firstIcon, firstIcon, firstOffset, firstOffset );
|
||||
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
|
||||
|
||||
renderer.setColorOpaque_I( this.getCableColor().whiteVariant );
|
||||
rh.setTexture( secondOffset, secondOffset, secondIcon, secondIcon, secondOffset, secondOffset );
|
||||
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
|
||||
rh.setTexture( null );
|
||||
}
|
||||
|
||||
@SideOnly( Side.CLIENT )
|
||||
public void renderDenseConnection( final BlockPos pos, final IPartRenderHelper rh, final ModelGenerator renderer, final int channels, final AEPartLocation of )
|
||||
{
|
||||
final TileEntity te = this.getTile().getWorld().getTileEntity( pos.offset( of.getFacing() ) );
|
||||
final IPartHost partHost = te instanceof IPartHost ? (IPartHost) te : null;
|
||||
final IGridHost ghh = te instanceof IGridHost ? (IGridHost) te : null;
|
||||
AEColor myColor = this.getCableColor();
|
||||
/*
|
||||
* ( ghh != null && partHost != null && ghh.getCableConnectionType( of ) == AECableType.GLASS &&
|
||||
* partHost.getPart(
|
||||
* of.getOpposite() ) == null ) { isGlass = true; rh.setTexture( getGlassTexture( myColor = partHost.getColor()
|
||||
* ) );
|
||||
* } else if ( partHost == null && ghh != null && ghh.getCableConnectionType( of ) != AECableType.GLASS ) {
|
||||
* rh.setTexture( getSmartTexture( myColor ) ); switch (of) { case DOWN: rh.setBounds( 3, 0, 3, 13, 4, 13 );
|
||||
* break; case EAST: rh.setBounds( 12, 3, 3, 16, 13, 13 ); break; case NORTH: rh.setBounds( 3, 3, 0, 13, 13, 4
|
||||
* ); break; case SOUTH: rh.setBounds( 3, 3, 12, 13, 13, 16 ); break; case UP: rh.setBounds( 3, 12, 3, 13, 16,
|
||||
* 13 ); break; case WEST: rh.setBounds( 0, 3, 3, 4, 13, 13 ); break; default: return; } rh.renderBlock( x, y,
|
||||
* z, renderer );
|
||||
* if ( true ) { setSmartConnectionRotations( of, renderer ); TextureAtlasSprite firstIcon = new TaughtIcon(
|
||||
* getChannelTex(
|
||||
* channels, false ).getIcon(), -0.2f ); TextureAtlasSprite secondIcon = new TaughtIcon( getChannelTex(
|
||||
* channels, true ).getIcon(),
|
||||
* -0.2f );
|
||||
* if ( of == AEPartLocation.EAST || of == AEPartLocation.WEST ) { AEBaseBlock blk = (AEBaseBlock)
|
||||
* rh.getBlock(); FlippableIcon ico = blk.getRendererInstance().getTexture( AEPartLocation.EAST ); ico.setFlip(
|
||||
* false, true ); }
|
||||
* Tessellator.INSTANCE.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.INSTANCE.setColorOpaque_I(
|
||||
* myColor.mediumVariant ); rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon );
|
||||
* renderAllFaces( (AEBaseBlock)
|
||||
* rh.getBlock(), x, y, z, renderer );
|
||||
* Tessellator.INSTANCE.setColorOpaque_I( myColor.whiteVariant ); rh.setTexture( secondIcon, secondIcon,
|
||||
* secondIcon, secondIcon, secondIcon,
|
||||
* secondIcon ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer );
|
||||
* renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth =
|
||||
* renderer.uvRotateTop = renderer.uvRotateWest = 0; }
|
||||
* rh.setTexture( getTexture( getCableColor() ) ); }
|
||||
*/
|
||||
|
||||
rh.setFacesToRender( EnumSet.complementOf( EnumSet.of( of.getFacing(), of.getFacing().getOpposite() ) ) );
|
||||
if( ghh != null && partHost != null && ghh.getCableConnectionType( of ) != AECableType.GLASS && partHost.getColor() != AEColor.Transparent && partHost.getPart( of.getOpposite() ) == null )
|
||||
{
|
||||
rh.setTexture( this.getTexture( myColor = partHost.getColor(), renderer ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
rh.setTexture( this.getTexture( this.getCableColor(), renderer ) );
|
||||
}
|
||||
|
||||
switch( of )
|
||||
{
|
||||
case DOWN:
|
||||
rh.setBounds( 4, 0, 4, 12, 5, 12 );
|
||||
break;
|
||||
case EAST:
|
||||
rh.setBounds( 11, 4, 4, 16, 12, 12 );
|
||||
break;
|
||||
case NORTH:
|
||||
rh.setBounds( 4, 4, 0, 12, 12, 5 );
|
||||
break;
|
||||
case SOUTH:
|
||||
rh.setBounds( 4, 4, 11, 12, 12, 16 );
|
||||
break;
|
||||
case UP:
|
||||
rh.setBounds( 4, 11, 4, 12, 16, 12 );
|
||||
break;
|
||||
case WEST:
|
||||
rh.setBounds( 0, 4, 4, 5, 12, 12 );
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
rh.renderBlock( pos, renderer );
|
||||
|
||||
rh.setFacesToRender( EnumSet.allOf( EnumFacing.class ) );
|
||||
final boolean isGlass = false;
|
||||
if( !isGlass )
|
||||
{
|
||||
this.setSmartConnectionRotations( of, renderer );
|
||||
|
||||
final IAESprite firstIcon = new TaughtIcon( this.getChannelTex( channels, false ).getIcon(), -0.2f );
|
||||
final IAESprite secondIcon = new TaughtIcon( this.getChannelTex( channels, true ).getIcon(), -0.2f );
|
||||
|
||||
renderer.setBrightness( 15 << 20 | 15 << 4 );
|
||||
renderer.setColorOpaque_I( myColor.blackVariant );
|
||||
rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon );
|
||||
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
|
||||
|
||||
renderer.setColorOpaque_I( myColor.whiteVariant );
|
||||
rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, secondIcon );
|
||||
this.renderAllFaces( (AEBaseBlock) rh.getBlock(), pos, rh, renderer );
|
||||
|
||||
renderer.setUvRotateBottom( renderer.setUvRotateEast( renderer.setUvRotateNorth( renderer.setUvRotateSouth( renderer.setUvRotateTop( renderer.setUvRotateWest( 0 ) ) ) ) ) );
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isSmart( final AEPartLocation of )
|
||||
{
|
||||
final TileEntity te = this.getTile().getWorld().getTileEntity( this.getTile().getPos().offset( of.getFacing() ) );
|
||||
@@ -465,48 +146,6 @@ public class PartDenseCable extends PartCable
|
||||
return false;
|
||||
}
|
||||
|
||||
private IAESprite getDenseTexture( final AEColor c, final ModelGenerator renderer )
|
||||
{
|
||||
switch( c )
|
||||
{
|
||||
case Black:
|
||||
return CableBusTextures.MEDense_Black.getIcon();
|
||||
case Blue:
|
||||
return CableBusTextures.MEDense_Blue.getIcon();
|
||||
case Brown:
|
||||
return CableBusTextures.MEDense_Brown.getIcon();
|
||||
case Cyan:
|
||||
return CableBusTextures.MEDense_Cyan.getIcon();
|
||||
case Gray:
|
||||
return CableBusTextures.MEDense_Gray.getIcon();
|
||||
case Green:
|
||||
return CableBusTextures.MEDense_Green.getIcon();
|
||||
case LightBlue:
|
||||
return CableBusTextures.MEDense_LightBlue.getIcon();
|
||||
case LightGray:
|
||||
return CableBusTextures.MEDense_LightGrey.getIcon();
|
||||
case Lime:
|
||||
return CableBusTextures.MEDense_Lime.getIcon();
|
||||
case Magenta:
|
||||
return CableBusTextures.MEDense_Magenta.getIcon();
|
||||
case Orange:
|
||||
return CableBusTextures.MEDense_Orange.getIcon();
|
||||
case Pink:
|
||||
return CableBusTextures.MEDense_Pink.getIcon();
|
||||
case Purple:
|
||||
return CableBusTextures.MEDense_Purple.getIcon();
|
||||
case Red:
|
||||
return CableBusTextures.MEDense_Red.getIcon();
|
||||
case White:
|
||||
return CableBusTextures.MEDense_White.getIcon();
|
||||
case Yellow:
|
||||
return CableBusTextures.MEDense_Yellow.getIcon();
|
||||
default:
|
||||
}
|
||||
|
||||
return renderer.getIcon( this.getItemStack() );
|
||||
}
|
||||
|
||||
private boolean isDense( final AEPartLocation of )
|
||||
{
|
||||
final TileEntity te = this.getTile().getWorld().getTileEntity( this.getTile().getPos().offset( of.getFacing() ) );
|
||||
|
||||
Reference in New Issue
Block a user