From 2395e51e88c29ddbef15f387f296bf7194c866b6 Mon Sep 17 00:00:00 2001
From: Fabian Schlenz <mail@fabianonline.de>
Date: Wed, 25 Sep 2019 20:04:17 +0200
Subject: [PATCH] Added different rendering modes for the subpixel stuff.

---
 include/Window.h |  9 ++++++++-
 src/Window.cpp   | 41 +++++++++++++++++++++++++----------------
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/include/Window.h b/include/Window.h
index 571dafb..9c98d2a 100644
--- a/include/Window.h
+++ b/include/Window.h
@@ -3,9 +3,16 @@
 #include "config.h"
 #include "prototypes.h"
 
+enum SubpixelRenderingMode {
+	SUBPIXEL_RENDERING_SET,
+	SUBPIXEL_RENDERING_ADD,
+	SUBPIXEL_RENDERING_RAISE
+};
+
 class Window {
 private:
 	void _circle_point(int x0, int y0, int x1, int y1, CRGB* color);
+	void _subpixel_render(uint8_t x, uint8_t y, CRGB* color, SubpixelRenderingMode m);
 public:
 	const uint8_t x, y;
 	const uint8_t width, height;
@@ -19,7 +26,7 @@ public:
 	void clear();
 	void clear(CRGB* color);
 	void setPixel(uint8_t x, uint8_t y, CRGB* color);
-	void setSubPixel(accum88 x, accum88 y, CRGB* color);
+	void setSubPixel(accum88 x, accum88 y, CRGB* color, SubpixelRenderingMode m = SUBPIXEL_RENDERING_ADD);
 	void setPixelByIndex(uint16_t index, CRGB* color);
 	void raisePixel(uint8_t x, uint8_t y, CRGB* color);
 	void line(uint8_t x1, uint8_t y1, uint8_t x2, uint8_t y2, CRGB* color);
diff --git a/src/Window.cpp b/src/Window.cpp
index fe080b8..4448b28 100644
--- a/src/Window.cpp
+++ b/src/Window.cpp
@@ -54,6 +54,7 @@ void Window::drawSubText(Font* font, accum88 x, accum88 y, String text, CRGB* co
 }
 
 void Window::drawChar(Font* font, accum88 xPos, accum88 yPos, const char c, CRGB* color, bool mask) {
+	SubpixelRenderingMode mode = mask ? SUBPIXEL_RENDERING_SET : SUBPIXEL_RENDERING_ADD;
 	if (!font->isCharAllowed(c)) return;
 	uint16_t position = font->getCharPosition(c);
 	uint8_t* data = new uint8_t[font->width];
@@ -62,7 +63,7 @@ void Window::drawChar(Font* font, accum88 xPos, accum88 yPos, const char c, CRGB
 	for(uint8_t y=0; y<font->height; y++) for(uint8_t x=0; x<font->width; x++) {
 		bool on = (data[x]>>(font->height - 1 - y) & 1) * 255;
 		if (mask) on = !on;
-		if (on) this->setSubPixel(xPos + (x<<8), yPos + (y<<8), color);
+		if (on) this->setSubPixel(xPos + (x<<8), yPos + (y<<8), color, mode);
 	}
 
 	free(data);
@@ -79,7 +80,7 @@ void Window::shift_down() {
 			leds[coordsToGlobalIndex(x, y)] = leds[coordsToGlobalIndex(x, y-1)];
 		}
 	}
-	
+
 	clear_row(0);
 }
 
@@ -153,12 +154,12 @@ void Window::line(uint8_t x1, uint8_t y1, uint8_t x2, uint8_t y2, CRGB* color) {
 	// Bresenham algorithm
 	int dx = x2-x1;
 	int dy = y2-y1;
-	
+
 	int x = x1;
 	int y = y1;
-	
+
 	int p = 2*dy - dx;
-	
+
 	while (x < x2) {
 		if (p >= 0) {
 			setPixel(x, y, color);
@@ -219,7 +220,7 @@ void Window::lineWithAngle(uint8_t x, uint8_t y, uint8_t angle, uint8_t startdis
 	line(x1, y1, x2, y2, color);
 }
 
-void Window::setSubPixel(accum88 x, accum88 y, CRGB* color) {
+void Window::setSubPixel(accum88 x, accum88 y, CRGB* color, SubpixelRenderingMode mode) {
 	uint8_t px, py;
 	// px = Part of next pixel to fill
 	// x = "Origin pixel"
@@ -227,31 +228,39 @@ void Window::setSubPixel(accum88 x, accum88 y, CRGB* color) {
 	py = y & 0xFF;
 	x = x >> 8;
 	y = y >> 8;
-	
+
 	CRGB c;
 	c = CRGB(scale8( scale8( color->r, 255-py), 255-px),
 	         scale8( scale8( color->g, 255-py), 255-px),
 	         scale8( scale8( color->b, 255-py), 255-px));
-	this->addPixelColor(x, y, &c);
-	
+	_subpixel_render(x, y, &c, mode);
+
 	if (px) {
 		c = CRGB(scale8( scale8( color->r, 255-py), px),
 		         scale8( scale8( color->g, 255-py), px),
 		         scale8( scale8( color->b, 255-py), px));
-		this->addPixelColor(x+1, y, &c);
+		_subpixel_render(x+1, y, &c, mode);
 	}
-	
+
 	if (py) {
-		c = CRGB(scale8( scale8( color->r, py), 255-px), 
+		c = CRGB(scale8( scale8( color->r, py), 255-px),
 		         scale8( scale8( color->g, py), 255-px),
 		         scale8( scale8( color->b, py), 255-px));
-		this->addPixelColor(x, y+1, &c);
+		_subpixel_render(x, y+1, &c, mode);
 	}
-	
+
 	if (px || py) {
-		c = CRGB(scale8( scale8( color->r, py), px), 
+		c = CRGB(scale8( scale8( color->r, py), px),
 		         scale8( scale8( color->g, py), px),
 		         scale8( scale8( color->b, py), px));
-		this->addPixelColor(x+1, y+1, &c);
+		_subpixel_render(x+1, y+1, &c, mode);
+	}
+}
+
+void Window::_subpixel_render(uint8_t x, uint8_t y, CRGB* color, SubpixelRenderingMode mode) {
+	switch(mode) {
+		case SUBPIXEL_RENDERING_ADD: addPixelColor(x, y, color); break;
+		case SUBPIXEL_RENDERING_RAISE: raisePixel(x, y, color); break;
+		case SUBPIXEL_RENDERING_SET: setPixel(x, y, color); break;
 	}
 }