From a3733090d3cf2d36cca4fbc942ce0a94625c9c31 Mon Sep 17 00:00:00 2001 From: Dani The Skunk Date: Wed, 14 Sep 2022 06:59:14 +0200 Subject: [PATCH] changed Color to int, because of lack of unsigned byte --- com/danitheskunk/skunkworks/Color.java | 16 ++++++++-------- com/danitheskunk/skunkworks/Image.java | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/com/danitheskunk/skunkworks/Color.java b/com/danitheskunk/skunkworks/Color.java index f6c0a99..10abc8a 100644 --- a/com/danitheskunk/skunkworks/Color.java +++ b/com/danitheskunk/skunkworks/Color.java @@ -1,35 +1,35 @@ package com.danitheskunk.skunkworks; public final class Color { - final byte r, g, b, a; + final int r, g, b, a; - public Color(byte r, byte g, byte b) { + public Color(int r, int g, int b) { this.r = r; this.g = g; this.b = b; - this.a = (byte)0xff; + this.a = 0xff; } - public Color(byte r, byte g, byte b, byte a) { + public Color(int r, int g, int b, int a) { this.r = r; this.g = g; this.b = b; this.a = a; } - public byte getR() { + public int getR() { return r; } - public byte getG() { + public int getG() { return g; } - public byte getB() { + public int getB() { return b; } - public byte getA() { + public int getA() { return a; } diff --git a/com/danitheskunk/skunkworks/Image.java b/com/danitheskunk/skunkworks/Image.java index 99fd5e8..cff56d8 100644 --- a/com/danitheskunk/skunkworks/Image.java +++ b/com/danitheskunk/skunkworks/Image.java @@ -24,18 +24,18 @@ public class Image { public Color getPixel(Vec2i pos) { int i = pos.getX() * 4 + pos.getY() * 4 * width; return new Color( - data[i + 0], - data[i + 1], - data[i + 2], - data[i + 3] + ((int)data[i + 0]) & 0xFF, + ((int)data[i + 1]) & 0xFF, + ((int)data[i + 2]) & 0xFF, + ((int)data[i + 3]) & 0xFF ); } public void setPixel(Vec2i pos, Color col) { int i = pos.getX() * 4 + pos.getY() * 4 * width; - data[i + 0] = col.r; - data[i + 1] = col.g; - data[i + 2] = col.b; - data[i + 3] = col.a; + data[i + 0] = (byte)(col.r & 0xFF); + data[i + 1] = (byte)(col.g & 0xFF); + data[i + 2] = (byte)(col.b & 0xFF); + data[i + 3] = (byte)(col.a & 0xFF); } }