AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-13 09:18:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

All the vals! Also removed minor oddity.

Browse Source
This commit is contained in:
Florian Nücke 2015-02-02 23:19:01 +01:00
parent f69250b565
commit 596ba6f2c1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
View File

@ -217,10 +217,10 @@ object RobotRenderer extends TileEntitySpecialRenderer {
// Additive blending for the light. // Additive blending for the light.
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE) GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE)
// Light color. // Light color.
var lightColor = if (robot != null && robot.info != null) robot.info.lightColor else 0xF23030 val lightColor = if (robot != null && robot.info != null) robot.info.lightColor else 0xF23030
var r = ((lightColor >>> 16) & 0xFF).toByte val r = ((lightColor >>> 16) & 0xFF).toByte
var g = ((lightColor >>> 8) & 0xFF).toByte val g = ((lightColor >>> 8) & 0xFF).toByte
var b = ((lightColor >>> 0) & 0xFF).toByte val b = ((lightColor >>> 0) & 0xFF).toByte
GL11.glColor3ub(r, g, b) GL11.glColor3ub(r, g, b)
val t = Tessellator.instance val t = Tessellator.instance
@ -280,7 +280,7 @@ object RobotRenderer extends TileEntitySpecialRenderer {
val timeJitter = robot.hashCode ^ 0xFF val timeJitter = robot.hashCode ^ 0xFF
val hover = 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 else -0.03f
GL11.glTranslatef(0, hover, 0) GL11.glTranslatef(0, hover, 0)