Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1150 from Mrkol/master

Browse source 
Fix Z-fighting.
This commit is contained in:
CovertJaguar 2013-08-22 21:20:38 -07:00
commit 4ab4ec3b67
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/buildcraft/transport/render/PipeWorldRenderer.java
View file

@ -270,14 +270,14 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler {
if (state.pipeConnectionMatrix.isConnected(direction)) { if (state.pipeConnectionMatrix.isConnected(direction)) {
float[][] rotated = deepClone(zeroState); float[][] rotated = deepClone(zeroState);
rotated[2][0] = 0.0F; rotated[2][0] = 0.0F;
rotated[2][1] = Utils.pipeMinPos; rotated[2][1] = Utils.pipeMinPos - zFightOffset;
rotated[1][0] -= zFightOffset / 2; rotated[1][0] -= zFightOffset / 2;
transform(rotated, direction); transform(rotated, direction);
renderblocks.setRenderBounds(rotated[0][0], rotated[1][0], rotated[2][0], rotated[0][1], rotated[1][1], rotated[2][1]); renderblocks.setRenderBounds(rotated[0][0], rotated[1][0], rotated[2][0], rotated[0][1], rotated[1][1], rotated[2][1]);
renderblocks.renderStandardBlock(block, x, y, z); renderblocks.renderStandardBlock(block, x, y, z);
rotated = deepClone(zeroState); rotated = deepClone(zeroState);
rotated[2][0] = Utils.pipeMaxPos; rotated[2][0] = Utils.pipeMaxPos + zFightOffset;
rotated[1][0] -= zFightOffset / 2; rotated[1][0] -= zFightOffset / 2;
transform(rotated, direction); transform(rotated, direction);
renderblocks.setRenderBounds(rotated[0][0], rotated[1][0], rotated[2][0], rotated[0][1], rotated[1][1], rotated[2][1]); renderblocks.setRenderBounds(rotated[0][0], rotated[1][0], rotated[2][0], rotated[0][1], rotated[1][1], rotated[2][1]);
@ -285,14 +285,14 @@ public class PipeWorldRenderer implements ISimpleBlockRenderingHandler {
rotated = deepClone(zeroState); rotated = deepClone(zeroState);
rotated[0][0] = 0.0F; rotated[0][0] = 0.0F;
rotated[0][1] = Utils.pipeMinPos; rotated[0][1] = Utils.pipeMinPos - zFightOffset;
rotated[1][1] -= zFightOffset; rotated[1][1] -= zFightOffset;
transform(rotated, direction); transform(rotated, direction);
renderblocks.setRenderBounds(rotated[0][0], rotated[1][0], rotated[2][0], rotated[0][1], rotated[1][1], rotated[2][1]); renderblocks.setRenderBounds(rotated[0][0], rotated[1][0], rotated[2][0], rotated[0][1], rotated[1][1], rotated[2][1]);
renderblocks.renderStandardBlock(block, x, y, z); renderblocks.renderStandardBlock(block, x, y, z);
rotated = deepClone(zeroState); rotated = deepClone(zeroState);
rotated[0][0] = Utils.pipeMaxPos; rotated[0][0] = Utils.pipeMaxPos + zFightOffset;
rotated[0][1] = 1F; rotated[0][1] = 1F;
rotated[1][1] -= zFightOffset; rotated[1][1] -= zFightOffset;
transform(rotated, direction); transform(rotated, direction);