From 1079535020f511c683983b5900e41d97227b7295 Mon Sep 17 00:00:00 2001
From: blondie7575 <qd@quinndunki.com>
Date: Sat, 8 Jul 2023 16:45:24 -0700
Subject: [PATCH] Groundwork for font compiler

---
 Art/Assets/Font8x8.gif           | Bin 0 -> 1044 bytes
 Art/Assets/Font8x8.xcf           | Bin 0 -> 3459 bytes
 GSCats.xcodeproj/project.pbxproj |   4 +
 GenerateFont.py                  |  91 ++++++++++++++++++++
 font8x8.s                        | 140 +++++++++++++++++++++++++++++++
 gamemanager.s                    |  18 ++--
 gscats.s                         |   1 +
 7 files changed, 244 insertions(+), 10 deletions(-)
 create mode 100644 Art/Assets/Font8x8.gif
 create mode 100644 Art/Assets/Font8x8.xcf
 create mode 100755 GenerateFont.py
 create mode 100644 font8x8.s

diff --git a/Art/Assets/Font8x8.gif b/Art/Assets/Font8x8.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7037dfaa3fb2d2523bdf0353e0f21e5a3f520c24
GIT binary patch
literal 1044
zcmZ?wbhEHbbYK)<XyIpAa{o6FF*GoAqzRsxY5Z=t%iXlJ|1(!H{0BmY?c2BCy?d9T
zeD^}1Wef}q|49dm{{)?jQWHy3QxwWGOEMJPJ$(Zh6o0ZXaxw5Q=m5=R06Bz#_1^;J
zz9pY+o@m;g>ROeld0utSBJ;KHYwYJ8xWmt(ELLcqbb3jO*<7>5{^e1ZnoQT6HoKFx
z^g_nv6Q7jIyID1LgG_v0ZiyC&KeJr*Ta@nQ%d%NvB{dbTyuAFS<%ODE`JIKuokkOi
z`uhqdPM<Y%nsQxrZHvu<s_vTdhIv!VX0M*HX3~ZkHe5|*O6?`O<&&FQmA7T@S6Ruo
z?Z}}6!Mi3O-<5kL_kzmV75N2I78~VFSH5=t#_>z14(>18cIC41g&lXF@x9u4@3YYZ
zyK@!COm<v(@#%Ei%Ma82?$|dR-qm@V@oczF;nOpMHPhcd>}nS0p0<F)LwQaU_wol!
zYW)wKbCmzBtvvI+d4gA~yrz}4h|vSR?yCj2L_C~jkN25mzq>LsgVQwGwe^~}*JhW?
zHSQ}N*Gf)}JyE-MRv7onyeAtLi0b<BR<ED9t-w}bS-_2+w*l2owZ~@f7S%Ie#~sO1
z`{Wu+^uFr9Y}dG_ZMZhs{vQ`x^!atcOZ&=~JnFtyaQk4FZt%K=Gum(MQoaA}NH_a~
z=f_Lsv)}&t?)&`8dgk_Mjo(jR9xG5(?z7>)m2!P+>T$k3>%Zq-JTdux=(#;RKR>^)
z_<hHwBOYH3E&2kSg4}jX8sF)xk!M=MDxubSalOI$xwTba@2<UFSM@<~=HzW+dsg(v
zH~#y%>&?}k8m4Uy!F9hI|Eb(<N?W_QOPzn)q+WTQ*d=W(6G~DZYR@_Hh^uY0OHrV~
z7aQSeI^y#-^|dp^ElQB>k$EA{Rdhf_S(<6z#AJ1$cS{+#+7&7i1MLkZ?nZnlXy%>B
zYu0qed+!dH(9UI3Eu5!J^_<z;sA2oFGmv{}vP><PQgT}T|Cu+Z^c;G#LwVwR7Sm)K
zr%#LS+q)T^SmOWa%oY_Z-)&12Ch}%_zL+0bbtQ13MekFM`in7NC(pPzBU7$^+BV52
zbF$cWtX#%B=jO_8v%Fc)dK#{2`p!F}*g1Q?ve#B$Gpnk_R~M)2E>+E1X?tpEcTcM8
zt?7wrQkQ2jE#geslvj7^^kl8ZubH#T>$@biR;}JND@L+6^_uv0-pXjn8Lt!FI(K;Q
zy*4B5@*S(=!S7coPfaq|RG6{0@$QbCeP?D>Db~Mfi(>C>w^LcN?c!fEHM5?XHzGE1
z-FNIQC{&a#%+2WCDeCg*#iD{^=XuKR@72|cF4}zkpL<dE@t!mD_i-H8`FzIYdd}yw
JZfy(<)&M<O7rFod

literal 0
HcmV?d00001

diff --git a/Art/Assets/Font8x8.xcf b/Art/Assets/Font8x8.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..19f81acdc3df570c4379ba203090d72b54c2d330
GIT binary patch
literal 3459
zcmZ`+OK%)S5T57S?oRi_gya$=29h8L$&$_EOfX1*6r|iaAjjU_tneeU7aX6GBS%h1
z5f_jU2gKb6|AqVmWO3kZ`(QgHS?><tSKYlc8zr-@=~q>C_t#(5w7b3a`{jd`PWi*a
z!eSIf@h!YALJ~G0AF=)WKLh+lkD?ztvris>c(nidL8nta{xhoZi}v>R4h{~Yo&Dc#
z{{ii)LSHlsiRs`HWP0hRD5Btb6OuvRhg|V>>RpDMKui})nqS#mUvF>p(Uw)b@!3{;
zx!+zbcY6JM<riOleTO3#MYXrS+-=Wyw|c8V`>(m}{_a}4+}>R4t=?2~o$ku!+U8a{
zC&m0$_wI7JAiu?%7{2?8;l)yZ9DcBUe|e?1(JdDj(Au47`NsVB8@+zn+gQ2R-loN7
zr?cJem!jXOyXvGe*X*D8=TK{$LykUkXL*~OzrDQM-l7f<hffPaED88Ktbg(dZ{Q7K
zKXIM$brjLNjrv=Sx@y$RMqM}R7aDcbs28YnzVJ+;!nyg}fQ0&W*1?St%4@#Pbq79#
zJ)tZ41ur~JGA8@L;akXeke$i#<nJiTVLt`GGf$%ELdtPv<06H`_P;_|TNL=qY*k!A
zpRuvVn2znaGPX!H3!CbZGMCVeVU^lL4Kss&lpHR!RWL>sYT6FaZA`*a8S{Z}XZGBn
z`<ji7vZF#}W@rnQn(OG$kRb-K3iAzCk=S#tEGvfcK2=<#mt4lVa@UtYErvr4Bezyx
zJVOgB(-^>LZjTF%mUOa&zf=#TnP7TsTD2@~V5G1~v7uYVwXqz?7?q!i4i*eGg`J*a
z9<(M*&*>&HXQJxHXezGUd@wwz4PoyWdWKFy1xuS4zc;Z|^bp%>3|?%X5-4%+JE?+6
zCwjR?8s?Cc)6^Y9oFE6E%Smz#nfcT{%%TdtphaAKjB{@ZEe62ND)i|R7DIqIO;@Q+
z6i!9GEpv?68^ez~{=^OihZ$d9kTI{6+94PM5H*N!6(jI%Fc-Q8;E<IzTw{Or7<DWp
z^yB2rdyuO(2XRP-4D`;5k;03cz*2-QbxC%4ZojU;{5*85gXd6}*e@pz#~A7}_JyMk
zu?&NUJVC|+N``{-NUU8OUZtN-n#YXkVlxn>M4aW0-?e925QnjqXoD^1v`T4&BN<1T
zUlbS;j8G+yQoI3%fhCF10y_p+ucO2WXDyp0CveC$ac&7gDgm0gBnRk}xX4kupauL=
z4LKx1Ua4xd9j<w^%V(UYg1E(UNK7>)9N~r;O6(?#g2;?LBdQ)`Dnkw7n%IBGc-L|1
z@aH*X_SBz-M2W;h3LKCeNL`O%CZO=_>5)WbeEKLOaN~wcWs~m&)?lHa?B2N<1L{IJ
zz`7(HJ!8m9N+WPUuQjGXWm`oBf3bS5k*p=2j!?REh72dD09!0_(oEN8TFfvrGFgSK
zyl_dJd2a|vCuUR5Y>3%X<S-&zkvhPZ`ZRB;Kv1miC4E4nVMeYY!hvc!scvfbGOh5B
zVeA2hN8Ru~p&s&;Q?FEx(N^&~?V6~}43`0PrDkjbnx>#@gN`mEN}dCU_?`2g!4Us-
z>=6y*DCR*3;bbhr0TWkj&&Jea`ky5fvls}0Cv+m4g>^I$Tf7*z)S@()mZ9O2BCVJR
zHE2cd@T)lmT3|ym_mWVAht?t}5aAJcr(Pn@w6tTe!)cC~4N0EN9I1i{Kxsr3gyBN%
z6i4iICAneC6>`NP)T~p+O~9!KZD&LJ)Q3X~AHhW2E0{Q&X>nZ}jFT8b&gnbXVXB}H
zK7uEX*vxp0K%-K9T!f{Et<)BE1R)wFB=ZJ)xWJJvzLfliZzYJrds6tYxH4om_j$op
zNywAPRjE#JKAXL=V2X2>Cmyci)rW^0z8j&A`&0o+B7%5c_Si+NBmkGp#@~ei@kwLQ
ziV<i9E&ojr@`YKNr8pXU^E<+Qt&kf>z&0emW~QSNfKR{%Zx*{eM}~$xm;0|vW*#O>
Xf-SD0ze2+OnE$ne`|up<a_9XY84vqi

literal 0
HcmV?d00001

diff --git a/GSCats.xcodeproj/project.pbxproj b/GSCats.xcodeproj/project.pbxproj
index a2407e4..ac9a61f 100644
--- a/GSCats.xcodeproj/project.pbxproj
+++ b/GSCats.xcodeproj/project.pbxproj
@@ -22,6 +22,8 @@
 		705C54E62124B7F300515A6B /* fan.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = fan.s; sourceTree = "<group>"; };
 		706DF1641F2D39F700AA6680 /* loader.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = loader.s; sourceTree = "<group>"; };
 		706DF1651F2D4A8100AA6680 /* terrain.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = terrain.s; sourceTree = "<group>"; };
+		7076E9222A57AED90006E295 /* GenerateFont.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = GenerateFont.py; sourceTree = "<group>"; };
+		7076E9232A59113F0006E295 /* font8x8.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = font8x8.s; sourceTree = "<group>"; };
 		7088096D1F2ECE8D00D4C950 /* GenerateRenderSpans.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = GenerateRenderSpans.py; sourceTree = "<group>"; };
 		708D1B1E27B9A1A600909AFC /* crosshair.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = crosshair.s; sourceTree = "<group>"; };
 		709175C01F60D263008FAFAB /* GenerateCircles.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = GenerateCircles.py; sourceTree = "<group>"; };
@@ -83,6 +85,8 @@
 				70BDCBC92006AD5F00CB51F1 /* linkerConfig */,
 				70FE79D21F8814A600E0095C /* MerlinToCA65.sh */,
 				700F72872112428D00225B17 /* RenumberSpriteFiles.sh */,
+				7076E9222A57AED90006E295 /* GenerateFont.py */,
+				7076E9232A59113F0006E295 /* font8x8.s */,
 				7088096D1F2ECE8D00D4C950 /* GenerateRenderSpans.py */,
 				7059502B1F37A0BE00BBE90F /* GenerateVRAMTable.py */,
 				7099E3851F4107B100182A82 /* GenerateVRAMYOffset.py */,
diff --git a/GenerateFont.py b/GenerateFont.py
new file mode 100755
index 0000000..e4b713d
--- /dev/null
+++ b/GenerateFont.py
@@ -0,0 +1,91 @@
+#!/usr/bin/env python3
+
+import sys
+import PIL
+from PIL import Image
+from numpy import asarray
+
+CHAR_WIDTH = 8
+CHAR_HEIGHT = 8
+CHAR_FIRST = 32
+CHROMA = 14
+
+def main(argv):
+	image = Image.open('Art/Assets/Font8x8.gif')
+	pixels = asarray(image)
+	numCharX = (int)(image.size[0]/CHAR_WIDTH)
+	numCharY = (int)(image.size[1]/CHAR_HEIGHT)
+		
+	for charY in range(0,1): #numCharY):
+		for charX in range(1,2): #numCharX):
+			charIndex = charY*numCharX + charX
+			currChar = chr(charIndex+CHAR_FIRST)
+						
+			print ("char%d:\n" % ord(currChar), end="")
+			
+			# Header for each rendering operation
+			print ("\ttya")		# Transfer character VRAM position from Y to stack pointer
+			print ("\ttcs")
+			
+			# Iteratre through all the pixels
+			charOriginX = charX*CHAR_WIDTH
+			charOriginY = charY*CHAR_HEIGHT
+			
+			for charRow in reversed(range(0,CHAR_HEIGHT)):
+				print ("\t; Line %d" % charRow)
+				nextRowDelta = 160
+				for charCol in reversed(range(0,CHAR_WIDTH,4)):
+					nibbles = [pixels[charOriginY+charRow][charOriginX+charCol],
+								pixels[charOriginY+charRow][charOriginX+charCol+1],
+								pixels[charOriginY+charRow][charOriginX+charCol+2],
+								pixels[charOriginY+charRow][charOriginX+charCol+3]]
+					
+					word = nibbles[2]<<12 | nibbles[3]<<8 | nibbles[0]<<4 | nibbles[1]
+					
+					if (nibbles[0]==CHROMA and nibbles[1]==CHROMA and nibbles[2]==CHROMA and nibbles[3]==CHROMA):
+						pass							# Case 1 : All chroma, so let stack advance with no work
+					elif (nibbles[0]!=CHROMA and nibbles[1]!=CHROMA and nibbles[2]!=CHROMA and nibbles[3]!=CHROMA):
+						print ("\tpea $%04x" % word)	# Case 2 : No chroma, so fast push
+						nextRowDelta -= 2
+					else:
+						mask = 0						# Case 3 : Mixed chroma, so mask and or
+						if (nibbles[0]!=CHROMA):
+							mask = mask | 0xFF0F
+						if (nibbles[1]!=CHROMA):
+							mask = mask | 0xFFF0
+						if (nibbles[2]!=CHROMA):
+							mask = mask | 0x0FFF
+						if (nibbles[3]!=CHROMA):
+							mask = mask | 0xF0FF
+						
+						sprite = word
+						if (nibbles[0]==CHROMA):
+							sprite = sprite & 0xFF0F
+						if (nibbles[1]==CHROMA):
+							sprite = sprite & 0xFFF0
+						if (nibbles[2]==CHROMA):
+							sprite = sprite & 0x0FFF
+						if (nibbles[3]==CHROMA):
+							sprite = sprite & 0xF0FF
+						
+						print ("\ttsc")					# Keep stack moving, even though we didn't use it
+						print ("\tdec")
+						print ("\tdec")
+						print ("\ttcs")
+						print ("\tlda 0,S")				# Blend mask, sprite, and background
+						print ("\tand #$%04x" % mask)
+						print ("\tora #$%04x" % sprite)
+						print ("\tsta 0,S")
+						nextRowDelta -= 2
+				
+				# Advance stack pointer to next row
+				print ("\ttsc")
+				print ("\tsec")
+				print ("\tsbc #%d" % nextRowDelta)
+				print ("\ttcs")
+					
+			# Footer for each rendering operation
+			print ("\tjmp returnFromTest")
+			
+if __name__ == "__main__":
+	main(sys.argv[1:])
diff --git a/font8x8.s b/font8x8.s
new file mode 100644
index 0000000..7337d72
--- /dev/null
+++ b/font8x8.s
@@ -0,0 +1,140 @@
+char33:
+	tya
+	tcs
+	; Line 7
+	tsc
+	sec
+	sbc #160
+	tcs
+	; Line 6
+	tsc
+	dec
+	dec
+	tcs
+	lda 0,S
+	and #$ff0f
+	ora #$00d0
+	sta 0,S
+	tsc
+	dec
+	dec
+	tcs
+	lda 0,S
+	and #$f0ff
+	ora #$0d00
+	sta 0,S
+	tsc
+	sec
+	sbc #156
+	tcs
+	; Line 5
+	tsc
+	dec
+	dec
+	tcs
+	lda 0,S
+	and #$ff0f
+	ora #$00d0
+	sta 0,S
+	tsc
+	dec
+	dec
+	tcs
+	lda 0,S
+	and #$f0ff
+	ora #$0d00
+	sta 0,S
+	tsc
+	sec
+	sbc #156
+	tcs
+	; Line 4
+	tsc
+	sec
+	sbc #160
+	tcs
+	; Line 3
+	tsc
+	dec
+	dec
+	tcs
+	lda 0,S
+	and #$ff0f
+	ora #$00d0
+	sta 0,S
+	tsc
+	dec
+	dec
+	tcs
+	lda 0,S
+	and #$f0ff
+	ora #$0a00
+	sta 0,S
+	tsc
+	sec
+	sbc #156
+	tcs
+	; Line 2
+	tsc
+	dec
+	dec
+	tcs
+	lda 0,S
+	and #$ff0f
+	ora #$00a0
+	sta 0,S
+	tsc
+	dec
+	dec
+	tcs
+	lda 0,S
+	and #$f0ff
+	ora #$0a00
+	sta 0,S
+	tsc
+	sec
+	sbc #156
+	tcs
+	; Line 1
+	tsc
+	dec
+	dec
+	tcs
+	lda 0,S
+	and #$ff0f
+	ora #$00b0
+	sta 0,S
+	tsc
+	dec
+	dec
+	tcs
+	lda 0,S
+	and #$f0ff
+	ora #$0b00
+	sta 0,S
+	tsc
+	sec
+	sbc #156
+	tcs
+	; Line 0
+	tsc
+	dec
+	dec
+	tcs
+	lda 0,S
+	and #$ff0f
+	ora #$00f0
+	sta 0,S
+	tsc
+	dec
+	dec
+	tcs
+	lda 0,S
+	and #$f0ff
+	ora #$0f00
+	sta 0,S
+	tsc
+	sec
+	sbc #156
+	tcs
+	jmp returnFromTest
diff --git a/gamemanager.s b/gamemanager.s
index 0cc9dfe..acc41e4 100644
--- a/gamemanager.s
+++ b/gamemanager.s
@@ -67,16 +67,14 @@ beginGameplay:
 
 	jsr compileTerrain
 	jsr clipTerrain
-;	jsl renderTerrainSpans	; Part of the now disabled fill-mode renderer
 
-;	lda #7
-;	sta PARAML0
-;	lda #50
-;	sta PARAML1
-;	ldy #3
-;	jsr craterTerrain
-;	jsr compileTerrain
-;	jsr clipTerrain
+	; Test font renderer
+;	FASTGRAPHICS
+;	ldy #$3000 ;#$2504
+;	jmp char33
+returnFromTest:
+;	SLOWGRAPHICS
+;	;HARDBRK
 
 gameplayLoop:
 	lda projectileActive
@@ -417,7 +415,7 @@ fire:
 
 
 basePalette:
-	.word $0aef,$0080,$0080,$0861,$0c93,$0eb4,$0d66,$0f9a,$0777,$0f00,$0bbb,$ddd,$007b,$0ff0,$0000,$0fff
+	.word $0aef,$0080,$0080,$0861,$0c93,$0eb4,$0d66,$0f9a,$0777,$0f00,$0bbb,$ddd,$007b,$0a5b,$0000,$0fff
 statusBarPalette:
 	.word $0aef,$0fff,$0aef,$0aef,$0aef,$0aef,$0d66,$0aef,$0aef,$0aef,$0aef,$0aef,$0aef,$0aef,$0aef,$0000
 
diff --git a/gscats.s b/gscats.s
index b93f075..7484454 100644
--- a/gscats.s
+++ b/gscats.s
@@ -54,6 +54,7 @@ quitGame:
 .include "inventory.s"
 .include "dirt.s"
 .include "crosshair.s"
+.include "font8x8.s"
 endMainBank2: