fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #1517 improved performance of TESRWrapper

Browse Source
This commit is contained in:
yueh
2015-05-26 15:51:16 +02:00
parent 776d68bb03
commit 6e76690835
5 changed files with 57 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/BaseBlockRender.java
-1
View File
@@ -754,7 +754,6 @@ public class BaseBlockRender<B extends AEBaseBlock, T extends AEBaseTile>
GL11.glTranslated( x + 0.5, y + 0.5, z + 0.5 ); GL11.glTranslated( x + 0.5, y + 0.5, z + 0.5 );
GL11.glMultMatrix( this.rotMat ); GL11.glMultMatrix( this.rotMat );
GL11.glTranslated( -0.5, -0.5, -0.5 ); GL11.glTranslated( -0.5, -0.5, -0.5 );
GL11.glCullFace( GL11.GL_FRONT );
} }
else else
{ {
src/main/java/appeng/client/render/TESRWrapper.java
+1 -3
View File
@@ -41,7 +41,7 @@ public class TESRWrapper extends TileEntitySpecialRenderer
public final RenderBlocks renderBlocksInstance = new RenderBlocks(); public final RenderBlocks renderBlocksInstance = new RenderBlocks();
final BaseBlockRender blkRender; private final BaseBlockRender blkRender;
private final double maxDistance; private final double maxDistance;
public TESRWrapper( BaseBlockRender render ) public TESRWrapper( BaseBlockRender render )
@@ -69,12 +69,10 @@ public class TESRWrapper extends TileEntitySpecialRenderer
try try
{ {
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS );
this.renderBlocksInstance.blockAccess = te.getWorldObj(); this.renderBlocksInstance.blockAccess = te.getWorldObj();
this.blkRender.renderTile( (AEBaseBlock) b, (AEBaseTile) te, tess, x, y, z, f, this.renderBlocksInstance ); this.blkRender.renderTile( (AEBaseBlock) b, (AEBaseTile) te, tess, x, y, z, f, this.renderBlocksInstance );
GL11.glPopAttrib();
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
catch( Throwable t ) catch( Throwable t )
src/main/java/appeng/client/render/blocks/RenderBlockCharger.java
+12 -15
View File
@@ -54,7 +54,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
@Override @Override
public void renderInventory( BlockCharger blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj ) public void renderInventory( BlockCharger blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj )
{ {
Tessellator tess = Tessellator.instance; final Tessellator tess = Tessellator.instance;
renderer.renderAllFaces = true; renderer.renderAllFaces = true;
this.setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 ); this.setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
@@ -87,13 +87,13 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
{ {
this.preRenderInWorld( block, world, x, y, z, renderer ); this.preRenderInWorld( block, world, x, y, z, renderer );
BlockCharger blk = (BlockCharger) block; final BlockCharger blk = (BlockCharger) block;
IOrientable te = this.getOrientable( block, world, x, y, z ); final IOrientable te = this.getOrientable( block, world, x, y, z );
ForgeDirection fdy = te.getUp(); final ForgeDirection fdy = te.getUp();
ForgeDirection fdz = te.getForward(); final ForgeDirection fdz = te.getForward();
ForgeDirection fdx = Platform.crossProduct( fdz, fdy ).getOpposite(); final ForgeDirection fdx = Platform.crossProduct( fdz, fdy ).getOpposite();
renderer.renderAllFaces = true; renderer.renderAllFaces = true;
this.renderBlockBounds( renderer, 6, 1, 0, 10, 15, 2, fdx, fdy, fdz ); this.renderBlockBounds( renderer, 6, 1, 0, 10, 15, 2, fdx, fdy, fdz );
@@ -144,7 +144,7 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
GL11.glScalef( 1.0f / 1.1f, 1.0f / 1.1f, 1.0f / 1.1f ); GL11.glScalef( 1.0f / 1.1f, 1.0f / 1.1f, 1.0f / 1.1f );
GL11.glScalef( 1.0f, 1.0f, 1.0f ); GL11.glScalef( 1.0f, 1.0f, 1.0f );
Block blk = Block.getBlockFromItem( sis.getItem() ); final Block blk = Block.getBlockFromItem( sis.getItem() );
if( sis.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d( blk.getRenderType() ) ) if( sis.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d( blk.getRenderType() ) )
{ {
GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f ); GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
@@ -152,14 +152,11 @@ public class RenderBlockCharger extends BaseBlockRender<BlockCharger, TileCharge
GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f ); GL11.glRotatef( 30.0f, 0.0f, 1.0f, 0.0f );
} }
int br = tile.getWorldObj().getLightBrightnessForSkyBlocks( tile.xCoord, tile.yCoord, tile.zCoord, 0 );// << // << 20 | light << 4;
// 20 final int br = tile.getWorldObj().getLightBrightnessForSkyBlocks( tile.xCoord, tile.yCoord, tile.zCoord, 0 );
// | final int var11 = br % 65536;
// light final int var12 = br / 65536;
// <<
// 4;
int var11 = br % 65536;
int var12 = br / 65536;
OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, var11, var12 ); OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, var11, var12 );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
src/main/java/appeng/client/render/blocks/RenderBlockInscriber.java
+21 -23
View File
@@ -65,7 +65,7 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
@Override @Override
public void renderInventory( BlockInscriber blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj ) public void renderInventory( BlockInscriber blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj )
{ {
Tessellator tess = Tessellator.instance; final Tessellator tess = Tessellator.instance;
renderer.renderAllFaces = true; renderer.renderAllFaces = true;
this.setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 ); this.setInvRenderBounds( renderer, 6, 1, 0, 10, 15, 2 );
@@ -108,17 +108,17 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
{ {
this.preRenderInWorld( block, world, x, y, z, renderer ); this.preRenderInWorld( block, world, x, y, z, renderer );
BlockInscriber blk = (BlockInscriber) block; final BlockInscriber blk = (BlockInscriber) block;
IOrientable te = this.getOrientable( block, world, x, y, z ); final IOrientable te = this.getOrientable( block, world, x, y, z );
if( te == null ) if( te == null )
{ {
return false; return false;
} }
ForgeDirection fdy = te.getUp(); final ForgeDirection fdy = te.getUp();
ForgeDirection fdz = te.getForward(); final ForgeDirection fdz = te.getForward();
ForgeDirection fdx = Platform.crossProduct( fdz, fdy ).getOpposite(); final ForgeDirection fdx = Platform.crossProduct( fdz, fdy ).getOpposite();
renderer.renderAllFaces = true; renderer.renderAllFaces = true;
@@ -163,21 +163,21 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
Minecraft mc = Minecraft.getMinecraft(); Minecraft mc = Minecraft.getMinecraft();
mc.renderEngine.bindTexture( TextureMap.locationBlocksTexture ); mc.renderEngine.bindTexture( TextureMap.locationBlocksTexture );
int br = tile.getWorldObj().getLightBrightnessForSkyBlocks( tile.xCoord, tile.yCoord, tile.zCoord, 0 );// << 20 // << 20 | light << 4;
// | final int br = tile.getWorldObj().getLightBrightnessForSkyBlocks( tile.xCoord, tile.yCoord, tile.zCoord, 0 );
// light final int var11 = br % 65536;
// << 4; final int var12 = br / 65536;
int var11 = br % 65536;
int var12 = br / 65536;
OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, var11, var12 ); OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, var11, var12 );
float TwoPx = 2.0f / 16.0f; final float TwoPx = 2.0f / 16.0f;
float middle = 0.5f; float middle = 0.5f;
float press = 0.2f; float press = 0.2f;
float base = 0.4f; final float base = 0.4f;
long absoluteProgress = 0; long absoluteProgress = 0;
if( inv.smash ) if( inv.smash )
{ {
long currentTime = System.currentTimeMillis(); long currentTime = System.currentTimeMillis();
@@ -277,7 +277,8 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
GL11.glScalef( 1.0f / 1.1f, 1.0f / 1.1f, 1.0f / 1.1f ); GL11.glScalef( 1.0f / 1.1f, 1.0f / 1.1f, 1.0f / 1.1f );
GL11.glScalef( 1.0f, 1.0f, 1.0f ); GL11.glScalef( 1.0f, 1.0f, 1.0f );
Block blk = Block.getBlockFromItem( sis.getItem() ); final Block blk = Block.getBlockFromItem( sis.getItem() );
if( sis.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d( blk.getRenderType() ) ) if( sis.getItemSpriteNumber() == 0 && block != null && RenderBlocks.renderItemIn3d( blk.getRenderType() ) )
{ {
GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f ); GL11.glRotatef( 25.0f, 1.0f, 0.0f, 0.0f );
@@ -287,14 +288,11 @@ public class RenderBlockInscriber extends BaseBlockRender<BlockInscriber, TileIn
GL11.glRotatef( 90.0f, 1, 0, 0 ); GL11.glRotatef( 90.0f, 1, 0, 0 );
int br = tile.getWorldObj().getLightBrightnessForSkyBlocks( tile.xCoord, tile.yCoord, tile.zCoord, 0 );// << // << 20 | light << 4;
// 20 final int br = tile.getWorldObj().getLightBrightnessForSkyBlocks( tile.xCoord, tile.yCoord, tile.zCoord, 0 );
// | final int var11 = br % 65536;
// light final int var12 = br / 65536;
// <<
// 4;
int var11 = br % 65536;
int var12 = br / 65536;
OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, var11, var12 ); OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, var11, var12 );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
src/main/java/appeng/client/render/blocks/RenderBlockSkyChest.java
+23 -29
View File
@@ -20,6 +20,7 @@ package appeng.client.render.blocks;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.ModelChest; import net.minecraft.client.model.ModelChest;
@@ -38,7 +39,11 @@ import appeng.tile.storage.TileSkyChest;
public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyChest> public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyChest>
{ {
final ModelChest model = new ModelChest(); private final static ResourceLocation SKY_STONE_CHEST = new ResourceLocation( "appliedenergistics2", "textures/models/skychest.png" );
private final static ResourceLocation SKY_BLOCK_CHEST = new ResourceLocation( "appliedenergistics2", "textures/models/skyblockchest.png" );
private final static ResourceLocation METADATA_TO_TEXTURE[] = new ResourceLocation[] { SKY_STONE_CHEST, SKY_BLOCK_CHEST };
private final ModelChest model = new ModelChest();
public RenderBlockSkyChest() public RenderBlockSkyChest()
{ {
@@ -48,22 +53,15 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
@Override @Override
public void renderInventory( BlockSkyChest blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj ) public void renderInventory( BlockSkyChest blk, ItemStack is, RenderBlocks renderer, ItemRenderType type, Object[] obj )
{ {
GL11.glEnable( 32826 /* GL_RESCALE_NORMAL_EXT */); GL11.glEnable( GL12.GL_RESCALE_NORMAL );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
ResourceLocation loc; final int metaData = is.getItemDamage();
if( is.getItemDamage() == 1 ) final ResourceLocation loc = METADATA_TO_TEXTURE[metaData];
{
loc = new ResourceLocation( "appliedenergistics2", "textures/models/skyblockchest.png" );
}
else
{
loc = new ResourceLocation( "appliedenergistics2", "textures/models/skychest.png" );
}
Minecraft.getMinecraft().getTextureManager().bindTexture( loc ); Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
float lidAngle = 0.0f; final float lidAngle = 0.0f;
GL11.glScalef( 1.0F, -1F, -1F ); GL11.glScalef( 1.0F, -1F, -1F );
GL11.glTranslatef( -0.0F, -1.0F, -1.0F ); GL11.glTranslatef( -0.0F, -1.0F, -1.0F );
@@ -72,7 +70,7 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
this.model.chestLid.rotateAngleX = -( ( lidAngle * 3.141593F ) / 2.0F ); this.model.chestLid.rotateAngleX = -( ( lidAngle * 3.141593F ) / 2.0F );
this.model.renderAll(); this.model.renderAll();
GL11.glDisable( 32826 /* GL_RESCALE_NORMAL_EXT */); GL11.glDisable( GL12.GL_RESCALE_NORMAL );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
} }
@@ -90,26 +88,18 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
return; return;
} }
TileSkyChest skyChest = (TileSkyChest) tile; final TileSkyChest skyChest = (TileSkyChest) tile;
if( !skyChest.hasWorldObj() ) if( !skyChest.hasWorldObj() )
{ {
return; return;
} }
GL11.glEnable( 32826 /* GL_RESCALE_NORMAL_EXT */); GL11.glEnable( GL12.GL_RESCALE_NORMAL );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
ResourceLocation loc; final int metaData = tile.getWorldObj().getBlockMetadata( tile.xCoord, tile.yCoord, tile.zCoord );
final ResourceLocation loc = METADATA_TO_TEXTURE[metaData];
if( tile.getWorldObj().getBlockMetadata( tile.xCoord, tile.yCoord, tile.zCoord ) == 1 )
{
loc = new ResourceLocation( "appliedenergistics2", "textures/models/skyblockchest.png" );
}
else
{
loc = new ResourceLocation( "appliedenergistics2", "textures/models/skychest.png" );
}
Minecraft.getMinecraft().getTextureManager().bindTexture( loc ); Minecraft.getMinecraft().getTextureManager().bindTexture( loc );
@@ -118,8 +108,8 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
GL11.glScalef( 1.0F, -1F, -1F ); GL11.glScalef( 1.0F, -1F, -1F );
GL11.glTranslatef( -0.0F, -1.0F, -1.0F ); GL11.glTranslatef( -0.0F, -1.0F, -1.0F );
long now = System.currentTimeMillis(); final long now = System.currentTimeMillis();
long distance = now - skyChest.lastEvent; final long distance = now - skyChest.lastEvent;
if( skyChest.playerOpen > 0 ) if( skyChest.playerOpen > 0 )
{ {
@@ -146,9 +136,13 @@ public class RenderBlockSkyChest extends BaseBlockRender<BlockSkyChest, TileSkyC
this.model.chestLid.offsetY = -( 1.01f / 16.0f ); this.model.chestLid.offsetY = -( 1.01f / 16.0f );
this.model.chestLid.rotateAngleX = -( ( lidAngle * 3.141593F ) / 2.0F ); this.model.chestLid.rotateAngleX = -( ( lidAngle * 3.141593F ) / 2.0F );
this.model.renderAll();
GL11.glDisable( 32826 /* GL_RESCALE_NORMAL_EXT */); // The vanilla chests wants culling reversed...
GL11.glCullFace( GL11.GL_FRONT );
this.model.renderAll();
GL11.glCullFace( GL11.GL_BACK );
GL11.glDisable( GL12.GL_RESCALE_NORMAL );
GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F ); GL11.glColor4f( 1.0F, 1.0F, 1.0F, 1.0F );
} }
} }