From add557c91497ea3fa560be8e42731f26b669f0ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Tue, 17 Dec 2013 23:57:36 +0100
Subject: [PATCH] overlay for up/down facing screens indicating their
 orientation to make it less confusing why screens won't connect

---
 .../textures/blocks/screen/up_indicator.png   | Bin 0 -> 216 bytes
 .../renderer/tileentity/ScreenRenderer.scala  |  70 ++++++++++++++----
 2 files changed, 55 insertions(+), 15 deletions(-)
 create mode 100644 assets/opencomputers/textures/blocks/screen/up_indicator.png

diff --git a/assets/opencomputers/textures/blocks/screen/up_indicator.png b/assets/opencomputers/textures/blocks/screen/up_indicator.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a20853472b93dbedf478ec76b3a27e49de6952b
GIT binary patch
literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XsytmBLn>}1{rUgjo>{e_v(f1QQ}P+B?$CRTUh)ppJ&e`f
zFtu+^KX24vFv-!S`XJ*fL7oqihg>|26`f~vT<ke7pq6C%*oZ}r`+<Y0nOj&3W6#1*
z$8IbV6bV)6++5)#v+5^9sPLr&(g&K3_J25VM5~=mg5AcPiA93pva+^O`l(5EKvyt$
My85}Sb4q9e0Pg%sX8-^I

literal 0
HcmV?d00001

diff --git a/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala b/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
index 394636a97..5c05e46c3 100644
--- a/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
+++ b/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
@@ -6,16 +6,21 @@ import java.util
 import java.util.concurrent.{TimeUnit, Callable}
 import li.cil.oc.Settings
 import li.cil.oc.client.renderer.MonospaceFontRenderer
+import li.cil.oc.common.block
 import li.cil.oc.common.tileentity.Screen
 import li.cil.oc.util.RenderState
+import li.cil.oc.util.mods.BuildCraft
 import net.minecraft.client.Minecraft
-import net.minecraft.client.renderer.GLAllocation
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer
+import net.minecraft.client.renderer.{Tessellator, GLAllocation}
 import net.minecraft.tileentity.TileEntity
+import net.minecraft.util.ResourceLocation
 import net.minecraftforge.common.ForgeDirection
 import org.lwjgl.opengl.GL11
 
 object ScreenRenderer extends TileEntitySpecialRenderer with Callable[Int] with RemovalListener[TileEntity, Int] with ITickHandler {
+  private val upIndicator = new ResourceLocation(Settings.resourceDomain, "textures/blocks/screen/up_indicator.png")
+
   private val maxRenderDistanceSq = Settings.get.maxScreenTextRenderDistance * Settings.get.maxScreenTextRenderDistance
 
   private val fadeDistanceSq = Settings.get.screenTextFadeStartDistance * Settings.get.screenTextFadeStartDistance
@@ -38,7 +43,7 @@ object ScreenRenderer extends TileEntitySpecialRenderer with Callable[Int] with
 
   override def renderTileEntityAt(t: TileEntity, x: Double, y: Double, z: Double, f: Float) {
     screen = t.asInstanceOf[Screen]
-    if (!screen.isOrigin || !screen.hasPower) {
+    if (!screen.isOrigin) {
       return
     }
 
@@ -63,27 +68,23 @@ object ScreenRenderer extends TileEntitySpecialRenderer with Callable[Int] with
 
     GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5)
 
+    drawOverlay()
+
     if (distance > fadeDistanceSq) {
       RenderState.setBlendAlpha(math.max(0, 1 - ((distance - fadeDistanceSq) * fadeRatio).toFloat))
     }
 
-    MonospaceFontRenderer.init(tileEntityRenderer.renderEngine)
-    val list = cache.get(screen, this)
-    compileOrDraw(list)
+    if (screen.hasPower) {
+      MonospaceFontRenderer.init(tileEntityRenderer.renderEngine)
+      val list = cache.get(screen, this)
+      compileOrDraw(list)
+    }
 
     GL11.glPopMatrix()
     GL11.glPopAttrib()
   }
 
-  private def compileOrDraw(list: Int) = if (screen.bufferIsDirty && !RenderState.compilingDisplayList) {
-    screen.bufferIsDirty = false
-    val sx = screen.width
-    val sy = screen.height
-    val tw = sx * 16f
-    val th = sy * 16f
-
-    GL11.glNewList(list, GL11.GL_COMPILE_AND_EXECUTE)
-
+  private def transform() {
     screen.yaw match {
       case ForgeDirection.WEST => GL11.glRotatef(-90, 0, 1, 0)
       case ForgeDirection.NORTH => GL11.glRotatef(180, 0, 1, 0)
@@ -98,10 +99,49 @@ object ScreenRenderer extends TileEntitySpecialRenderer with Callable[Int] with
 
     // Fit area to screen (bottom left = bottom left).
     GL11.glTranslatef(-0.5f, -0.5f, 0.5f)
-    GL11.glTranslatef(0, sy, 0)
+    GL11.glTranslatef(0, screen.height, 0)
 
     // Flip text upside down.
     GL11.glScalef(1, -1, 1)
+  }
+
+  private def drawOverlay() = if (screen.facing == ForgeDirection.UP || screen.facing == ForgeDirection.DOWN) {
+    // Show up vector overlay when holding same screen block.
+    val stack = Minecraft.getMinecraft.thePlayer.getHeldItem
+    if (stack != null) {
+      if (BuildCraft.holdsApplicableWrench(Minecraft.getMinecraft.thePlayer, screen.x, screen.y, screen.z) ||
+        (stack.getItem match {
+          case block: block.Item => block.getMetadata(stack.getItemDamage) == screen.getBlockMetadata
+          case _ => false
+        })) {
+        GL11.glPushMatrix()
+        transform()
+        bindTexture(upIndicator)
+        GL11.glDepthMask(false)
+        GL11.glTranslatef(screen.width / 2f - 0.5f, screen.height / 2f - 0.5f, 0.05f)
+        val t = Tessellator.instance
+        t.startDrawingQuads()
+        t.addVertexWithUV(0, 1, 0, 0, 1)
+        t.addVertexWithUV(1, 1, 0, 1, 1)
+        t.addVertexWithUV(1, 0, 0, 1, 0)
+        t.addVertexWithUV(0, 0, 0, 0, 0)
+        t.draw()
+        GL11.glDepthMask(true)
+        GL11.glPopMatrix()
+      }
+    }
+  }
+
+  private def compileOrDraw(list: Int) = if (screen.bufferIsDirty && !RenderState.compilingDisplayList) {
+    screen.bufferIsDirty = false
+    val sx = screen.width
+    val sy = screen.height
+    val tw = sx * 16f
+    val th = sy * 16f
+
+    GL11.glNewList(list, GL11.GL_COMPILE_AND_EXECUTE)
+
+    transform()
 
     // Offset from border.
     GL11.glTranslatef(sx * 2.25f / tw, sy * 2.25f / th, 0)