From 00cbe656cf31099751875b577a23cc1b5154eeca Mon Sep 17 00:00:00 2001
From: Dennis Ranke <dennis.ranke@gmail.com>
Date: Sun, 12 Dec 2021 00:54:58 +0100
Subject: [PATCH] add graphicsText mode and finish font_palette example

---
 examples/curlywas/font_palette.uw8 |  32 ++++++++++++++++++++++-------
 platform/bin/platform.uw8          | Bin 2303 -> 2347 bytes
 platform/src/platform.cwa          |  29 ++++++++++++++++++++------
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/examples/curlywas/font_palette.uw8 b/examples/curlywas/font_palette.uw8
index df3de4c..7cb199a 100644
--- a/examples/curlywas/font_palette.uw8
+++ b/examples/curlywas/font_palette.uw8
@@ -5,24 +5,38 @@ import "env.printString" fn printString(i32);
 import "env.printChar" fn printChar(i32);
 import "env.setCursorPosition" fn setCursor(i32, i32);
 import "env.setTextColor" fn setTextColor(i32);
+import "env.line" fn line(f32, f32, f32, f32, i32);
+import "env.isButtonTriggered" fn triggered(i32) -> i32;
+
+global mut mode: i32 = 0;
 
 export fn upd() {
     cls(0);
 
-    printString(0);
+    if triggered(4) {
+        mode = !mode;
+    }
+
+    setTextColor(15);
+    printString(mode * 0x20000);
 
     let y: i32;
     loop y {
-        setCursor(y + 2, 3);
+        line(0 as f32, (y * 9 + 39) as f32, (14+16*9) as f32, (y * 9 + 39) as f32, 1);
+        line((y * 9 + 15) as f32, 24 as f32, (y * 9 + 15) as f32, (38+16*9) as f32, 1);
+        setTextColor(15);
+        setCursor(y * 9 + 16, 24);
         let lazy hexChar = select(y < 10, y + 48, y + 87);
         printChar(hexChar);
-        setCursor(0, y + 5);
+        setCursor(0, y * 9 + 24+16);
         printChar(hexChar);
-        printChar(32);
         let x = 0;
         loop x {
-//            setTextColor(x + y * 16);
-            printChar(x + y * 16);
+            setCursor(x * 9 + 16, y * 9 + 24+16);
+            setTextColor(select(mode, x + y * 16, -9));
+            if y >= 2 | mode {
+                printChar(select(mode, 0xa4, x + y * 16));
+            }
             branch_if (x := x + 1) < 16: x;
         }
         branch_if (y := y + 1) < 16: y;
@@ -30,5 +44,9 @@ export fn upd() {
 }
 
 data 0 {
-    "Default font:" i8(0)
+    "Default font:      (press " i8(0xcc) " for palette)" i8(5, 0)
+}
+
+data 0x20000 {
+    "Default palette:   (press " i8(0xcc) " for font)" i8(5, 0)
 }
\ No newline at end of file
diff --git a/platform/bin/platform.uw8 b/platform/bin/platform.uw8
index 31094729cd8076491389b70483acefa1762850b3..ae99f3645968481ba74a9a1e10a0dd37bc612ee0 100644
GIT binary patch
literal 2347
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
RNP{;!ETS6H@IHo%!vGHipj7|>

literal 2303
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
ZTsWZgZiU~h4L<)^1z<r+J9F=QCIBsrZ{q*}

diff --git a/platform/src/platform.cwa b/platform/src/platform.cwa
index c2ffa81..2b600cf 100644
--- a/platform/src/platform.cwa
+++ b/platform/src/platform.cwa
@@ -59,6 +59,7 @@ export fn cls(col: i32) {
     let i: i32;
     textCursorX = 0;
     textCursorY = 0;
+    graphicsText = 0;
     col = (col & 255) * 0x1010101;
     loop pixels {
         i!120 = col;
@@ -226,9 +227,15 @@ global mut textCursorX = 0;
 global mut textCursorY = 0;
 global mut textColor = 15;
 global mut bgColor = 0;
+global mut graphicsText = 0;
 
 export fn printChar(char: i32) {
-    if char == 10 | textCursorX >= 320 {
+    if char == 4 | char == 5 {
+        graphicsText = char == 5;
+        return;
+    }
+
+    if char == 10 | (!graphicsText & textCursorX >= 320) {
         textCursorX = 0;
         textCursorY = textCursorY + 8;
         return;
@@ -238,9 +245,18 @@ export fn printChar(char: i32) {
     loop rows {
         let bits = (char * 8 + y)?0x13400;
         let x = 0;
-        loop pixels {
-            setPixel(textCursorX + x, textCursorY + y, select((bits := bits << 1) & 256, textColor, bgColor));
-            branch_if (x := x + 1) < 8: pixels;
+        if graphicsText {
+            loop pixels {
+                if (bits := bits << 1) & 256 {
+                    setPixel(textCursorX + x, textCursorY + y, textColor);
+                }
+                branch_if (x := x + 1) < 8: pixels;
+            }
+        } else {
+            loop pixels {
+                setPixel(textCursorX + x, textCursorY + y, select((bits := bits << 1) & 256, textColor, bgColor));
+                branch_if (x := x + 1) < 8: pixels;
+            }
         }
         branch_if (y := y + 1) < 8: rows;
     }
@@ -281,8 +297,9 @@ export fn setBackgroundColor(col: i32) {
 }
 
 export fn setCursorPosition(x: i32, y: i32) {
-    textCursorX = x * 8;
-    textCursorY = y * 8;
+    let lazy scale = select(graphicsText, 1, 8);
+    textCursorX = x * scale;
+    textCursorY = y * scale;
 }
 
 ///////////