From 596ba6f2c1b6ac7ead1da754cd743c6e2e790dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Mon, 2 Feb 2015 23:19:01 +0100 Subject: [PATCH] All the vals! Also removed minor oddity. --- .../oc/client/renderer/tileentity/RobotRenderer.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala index 8c3c75e02..2fedbbd45 100644 --- a/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala +++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala @@ -217,10 +217,10 @@ object RobotRenderer extends TileEntitySpecialRenderer { // Additive blending for the light. GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE) // Light color. - var lightColor = if (robot != null && robot.info != null) robot.info.lightColor else 0xF23030 - var r = ((lightColor >>> 16) & 0xFF).toByte - var g = ((lightColor >>> 8) & 0xFF).toByte - var b = ((lightColor >>> 0) & 0xFF).toByte + val lightColor = if (robot != null && robot.info != null) robot.info.lightColor else 0xF23030 + val r = ((lightColor >>> 16) & 0xFF).toByte + val g = ((lightColor >>> 8) & 0xFF).toByte + val b = ((lightColor >>> 0) & 0xFF).toByte GL11.glColor3ub(r, g, b) val t = Tessellator.instance @@ -280,7 +280,7 @@ object RobotRenderer extends TileEntitySpecialRenderer { val timeJitter = robot.hashCode ^ 0xFF val hover = - if (robot.isRunning) (Math.sin(timeJitter + (worldTime + f) / 20.0) * 0.03).toFloat + if (robot.isRunning) (Math.sin(timeJitter + worldTime / 20.0) * 0.03).toFloat else -0.03f GL11.glTranslatef(0, hover, 0)