CharAttr getters/setters added to prevent bugs when setting colors.

Author: Matt Johnson

luxe_ascii/CharAttr.hx

@@ -5,14 +5,48 @@ import snow.api.buffers.*;
 
 class CharAttr {
 	public var char:Int;
-	public var fg:Color;
-	public var bg:Uint8Array;
+	
+	public var fg(get, set):Color;
+	private var _fg:Color;
+
+	public var bg(get, set):Uint8Array;
+	private var _bg:Uint8Array;
+
 	public var attr:Int;
 
 	public function new() {
 		char = 0;
-		fg = new Color();
-		bg = new Uint8Array(3);
+		_fg = new Color();
+		_bg = new Uint8Array(3);
 		attr = 0;
 	}
+
+	public inline function get_fg():Color {
+		return _fg;
+	}
+
+	public inline function set_fg(color:Color):Color {
+		_fg.r = color.r;
+		_fg.g = color.g;
+		_fg.b = color.b;
+		return _fg;
+	}
+
+	public inline function set_bg_color(color:Color):Uint8Array {
+		_bg[0] = Std.int(color.r * 255);
+		_bg[1] = Std.int(color.g * 255);
+		_bg[2] = Std.int(color.b * 255);
+		return _bg;
+	}
+
+	public inline function set_bg(color:Uint8Array):Uint8Array {
+		_bg[0] = color[0];
+		_bg[1] = color[1];
+		_bg[2] = color[2];		
+		return _bg;
+	}
+
+	public inline function get_bg():Uint8Array {
+		return _bg;
+	}
 }

luxe_ascii/TextBuffer.hx

@@ -43,21 +43,14 @@ class TextBuffer {
 		if(x < 0 || y < 0 || x >= width || y >= height)
 			return;
 
-		var c:Color = data[y * width + x].fg;
-		c.r = color.r;
-		c.g = color.g;
-		c.b = color.b;
+		data[y * width + x].fg = color;
 	}
 
 	public function set_bg_color(x:Int, y:Int, color:Color) {
 		if(x < 0 || y < 0 || x >= width || y >= height)
 			return;
 
-		var bg = data[y * width + x].bg;
-
-		bg[0] = Std.int(color.r * 255);
-		bg[1] = Std.int(color.g * 255);
-		bg[2] = Std.int(color.b * 255);
+		data[y * width + x].set_bg_color(color);
 	}
 
 	// Draw a TextBuffer onto this one at (xPos, yPos), taking into account transparency.
@@ -87,9 +80,7 @@ class TextBuffer {
 				if(src_data.attr & 0x02 != 0)
 					continue;
 
-				dst_data.fg.r = src_data.fg.r;
-				dst_data.fg.g = src_data.fg.g;
-				dst_data.fg.b = src_data.fg.b;
+				dst_data.fg = src_data.fg;
 
 				dst_data.char = src_data.char;
 				dst_data.bg[0] = src_data.bg[0];