remove useless mipped layer
This commit is contained in:
parent
af68ad3f30
commit
95948c7602
14 changed files with 17 additions and 22 deletions
|
@ -1181,10 +1181,7 @@ public class EntityRenderer {
|
||||||
GlState.disableAlpha();
|
GlState.disableAlpha();
|
||||||
renderglobal.renderBlockLayer(BlockLayer.SOLID, (double)partialTicks, entity);
|
renderglobal.renderBlockLayer(BlockLayer.SOLID, (double)partialTicks, entity);
|
||||||
GlState.enableAlpha();
|
GlState.enableAlpha();
|
||||||
renderglobal.renderBlockLayer(BlockLayer.CUTOUT_MIPPED, (double)partialTicks, entity);
|
|
||||||
// this.gm.getTextureManager().getTexture(TextureMap.locationBlocksTexture).unsetMipmap();
|
|
||||||
renderglobal.renderBlockLayer(BlockLayer.CUTOUT, (double)partialTicks, entity);
|
renderglobal.renderBlockLayer(BlockLayer.CUTOUT, (double)partialTicks, entity);
|
||||||
// this.gm.getTextureManager().getTexture(TextureMap.locationBlocksTexture).restoreLastMipmap();
|
|
||||||
GlState.shadeModel(GL11.GL_FLAT);
|
GlState.shadeModel(GL11.GL_FLAT);
|
||||||
GlState.alphaFunc(GL11.GL_GREATER, 0.1F);
|
GlState.alphaFunc(GL11.GL_GREATER, 0.1F);
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,7 @@ public class RegionRenderCacheBuilder
|
||||||
public RegionRenderCacheBuilder()
|
public RegionRenderCacheBuilder()
|
||||||
{
|
{
|
||||||
this.buffers[BlockLayer.SOLID.ordinal()] = new RenderBuffer(2097152);
|
this.buffers[BlockLayer.SOLID.ordinal()] = new RenderBuffer(2097152);
|
||||||
this.buffers[BlockLayer.CUTOUT.ordinal()] = new RenderBuffer(131072);
|
this.buffers[BlockLayer.CUTOUT.ordinal()] = new RenderBuffer(262144);
|
||||||
this.buffers[BlockLayer.CUTOUT_MIPPED.ordinal()] = new RenderBuffer(131072);
|
|
||||||
this.buffers[BlockLayer.TRANSLUCENT.ordinal()] = new RenderBuffer(262144);
|
this.buffers[BlockLayer.TRANSLUCENT.ordinal()] = new RenderBuffer(262144);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -170,20 +170,20 @@ public class RenderChunk
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BlockLayer enumworldblocklayer1 = block.getRenderLayer();
|
BlockLayer layer = block.getRenderLayer();
|
||||||
int j = enumworldblocklayer1.ordinal();
|
int idx = layer.ordinal();
|
||||||
|
|
||||||
if (block != Blocks.air)
|
if (block != Blocks.air)
|
||||||
{
|
{
|
||||||
RenderBuffer worldrenderer = generator.getRegionRenderCacheBuilder().getWorldRendererByLayerId(j);
|
RenderBuffer worldrenderer = generator.getRegionRenderCacheBuilder().getWorldRendererByLayerId(idx);
|
||||||
|
|
||||||
if (!compiledchunk.isLayerStarted(enumworldblocklayer1))
|
if (!compiledchunk.isLayerStarted(layer))
|
||||||
{
|
{
|
||||||
compiledchunk.setLayerStarted(enumworldblocklayer1);
|
compiledchunk.setLayerStarted(layer);
|
||||||
this.preRenderBlocks(worldrenderer, blockpos);
|
this.preRenderBlocks(worldrenderer, blockpos);
|
||||||
}
|
}
|
||||||
|
|
||||||
aboolean[j] |= blockrendererdispatcher.renderBlock(iblockstate, blockpos$mutableblockpos, iblockaccess, worldrenderer);
|
aboolean[idx] |= blockrendererdispatcher.renderBlock(iblockstate, blockpos$mutableblockpos, iblockaccess, worldrenderer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -183,7 +183,7 @@ public class BlockPane extends Block
|
||||||
|
|
||||||
public BlockLayer getRenderLayer()
|
public BlockLayer getRenderLayer()
|
||||||
{
|
{
|
||||||
return BlockLayer.CUTOUT_MIPPED;
|
return BlockLayer.CUTOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Property[] getProperties()
|
protected Property[] getProperties()
|
||||||
|
|
|
@ -57,7 +57,7 @@ public class BlockDryLeaves extends BlockLeavesBase
|
||||||
//
|
//
|
||||||
// public EnumWorldBlockLayer getBlockLayer()
|
// public EnumWorldBlockLayer getBlockLayer()
|
||||||
// {
|
// {
|
||||||
// return this.isTransparent ? EnumWorldBlockLayer.CUTOUT_MIPPED : EnumWorldBlockLayer.SOLID;
|
// return this.isTransparent ? EnumWorldBlockLayer.CUTOUT : EnumWorldBlockLayer.SOLID;
|
||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
// public boolean isVisuallyOpaque()
|
// public boolean isVisuallyOpaque()
|
||||||
|
|
|
@ -94,7 +94,7 @@ public class BlockGrass extends Block implements IGrowable
|
||||||
|
|
||||||
public BlockLayer getRenderLayer()
|
public BlockLayer getRenderLayer()
|
||||||
{
|
{
|
||||||
return BlockLayer.CUTOUT_MIPPED;
|
return BlockLayer.CUTOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Model getModel(ModelProvider provider, String name, State state) {
|
public Model getModel(ModelProvider provider, String name, State state) {
|
||||||
|
|
|
@ -28,7 +28,7 @@ public class BlockLeavesBase extends Block
|
||||||
|
|
||||||
public BlockLayer getRenderLayer()
|
public BlockLayer getRenderLayer()
|
||||||
{
|
{
|
||||||
return /* this.transparent ? */ BlockLayer.CUTOUT_MIPPED; // : BlockLayer.SOLID;
|
return /* this.transparent ? */ BlockLayer.CUTOUT; // : BlockLayer.SOLID;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isVisuallyOpaque()
|
public boolean isVisuallyOpaque()
|
||||||
|
|
|
@ -95,7 +95,7 @@ public class BlockMycelium extends Block
|
||||||
|
|
||||||
public BlockLayer getRenderLayer()
|
public BlockLayer getRenderLayer()
|
||||||
{
|
{
|
||||||
return BlockLayer.CUTOUT_MIPPED;
|
return BlockLayer.CUTOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Model getModel(ModelProvider provider, String name, State state) {
|
public Model getModel(ModelProvider provider, String name, State state) {
|
||||||
|
|
|
@ -52,7 +52,7 @@ public class BlockSwamp extends Block
|
||||||
|
|
||||||
public BlockLayer getRenderLayer()
|
public BlockLayer getRenderLayer()
|
||||||
{
|
{
|
||||||
return BlockLayer.CUTOUT_MIPPED;
|
return BlockLayer.CUTOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Model getModel(ModelProvider provider, String name, State state) {
|
public Model getModel(ModelProvider provider, String name, State state) {
|
||||||
|
|
|
@ -44,7 +44,7 @@ public class BlockTianSoil extends Block
|
||||||
|
|
||||||
public BlockLayer getRenderLayer()
|
public BlockLayer getRenderLayer()
|
||||||
{
|
{
|
||||||
return BlockLayer.CUTOUT_MIPPED;
|
return BlockLayer.CUTOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Model getModel(ModelProvider provider, String name, State state) {
|
public Model getModel(ModelProvider provider, String name, State state) {
|
||||||
|
|
|
@ -40,7 +40,7 @@ public class BlockPodzol extends Block {
|
||||||
|
|
||||||
public BlockLayer getRenderLayer()
|
public BlockLayer getRenderLayer()
|
||||||
{
|
{
|
||||||
return BlockLayer.CUTOUT_MIPPED;
|
return BlockLayer.CUTOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Model getModel(ModelProvider provider, String name, State state) {
|
public Model getModel(ModelProvider provider, String name, State state) {
|
||||||
|
|
|
@ -181,7 +181,7 @@ public class BlockHopper extends Block implements ITileEntityProvider, Direction
|
||||||
|
|
||||||
public BlockLayer getRenderLayer()
|
public BlockLayer getRenderLayer()
|
||||||
{
|
{
|
||||||
return BlockLayer.CUTOUT_MIPPED;
|
return BlockLayer.CUTOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Property[] getProperties()
|
protected Property[] getProperties()
|
||||||
|
|
|
@ -327,7 +327,7 @@ public class BlockTripWireHook extends Block implements Rotatable
|
||||||
|
|
||||||
public BlockLayer getRenderLayer()
|
public BlockLayer getRenderLayer()
|
||||||
{
|
{
|
||||||
return BlockLayer.CUTOUT_MIPPED;
|
return BlockLayer.CUTOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Property[] getProperties()
|
protected Property[] getProperties()
|
||||||
|
|
|
@ -5,7 +5,6 @@ import common.util.Clientside;
|
||||||
@Clientside
|
@Clientside
|
||||||
public enum BlockLayer {
|
public enum BlockLayer {
|
||||||
SOLID("Solid"),
|
SOLID("Solid"),
|
||||||
CUTOUT_MIPPED("Mipped Cutout"),
|
|
||||||
CUTOUT("Cutout"),
|
CUTOUT("Cutout"),
|
||||||
TRANSLUCENT("Translucent");
|
TRANSLUCENT("Translucent");
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue