keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Merge branch 'renderpass' of https://github.com/Chicken-Bones/MinecraftForge into TESRculling

Browse source 
Conflicts:
	patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
	patches/minecraft/net/minecraft/entity/Entity.java.patch
	patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
This commit is contained in:
Christian 2013-01-26 12:12:21 -05:00
commit b164f9b21e
5 changed files with 151 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
client/net/minecraftforge/client/ForgeHooksClient.java
View file

@ -413,4 +413,9 @@ public class ForgeHooksClient
} }
} }
} }
public static void setRenderPass(int pass)
{
renderPass = pass;
}
} }

30
patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch
View file

@ -56,7 +56,17 @@
GL11.glRotatef(var2.prevRotationYaw + (var2.rotationYaw - var2.prevRotationYaw) * par1 + 180.0F, 0.0F, -1.0F, 0.0F); GL11.glRotatef(var2.prevRotationYaw + (var2.rotationYaw - var2.prevRotationYaw) * par1 + 180.0F, 0.0F, -1.0F, 0.0F);
GL11.glRotatef(var2.prevRotationPitch + (var2.rotationPitch - var2.prevRotationPitch) * par1, -1.0F, 0.0F, 0.0F); GL11.glRotatef(var2.prevRotationPitch + (var2.rotationPitch - var2.prevRotationPitch) * par1, -1.0F, 0.0F, 0.0F);
} }
@@ -1139,8 +1143,11 @@ @@ -1124,7 +1128,9 @@
{
RenderHelper.enableStandardItemLighting();
this.mc.mcProfiler.endStartSection("entities");
+ ForgeHooksClient.setRenderPass(0);
var5.renderEntities(var4.getPosition(par1), var14, par1);
+ ForgeHooksClient.setRenderPass(-1);
this.enableLightmap((double)par1);
this.mc.mcProfiler.endStartSection("litParticles");
var6.renderLitParticles(var4, par1);
@@ -1139,8 +1145,11 @@
var17 = (EntityPlayer)var4; var17 = (EntityPlayer)var4;
GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glDisable(GL11.GL_ALPHA_TEST);
this.mc.mcProfiler.endStartSection("outline"); this.mc.mcProfiler.endStartSection("outline");
@ -70,7 +80,21 @@
GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glEnable(GL11.GL_ALPHA_TEST);
} }
} }
@@ -1204,15 +1211,18 @@ @@ -1194,6 +1203,13 @@
this.mc.mcProfiler.endStartSection("water");
var5.sortAndRender(var4, 1, (double)par1);
}
+
+ RenderHelper.enableStandardItemLighting();
+ this.mc.mcProfiler.endStartSection("entities");
+ ForgeHooksClient.setRenderPass(1);
+ var5.renderEntities(var4.getPosition(par1), var14, par1);
+ ForgeHooksClient.setRenderPass(-1);
+ RenderHelper.disableStandardItemLighting();
GL11.glDepthMask(true);
GL11.glEnable(GL11.GL_CULL_FACE);
@@ -1204,15 +1220,18 @@
var17 = (EntityPlayer)var4; var17 = (EntityPlayer)var4;
GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glDisable(GL11.GL_ALPHA_TEST);
this.mc.mcProfiler.endStartSection("outline"); this.mc.mcProfiler.endStartSection("outline");
@ -92,7 +116,7 @@
GL11.glDisable(GL11.GL_BLEND); GL11.glDisable(GL11.GL_BLEND);
this.mc.mcProfiler.endStartSection("weather"); this.mc.mcProfiler.endStartSection("weather");
this.renderRainSnow(par1); this.renderRainSnow(par1);
@@ -1222,6 +1232,9 @@ @@ -1222,6 +1241,9 @@
{ {
this.renderCloudsCheck(var5, par1); this.renderCloudsCheck(var5, par1);
} }

120
patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
View file

