From 0c741974a6a7e01f3645c614258a9172fafb0cd2 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 26 Mar 2023 17:43:00 +0200 Subject: [PATCH] fix image building to work with new n64img output (#1001) --- tools/build/img/build.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/tools/build/img/build.py b/tools/build/img/build.py index 959e0ea924..9892fa6829 100755 --- a/tools/build/img/build.py +++ b/tools/build/img/build.py @@ -18,16 +18,12 @@ def unpack_color(s): return r, g, b, a def pack_color(r, g, b, a): - r = floor(31 * (r / 255)) - g = floor(31 * (g / 255)) - b = floor(31 * (b / 255)) + r = r >> 3 + g = g >> 3 + b = b >> 3 + a = a >> 7 - s = round(a / 0xFF) - s |= (r & 0x1F) << 11 - s |= (g & 0x1F) << 6 - s |= (b & 0x1F) << 1 - - return s + return (r << 11) | (g << 6) | (b << 1) | a def rgb_to_intensity(r, g, b): return round(r * 0.2126 + g * 0.7152 + 0.0722 * b) @@ -110,8 +106,8 @@ class Converter(): i2 = rgb_to_intensity(*c2[:3]) a2 = c2[3] - i1 = floor(7 * (i1 / 0xFF)) - i2 = floor(7 * (i2 / 0xFF)) + i1 = i1 >> 5 + i2 = i2 >> 5 if a1 not in (0, 0xFF) or a2 not in (0, 0xFF): self.warn("alpha mask mode but translucent pixels used")