From 0b8b39ced05f38dcacc9bb21644293f4cfc501bf Mon Sep 17 00:00:00 2001 From: Daniel Ratcliffe Date: Sun, 7 May 2017 17:29:59 +0100 Subject: [PATCH] colours.rgb8(r,g,b) and colours.rgb8(c) are now the inverse of each other --- .../resources/assets/computercraft/lua/rom/apis/colors | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/computercraft/lua/rom/apis/colors b/src/main/resources/assets/computercraft/lua/rom/apis/colors index 80edbe32a..75981dddf 100644 --- a/src/main/resources/assets/computercraft/lua/rom/apis/colors +++ b/src/main/resources/assets/computercraft/lua/rom/apis/colors @@ -40,8 +40,11 @@ function rgb8( r, g, b ) if type(r) == "number" and g == nil and b == nil then return bit32.band( bit32.rshift( r, 16 ), 0xFF ) / 255, bit32.band( bit32.rshift( r, 8 ), 0xFF ) / 255, bit32.band( r, 0xFF ) / 255 elseif type(r) == "number" and type(g) == "number" and type(b) == "number" then - return r / 255, g / 255, b / 255 + return + bit32.lshift( bit32.band(r * 255, 0xFF), 16 ) + + bit32.lshift( bit32.band(g * 255, 0xFF), 8 ) + + bit32.band(b * 255 0xFF) else - return nil + error( "Expected 1 or 3 numbers" ) end -end \ No newline at end of file +end