@ -1,28 +1,120 @@
--- ../src_base/minecraft/net/minecraft/client/renderer/RenderGlobal.java --- ../src_base/minecraft/net/minecraft/client/renderer/RenderGlobal.java
+++ ../src_work/minecraft/net/minecraft/client/renderer/RenderGlobal.java +++ ../src_work/minecraft/net/minecraft/client/renderer/RenderGlobal.java
@@ -62,6 +62,8 @@ @@ -62,6 +62,9 @@
import org.lwjgl.opengl.ARBOcclusionQuery; import org.lwjgl.opengl.ARBOcclusionQuery;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
+import net.minecraftforge.client.IRenderHandler; +import net.minecraftforge.client.IRenderHandler;
+import net.minecraftforge.client.MinecraftForgeClient;
+ +
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class RenderGlobal implements IWorldAccess public class RenderGlobal implements IWorldAccess
{ {
@@ -494,7 +496,11 @@ @@ -439,62 +442,72 @@
*/
public void renderEntities(Vec3 par1Vec3, ICamera par2ICamera, float par3)
{
+ int pass = MinecraftForgeClient.getRenderPass();
if (this.renderEntitiesStartupCounter > 0)
{
+ if(pass > 0)
+ return;
+
--this.renderEntitiesStartupCounter;
}
else
{
- this.theWorld.theProfiler.startSection("prepare");
- TileEntityRenderer.instance.cacheActiveRenderInfo(this.theWorld, this.renderEngine, this.mc.fontRenderer, this.mc.renderViewEntity, par3);
- RenderManager.instance.cacheActiveRenderInfo(this.theWorld, this.renderEngine, this.mc.fontRenderer, this.mc.renderViewEntity, this.mc.gameSettings, par3);
- this.countEntitiesTotal = 0;
- this.countEntitiesRendered = 0;
- this.countEntitiesHidden = 0;
- EntityLiving var4 = this.mc.renderViewEntity;
- RenderManager.renderPosX = var4.lastTickPosX + (var4.posX - var4.lastTickPosX) * (double)par3;
- RenderManager.renderPosY = var4.lastTickPosY + (var4.posY - var4.lastTickPosY) * (double)par3;
- RenderManager.renderPosZ = var4.lastTickPosZ + (var4.posZ - var4.lastTickPosZ) * (double)par3;
- TileEntityRenderer.staticPlayerX = var4.lastTickPosX + (var4.posX - var4.lastTickPosX) * (double)par3;
- TileEntityRenderer.staticPlayerY = var4.lastTickPosY + (var4.posY - var4.lastTickPosY) * (double)par3;
- TileEntityRenderer.staticPlayerZ = var4.lastTickPosZ + (var4.posZ - var4.lastTickPosZ) * (double)par3;
+ List var5 = this.theWorld.getLoadedEntityList();
+ if(pass == 0)
+ {
+ this.theWorld.theProfiler.startSection("prepare");
+ TileEntityRenderer.instance.cacheActiveRenderInfo(this.theWorld, this.renderEngine, this.mc.fontRenderer, this.mc.renderViewEntity, par3);
+ RenderManager.instance.cacheActiveRenderInfo(this.theWorld, this.renderEngine, this.mc.fontRenderer, this.mc.renderViewEntity, this.mc.gameSettings, par3);
+ this.countEntitiesTotal = 0;
+ this.countEntitiesRendered = 0;
+ this.countEntitiesHidden = 0;
+ EntityLiving var4 = this.mc.renderViewEntity;
+ RenderManager.renderPosX = var4.lastTickPosX + (var4.posX - var4.lastTickPosX) * (double)par3;
+ RenderManager.renderPosY = var4.lastTickPosY + (var4.posY - var4.lastTickPosY) * (double)par3;
+ RenderManager.renderPosZ = var4.lastTickPosZ + (var4.posZ - var4.lastTickPosZ) * (double)par3;
+ TileEntityRenderer.staticPlayerX = var4.lastTickPosX + (var4.posX - var4.lastTickPosX) * (double)par3;
+ TileEntityRenderer.staticPlayerY = var4.lastTickPosY + (var4.posY - var4.lastTickPosY) * (double)par3;
+ TileEntityRenderer.staticPlayerZ = var4.lastTickPosZ + (var4.posZ - var4.lastTickPosZ) * (double)par3;
+ this.countEntitiesTotal = var5.size();
+ }
this.mc.entityRenderer.enableLightmap((double)par3);
this.theWorld.theProfiler.endStartSection("global");
- List var5 = this.theWorld.getLoadedEntityList();
- this.countEntitiesTotal = var5.size();
int var6;
Entity var7;
for (var6 = 0; var6 < this.theWorld.weatherEffects.size(); ++var6)
{
var7 = (Entity)this.theWorld.weatherEffects.get(var6);
- ++this.countEntitiesRendered;
-
- if (var7.isInRangeToRenderVec3D(par1Vec3))
- {
- RenderManager.instance.renderEntity(var7, par3);
- }
- }
-
- this.theWorld.theProfiler.endStartSection("entities");
-
- for (var6 = 0; var6 < var5.size(); ++var6)
- {
- var7 = (Entity)var5.get(var6);
-
- if (var7.isInRangeToRenderVec3D(par1Vec3) && (var7.ignoreFrustumCheck || par2ICamera.isBoundingBoxInFrustum(var7.boundingBox) || var7.riddenByEntity == this.mc.thePlayer) && (var7 != this.mc.renderViewEntity || this.mc.gameSettings.thirdPersonView != 0 || this.mc.renderViewEntity.isPlayerSleeping()) && this.theWorld.blockExists(MathHelper.floor_double(var7.posX), 0, MathHelper.floor_double(var7.posZ)))
+
+ if (var7.shouldRenderInPass(pass) && var7.isInRangeToRenderVec3D(par1Vec3))
{
++this.countEntitiesRendered;
RenderManager.instance.renderEntity(var7, par3);
}
}
+ this.theWorld.theProfiler.endStartSection("entities");
+
+ for (var6 = 0; var6 < var5.size(); ++var6)
+ {
+ var7 = (Entity)var5.get(var6);
+
+ if (var7.shouldRenderInPass(pass) && var7.isInRangeToRenderVec3D(par1Vec3) && (var7.ignoreFrustumCheck || par2ICamera.isBoundingBoxInFrustum(var7.boundingBox) || var7.riddenByEntity == this.mc.thePlayer) && (var7 != this.mc.renderViewEntity || this.mc.gameSettings.thirdPersonView != 0 || this.mc.renderViewEntity.isPlayerSleeping()) && this.theWorld.blockExists(MathHelper.floor_double(var7.posX), 0, MathHelper.floor_double(var7.posZ)))
+ {
+ ++this.countEntitiesRendered;
+ RenderManager.instance.renderEntity(var7, par3);
+ }
+ }
+
this.theWorld.theProfiler.endStartSection("tileentities");
RenderHelper.enableStandardItemLighting();
+ TileEntity te;
for (var6 = 0; var6 < this.tileEntities.size(); ++var6) for (var6 = 0; var6 < this.tileEntities.size(); ++var6)
{ {
- TileEntityRenderer.instance.renderTileEntity((TileEntity)this.tileEntities.get(var6), par3); - TileEntityRenderer.instance.renderTileEntity((TileEntity)this.tileEntities.get(var6), par3);
+ TileEntity te = (TileEntity)this.tileEntities.get(var6); + te = (TileEntity)this.tileEntities.get(var6);
+ if (par2ICamera.isBoundingBoxInFrustum(te.getRenderBoundingBox())) + if(par2ICamera.isBoundingBoxInFrustum(te.getRenderBoundingBox()) && te.shouldRenderInPass(pass))
+ {
+ TileEntityRenderer.instance.renderTileEntity(te, par3); + TileEntityRenderer.instance.renderTileEntity(te, par3);
+ }
} }
this.mc.entityRenderer.disableLightmap((double)par3); this.mc.entityRenderer.disableLightmap((double)par3);
@@ -929,6 +935,12 @@ @@ -929,6 +942,12 @@
*/ */
public void renderSky(float par1) public void renderSky(float par1)
{ {
@ -35,7 +127,7 @@
if (this.mc.theWorld.provider.dimensionId == 1) if (this.mc.theWorld.provider.dimensionId == 1)
{ {
GL11.glDisable(GL11.GL_FOG); GL11.glDisable(GL11.GL_FOG);
@@ -1167,6 +1179,13 @@ @@ -1167,6 +1186,13 @@
public void renderClouds(float par1) public void renderClouds(float par1)
{ {
@ -49,7 +141,7 @@
if (this.mc.theWorld.provider.isSurfaceWorld()) if (this.mc.theWorld.provider.isSurfaceWorld())
{ {
if (this.mc.gameSettings.fancyGraphics) if (this.mc.gameSettings.fancyGraphics)
@@ -1596,6 +1615,11 @@ @@ -1596,6 +1622,11 @@
} }
public void drawBlockDamageTexture(Tessellator par1Tessellator, EntityPlayer par2EntityPlayer, float par3) public void drawBlockDamageTexture(Tessellator par1Tessellator, EntityPlayer par2EntityPlayer, float par3)
@ -61,7 +153,7 @@
{ {
double var4 = par2EntityPlayer.lastTickPosX + (par2EntityPlayer.posX - par2EntityPlayer.lastTickPosX) * (double)par3; double var4 = par2EntityPlayer.lastTickPosX + (par2EntityPlayer.posX - par2EntityPlayer.lastTickPosX) * (double)par3;
double var6 = par2EntityPlayer.lastTickPosY + (par2EntityPlayer.posY - par2EntityPlayer.lastTickPosY) * (double)par3; double var6 = par2EntityPlayer.lastTickPosY + (par2EntityPlayer.posY - par2EntityPlayer.lastTickPosY) * (double)par3;
@@ -1873,6 +1897,7 @@ @@ -1873,6 +1904,7 @@
double var17 = this.mc.renderViewEntity.posY - par4; double var17 = this.mc.renderViewEntity.posY - par4;
double var19 = this.mc.renderViewEntity.posZ - par6; double var19 = this.mc.renderViewEntity.posZ - par6;
EntityFX var21 = null; EntityFX var21 = null;
@ -69,7 +161,7 @@
if (par1Str.equals("hugeexplosion")) if (par1Str.equals("hugeexplosion"))
{ {
@@ -2009,6 +2034,7 @@ @@ -2009,6 +2041,7 @@
else if (par1Str.equals("snowballpoof")) else if (par1Str.equals("snowballpoof"))
{ {
var21 = new EntityBreakingFX(this.theWorld, par2, par4, par6, Item.snowball); var21 = new EntityBreakingFX(this.theWorld, par2, par4, par6, Item.snowball);
@ -77,7 +169,7 @@
} }
else if (par1Str.equals("dripWater")) else if (par1Str.equals("dripWater"))
{ {
@@ -2025,6 +2051,7 @@ @@ -2025,6 +2058,7 @@
else if (par1Str.equals("slime")) else if (par1Str.equals("slime"))
{ {
var21 = new EntityBreakingFX(this.theWorld, par2, par4, par6, Item.slimeBall); var21 = new EntityBreakingFX(this.theWorld, par2, par4, par6, Item.slimeBall);
@ -85,7 +177,7 @@
} }
else if (par1Str.equals("heart")) else if (par1Str.equals("heart"))
{ {
@@ -2046,6 +2073,7 @@ @@ -2046,6 +2080,7 @@
{ {
int var27 = Integer.parseInt(par1Str.substring(par1Str.indexOf("_") + 1)); int var27 = Integer.parseInt(par1Str.substring(par1Str.indexOf("_") + 1));
var21 = new EntityBreakingFX(this.theWorld, par2, par4, par6, par8, par10, par12, Item.itemsList[var27]); var21 = new EntityBreakingFX(this.theWorld, par2, par4, par6, par8, par10, par12, Item.itemsList[var27]);
@ -93,7 +185,7 @@
} }
else if (par1Str.startsWith("tilecrack_")) else if (par1Str.startsWith("tilecrack_"))
{ {
@@ -2053,11 +2081,12 @@ @@ -2053,11 +2088,12 @@
int var25 = Integer.parseInt(var28[1]); int var25 = Integer.parseInt(var28[1]);
int var26 = Integer.parseInt(var28[2]); int var26 = Integer.parseInt(var28[2]);
var21 = (new EntityDiggingFX(this.theWorld, par2, par4, par6, par8, par10, par12, Block.blocksList[var25], 0, var26)).applyRenderColor(var26); var21 = (new EntityDiggingFX(this.theWorld, par2, par4, par6, par8, par10, par12, Block.blocksList[var25], 0, var26)).applyRenderColor(var26);

7
patches/minecraft/net/minecraft/entity/Entity.java.patch
View file

@ -138,7 +138,7 @@
} }
public int func_82143_as() public int func_82143_as()
@@ -2399,4 +2441,92 @@ @@ -2399,4 +2441,97 @@
{ {
return this.isBurning(); return this.isBurning();
} }
@ -229,5 +229,10 @@
+ public final void resetEntityId() + public final void resetEntityId()
+ { + {
+ this.entityId = nextEntityID++; + this.entityId = nextEntityID++;
+ }
+
+ public boolean shouldRenderInPass(int pass)
+ {
+ return pass == 0;
+ } + }
} }

13
patches/minecraft/net/minecraft/tileentity/TileEntity.java.patch
View file

@ -1,25 +1,22 @@
--- ../src_base/minecraft/net/minecraft/tileentity/TileEntity.java --- ../src_base/minecraft/net/minecraft/tileentity/TileEntity.java
+++ ../src_work/minecraft/net/minecraft/tileentity/TileEntity.java +++ ../src_work/minecraft/net/minecraft/tileentity/TileEntity.java
@@ -9,9 +9,14 @@ @@ -11,7 +11,10 @@
import net.minecraft.block.Block;
import net.minecraft.block.TileEntityRecordPlayer; import net.minecraft.block.TileEntityRecordPlayer;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.crash.CrashReportCategory; import net.minecraft.crash.CrashReportCategory;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.INetworkManager; +import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.Packet132TileEntityData; +import net.minecraft.network.packet.Packet132TileEntityData;
+import net.minecraft.util.AABBPool;
+import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World; import net.minecraft.world.World;
public class TileEntity public class TileEntity
@@ -296,4 +301,75 @@ @@ -296,4 +299,80 @@
addMapping(TileEntityBeacon.class, "Beacon"); addMapping(TileEntityBeacon.class, "Beacon");
addMapping(TileEntitySkull.class, "Skull"); addMapping(TileEntitySkull.class, "Skull");
} }
+ +
+ // -- BEGIN FORGE PATCHES --
+ /** + /**
+ * Determines if this TileEntity requires update calls. + * Determines if this TileEntity requires update calls.
+ * @return True if you want updateEntity() to be called, false if not + * @return True if you want updateEntity() to be called, false if not
@ -68,6 +65,10 @@
+ return true; + return true;
+ } + }
+ +
+ public boolean shouldRenderInPass(int pass)
+ {
+ return pass == 0;
+ }
+ /** + /**
+ * Default render bounding box: infinite in scope. Used to control rendering on {@link TileEntitySpecialRenderer}. + * Default render bounding box: infinite in scope. Used to control rendering on {@link TileEntitySpecialRenderer}.
+ */ + */