From 75c7318784d2aa38feae664ce49a236b41a10b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Thu, 28 Aug 2014 00:16:57 +0200 Subject: [PATCH] Fffff. --- .../oc/client/renderer/block/Assembler.scala | 116 +++++++-------- .../oc/client/renderer/block/Hologram.scala | 134 +++++++++--------- 2 files changed, 125 insertions(+), 125 deletions(-) diff --git a/src/main/scala/li/cil/oc/client/renderer/block/Assembler.scala b/src/main/scala/li/cil/oc/client/renderer/block/Assembler.scala index 7cddccae8..70af9cdeb 100644 --- a/src/main/scala/li/cil/oc/client/renderer/block/Assembler.scala +++ b/src/main/scala/li/cil/oc/client/renderer/block/Assembler.scala @@ -7,70 +7,70 @@ import net.minecraft.client.renderer.RenderBlocks import org.lwjgl.opengl.GL11 object Assembler { - def render(block: Block, metadata: Int, x: Int, y: Int, z: Int, renderer: RenderBlocks) { - val previousRenderAllFaces = renderer.renderAllFaces - renderer.renderAllFaces = true + def render(block: Block, metadata: Int, x: Int, y: Int, z: Int, renderer: RenderBlocks) { + val previousRenderAllFaces = renderer.renderAllFaces + renderer.renderAllFaces = true - // Bottom. - renderer.setRenderBounds(0, 0, 0, 1, 7 / 16f, 1) - renderer.renderStandardBlock(block, x, y, z) - // Middle. - renderer.setRenderBounds(2 / 16f, 7 / 16f, 2 / 16f, 14 / 16f, 9 / 16f, 14 / 16f) - renderer.renderStandardBlock(block, x, y, z) - // Top. - renderer.setRenderBounds(0, 9 / 16f, 0, 1, 1, 1) - renderer.renderStandardBlock(block, x, y, z) + // Bottom. + renderer.setRenderBounds(0, 0, 0, 1, 7 / 16f, 1) + renderer.renderStandardBlock(block, x, y, z) + // Middle. + renderer.setRenderBounds(2 / 16f, 7 / 16f, 2 / 16f, 14 / 16f, 9 / 16f, 14 / 16f) + renderer.renderStandardBlock(block, x, y, z) + // Top. + renderer.setRenderBounds(0, 9 / 16f, 0, 1, 1, 1) + renderer.renderStandardBlock(block, x, y, z) - renderer.renderAllFaces = previousRenderAllFaces - } + renderer.renderAllFaces = previousRenderAllFaces + } - def render(block: Block, metadata: Int, renderer: RenderBlocks) { - // Bottom. - renderer.setRenderBounds(0, 0, 0, 1, 7 / 16f, 1) - BlockRenderer.renderFaceYPos(block, metadata, renderer) - BlockRenderer.renderFaceYNeg(block, metadata, renderer) - BlockRenderer.renderFaceXPos(block, metadata, renderer) - BlockRenderer.renderFaceXNeg(block, metadata, renderer) - BlockRenderer.renderFaceZPos(block, metadata, renderer) - BlockRenderer.renderFaceZNeg(block, metadata, renderer) + def render(block: Block, metadata: Int, renderer: RenderBlocks) { + // Bottom. + renderer.setRenderBounds(0, 0, 0, 1, 7 / 16f, 1) + BlockRenderer.renderFaceYPos(block, metadata, renderer) + BlockRenderer.renderFaceYNeg(block, metadata, renderer) + BlockRenderer.renderFaceXPos(block, metadata, renderer) + BlockRenderer.renderFaceXNeg(block, metadata, renderer) + BlockRenderer.renderFaceZPos(block, metadata, renderer) + BlockRenderer.renderFaceZNeg(block, metadata, renderer) - // Middle. - val previousRenderAllFaces = renderer.renderAllFaces - renderer.renderAllFaces = true - renderer.setRenderBounds(2 / 16f, 7 / 16f, 2 / 16f, 14 / 16f, 9 / 16f, 14 / 16f) - BlockRenderer.renderFaceXPos(block, metadata, renderer) - BlockRenderer.renderFaceXNeg(block, metadata, renderer) - BlockRenderer.renderFaceZPos(block, metadata, renderer) - BlockRenderer.renderFaceZNeg(block, metadata, renderer) - renderer.renderAllFaces = previousRenderAllFaces + // Middle. + val previousRenderAllFaces = renderer.renderAllFaces + renderer.renderAllFaces = true + renderer.setRenderBounds(2 / 16f, 7 / 16f, 2 / 16f, 14 / 16f, 9 / 16f, 14 / 16f) + BlockRenderer.renderFaceXPos(block, metadata, renderer) + BlockRenderer.renderFaceXNeg(block, metadata, renderer) + BlockRenderer.renderFaceZPos(block, metadata, renderer) + BlockRenderer.renderFaceZNeg(block, metadata, renderer) + renderer.renderAllFaces = previousRenderAllFaces - // Top. - renderer.setRenderBounds(0, 9 / 16f, 0, 1, 1, 1) - BlockRenderer.renderFaceYPos(block, metadata, renderer) - BlockRenderer.renderFaceYNeg(block, metadata, renderer) - BlockRenderer.renderFaceXPos(block, metadata, renderer) - BlockRenderer.renderFaceXNeg(block, metadata, renderer) - BlockRenderer.renderFaceZPos(block, metadata, renderer) - BlockRenderer.renderFaceZNeg(block, metadata, renderer) + // Top. + renderer.setRenderBounds(0, 9 / 16f, 0, 1, 1, 1) + BlockRenderer.renderFaceYPos(block, metadata, renderer) + BlockRenderer.renderFaceYNeg(block, metadata, renderer) + BlockRenderer.renderFaceXPos(block, metadata, renderer) + BlockRenderer.renderFaceXNeg(block, metadata, renderer) + BlockRenderer.renderFaceZPos(block, metadata, renderer) + BlockRenderer.renderFaceZNeg(block, metadata, renderer) - GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS) - RenderState.makeItBlend() - RenderState.disableLighting() + GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS) + RenderState.makeItBlend() + RenderState.disableLighting() - renderer.setOverrideBlockTexture(Textures.RobotAssembler.iconTopOn) - renderer.setRenderBounds(0, 0, 0, 1, 1.05, 1) - BlockRenderer.renderFaceYPos(block, metadata, renderer) + renderer.setOverrideBlockTexture(Textures.RobotAssembler.iconTopOn) + renderer.setRenderBounds(0, 0, 0, 1, 1.05, 1) + BlockRenderer.renderFaceYPos(block, metadata, renderer) - renderer.setOverrideBlockTexture(Textures.RobotAssembler.iconSideOn) - renderer.setRenderBounds(-0.005, 0, 0, 1.005, 1, 1) - BlockRenderer.renderFaceXPos(block, metadata, renderer) - BlockRenderer.renderFaceXNeg(block, metadata, renderer) - renderer.setRenderBounds(0, 0, -0.005, 1, 1, 1.005) - BlockRenderer.renderFaceZPos(block, metadata, renderer) - BlockRenderer.renderFaceZNeg(block, metadata, renderer) + renderer.setOverrideBlockTexture(Textures.RobotAssembler.iconSideOn) + renderer.setRenderBounds(-0.005, 0, 0, 1.005, 1, 1) + BlockRenderer.renderFaceXPos(block, metadata, renderer) + BlockRenderer.renderFaceXNeg(block, metadata, renderer) + renderer.setRenderBounds(0, 0, -0.005, 1, 1, 1.005) + BlockRenderer.renderFaceZPos(block, metadata, renderer) + BlockRenderer.renderFaceZNeg(block, metadata, renderer) - renderer.clearOverrideBlockTexture() - RenderState.enableLighting() - GL11.glPopAttrib() - } - } + renderer.clearOverrideBlockTexture() + RenderState.enableLighting() + GL11.glPopAttrib() + } +} diff --git a/src/main/scala/li/cil/oc/client/renderer/block/Hologram.scala b/src/main/scala/li/cil/oc/client/renderer/block/Hologram.scala index f23f511bc..310bb9f73 100644 --- a/src/main/scala/li/cil/oc/client/renderer/block/Hologram.scala +++ b/src/main/scala/li/cil/oc/client/renderer/block/Hologram.scala @@ -4,92 +4,92 @@ import net.minecraft.block.Block import net.minecraft.client.renderer.RenderBlocks object Hologram { - def render(block: Block, metadata: Int, x: Int, y: Int, z: Int, renderer: RenderBlocks) { - // Center. - renderer.setRenderBounds(4 / 16f, 0, 4 / 16f, 12 / 16f, 3 / 16f, 12 / 16f) - renderer.renderStandardBlock(block, x, y, z) + def render(block: Block, metadata: Int, x: Int, y: Int, z: Int, renderer: RenderBlocks) { + // Center. + renderer.setRenderBounds(4 / 16f, 0, 4 / 16f, 12 / 16f, 3 / 16f, 12 / 16f) + renderer.renderStandardBlock(block, x, y, z) - val previousRenderAllFaces = renderer.renderAllFaces - renderer.renderAllFaces = true + val previousRenderAllFaces = renderer.renderAllFaces + renderer.renderAllFaces = true - // Walls. - renderer.setRenderBounds(0, 0, 0, 2 / 16f, 7 / 16f, 1) - renderer.renderStandardBlock(block, x, y, z) + // Walls. + renderer.setRenderBounds(0, 0, 0, 2 / 16f, 7 / 16f, 1) + renderer.renderStandardBlock(block, x, y, z) - renderer.setRenderBounds(14 / 16f, 0, 0, 1, 7 / 16f, 1) - renderer.renderStandardBlock(block, x, y, z) + renderer.setRenderBounds(14 / 16f, 0, 0, 1, 7 / 16f, 1) + renderer.renderStandardBlock(block, x, y, z) - renderer.setRenderBounds(2 / 16f, 0, 0, 14 / 16f, 7 / 16f, 2 / 16f) - renderer.renderStandardBlock(block, x, y, z) + renderer.setRenderBounds(2 / 16f, 0, 0, 14 / 16f, 7 / 16f, 2 / 16f) + renderer.renderStandardBlock(block, x, y, z) - renderer.setRenderBounds(2 / 16f, 0, 14 / 16f, 14 / 16f, 7 / 16f, 1) - renderer.renderStandardBlock(block, x, y, z) + renderer.setRenderBounds(2 / 16f, 0, 14 / 16f, 14 / 16f, 7 / 16f, 1) + renderer.renderStandardBlock(block, x, y, z) - // Inner. - renderer.setRenderBounds(2 / 16f, 2 / 16f, 2 / 16f, 4 / 16f, 5 / 16f, 14 / 16f) - renderer.renderStandardBlock(block, x, y, z) + // Inner. + renderer.setRenderBounds(2 / 16f, 2 / 16f, 2 / 16f, 4 / 16f, 5 / 16f, 14 / 16f) + renderer.renderStandardBlock(block, x, y, z) - renderer.setRenderBounds(12 / 16f, 2 / 16f, 2 / 16f, 14 / 16f, 5 / 16f, 14 / 16f) - renderer.renderStandardBlock(block, x, y, z) + renderer.setRenderBounds(12 / 16f, 2 / 16f, 2 / 16f, 14 / 16f, 5 / 16f, 14 / 16f) + renderer.renderStandardBlock(block, x, y, z) - renderer.setRenderBounds(4 / 16f, 2 / 16f, 2 / 16f, 12 / 16f, 5 / 16f, 4 / 16f) - renderer.renderStandardBlock(block, x, y, z) + renderer.setRenderBounds(4 / 16f, 2 / 16f, 2 / 16f, 12 / 16f, 5 / 16f, 4 / 16f) + renderer.renderStandardBlock(block, x, y, z) - renderer.setRenderBounds(4 / 16f, 2 / 16f, 12 / 16f, 12 / 16f, 5 / 16f, 14 / 16f) - renderer.renderStandardBlock(block, x, y, z) + renderer.setRenderBounds(4 / 16f, 2 / 16f, 12 / 16f, 12 / 16f, 5 / 16f, 14 / 16f) + renderer.renderStandardBlock(block, x, y, z) - renderer.renderAllFaces = previousRenderAllFaces - } + renderer.renderAllFaces = previousRenderAllFaces + } - def render(block: Block, metadata: Int, renderer: RenderBlocks) { - val previousRenderAllFaces = renderer.renderAllFaces - renderer.renderAllFaces = true + def render(block: Block, metadata: Int, renderer: RenderBlocks) { + val previousRenderAllFaces = renderer.renderAllFaces + renderer.renderAllFaces = true - // Base and walls. - renderer.setRenderBounds(4 / 16f, 0, 4 / 16f, 12 / 16f, 3 / 16f, 12 / 16f) - BlockRenderer.renderFaceYPos(block, metadata, renderer) + // Base and walls. + renderer.setRenderBounds(4 / 16f, 0, 4 / 16f, 12 / 16f, 3 / 16f, 12 / 16f) + BlockRenderer.renderFaceYPos(block, metadata, renderer) - renderer.setRenderBounds(0, 0, 0, 1, 7 / 16f, 1) - BlockRenderer.renderFaceYNeg(block, metadata, renderer) - BlockRenderer.renderFaceXPos(block, metadata, renderer) - BlockRenderer.renderFaceXNeg(block, metadata, renderer) - BlockRenderer.renderFaceZPos(block, metadata, renderer) - BlockRenderer.renderFaceZNeg(block, metadata, renderer) + renderer.setRenderBounds(0, 0, 0, 1, 7 / 16f, 1) + BlockRenderer.renderFaceYNeg(block, metadata, renderer) + BlockRenderer.renderFaceXPos(block, metadata, renderer) + BlockRenderer.renderFaceXNeg(block, metadata, renderer) + BlockRenderer.renderFaceZPos(block, metadata, renderer) + BlockRenderer.renderFaceZNeg(block, metadata, renderer) - // Layer 1. - renderer.setRenderBounds(2 / 16f, 3 / 16f, 2 / 16f, 4 / 16f, 5 / 16f, 14 / 16f) - BlockRenderer.renderFaceYPos(block, metadata, renderer) - BlockRenderer.renderFaceXPos(block, metadata, renderer) + // Layer 1. + renderer.setRenderBounds(2 / 16f, 3 / 16f, 2 / 16f, 4 / 16f, 5 / 16f, 14 / 16f) + BlockRenderer.renderFaceYPos(block, metadata, renderer) + BlockRenderer.renderFaceXPos(block, metadata, renderer) - renderer.setRenderBounds(12 / 16f, 3 / 16f, 2 / 16f, 14 / 16f, 5 / 16f, 14 / 16f) - BlockRenderer.renderFaceYPos(block, metadata, renderer) - BlockRenderer.renderFaceXNeg(block, metadata, renderer) + renderer.setRenderBounds(12 / 16f, 3 / 16f, 2 / 16f, 14 / 16f, 5 / 16f, 14 / 16f) + BlockRenderer.renderFaceYPos(block, metadata, renderer) + BlockRenderer.renderFaceXNeg(block, metadata, renderer) - renderer.setRenderBounds(4 / 16f, 3 / 16f, 2 / 16f, 12 / 16f, 5 / 16f, 4 / 16f) - BlockRenderer.renderFaceYPos(block, metadata, renderer) - BlockRenderer.renderFaceZPos(block, metadata, renderer) + renderer.setRenderBounds(4 / 16f, 3 / 16f, 2 / 16f, 12 / 16f, 5 / 16f, 4 / 16f) + BlockRenderer.renderFaceYPos(block, metadata, renderer) + BlockRenderer.renderFaceZPos(block, metadata, renderer) - renderer.setRenderBounds(4 / 16f, 3 / 16f, 12 / 16f, 12 / 16f, 5 / 16f, 14 / 16f) - BlockRenderer.renderFaceYPos(block, metadata, renderer) - BlockRenderer.renderFaceZNeg(block, metadata, renderer) + renderer.setRenderBounds(4 / 16f, 3 / 16f, 12 / 16f, 12 / 16f, 5 / 16f, 14 / 16f) + BlockRenderer.renderFaceYPos(block, metadata, renderer) + BlockRenderer.renderFaceZNeg(block, metadata, renderer) - // Layer 2. - renderer.setRenderBounds(0, 3 / 16f, 0, 2 / 16f, 7 / 16f, 1) - BlockRenderer.renderFaceYPos(block, metadata, renderer) - BlockRenderer.renderFaceXPos(block, metadata, renderer) + // Layer 2. + renderer.setRenderBounds(0, 3 / 16f, 0, 2 / 16f, 7 / 16f, 1) + BlockRenderer.renderFaceYPos(block, metadata, renderer) + BlockRenderer.renderFaceXPos(block, metadata, renderer) - renderer.setRenderBounds(14 / 16f, 3 / 16f, 0, 1, 7 / 16f, 1) - BlockRenderer.renderFaceYPos(block, metadata, renderer) - BlockRenderer.renderFaceXNeg(block, metadata, renderer) + renderer.setRenderBounds(14 / 16f, 3 / 16f, 0, 1, 7 / 16f, 1) + BlockRenderer.renderFaceYPos(block, metadata, renderer) + BlockRenderer.renderFaceXNeg(block, metadata, renderer) - renderer.setRenderBounds(2 / 16f, 3 / 16f, 0, 14 / 16f, 7 / 16f, 2 / 16f) - BlockRenderer.renderFaceYPos(block, metadata, renderer) - BlockRenderer.renderFaceZPos(block, metadata, renderer) + renderer.setRenderBounds(2 / 16f, 3 / 16f, 0, 14 / 16f, 7 / 16f, 2 / 16f) + BlockRenderer.renderFaceYPos(block, metadata, renderer) + BlockRenderer.renderFaceZPos(block, metadata, renderer) - renderer.setRenderBounds(2 / 16f, 3 / 16f, 14 / 16f, 14 / 16f, 7 / 16f, 1) - BlockRenderer.renderFaceYPos(block, metadata, renderer) - BlockRenderer.renderFaceZNeg(block, metadata, renderer) + renderer.setRenderBounds(2 / 16f, 3 / 16f, 14 / 16f, 14 / 16f, 7 / 16f, 1) + BlockRenderer.renderFaceYPos(block, metadata, renderer) + BlockRenderer.renderFaceZNeg(block, metadata, renderer) - renderer.renderAllFaces = previousRenderAllFaces - } - } + renderer.renderAllFaces = previousRenderAllFaces + } +}