Added label alignment routines

2021-03-01 11:18:11 -08:00 · 2021-03-01 11:18:11 -08:00 · 053c043bf1
parent 0a4ae60762
commit 053c043bf1
4 changed files with 147 additions and 8 deletions
--- a/README.md
+++ b/README.md
@ -51,21 +51,23 @@ evaluxn(u, u->vframe); /* Each frame
 ```
 ( hello world )

-&Console { pad 8 char 1 byte 1 }
+&Console { pad 8 char 1 byte 1 short 2 }

 |0100 @RESET 
 	
 	,text1 ,print-label JSR
 	,text2 ,print-label JSR
+	#ab =dev/console.byte
+	#cdef =dev/console.short

 BRK

@print-label ( text )

-	@cliloop
+	@print-label-loop
 		DUP2 LDR =dev/console.char               ( write pointer value to console )
 		#0001 ADD2                               ( increment string pointer )
-		DUP2 LDR #00 NEQ ,cliloop ROT JMP? POP2  ( while *ptr!=0 goto loop )
+		DUP2 LDR #00 NEQ ,print-label-loop ROT JMP? POP2  ( while *ptr!=0 goto loop )
 	POP2

 RTS                 
--- a/examples/dev.console.usm
+++ b/examples/dev.console.usm
@ -13,10 +13,10 @@ BRK

@print-label ( text )

-	@cliloop
+	@print-label-loop
 		DUP2 LDR =dev/console.char               ( write pointer value to console )
 		#0001 ADD2                               ( increment string pointer )
-		DUP2 LDR #00 NEQ ,cliloop ROT JMP? POP2  ( while *ptr!=0 goto loop )
+		DUP2 LDR #00 NEQ ,print-label-loop ROT JMP? POP2  ( while *ptr!=0 goto loop )
 	POP2

 RTS                 
--- a/examples/dev.mouse.usm
+++ b/examples/dev.mouse.usm
@ -127,12 +127,13 @@ RTS

@draw-label ( x y color addr )
 	
-	( load ) =label.addr =label.color =dev/sprite.y =dev/sprite.x ~label.addr
+	( load ) =label.addr =label.color =dev/sprite.y =dev/sprite.x 
+	~label.addr
 	@draw-label-loop
 		( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =dev/sprite.addr ~label.color =dev/sprite.color
 		( incr ) #0001 ADD2
 		( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x
-		DUP2 LDR #00 NEQ ,draw-label-loop ROT JMP? POP2
+		DUP2 #0001 ADD2  LDR #00 NEQ ,draw-label-loop ROT JMP? POP2
 	POP2

 RTS
@ -171,7 +172,6 @@ RTS
 	c0f0 f0e0 e080 8000 c0f1 faf9 fef8 b000
 ]

-
@mouse0_icn  [ 7c82 92ee 8282 4438 ]
@mouse1_icn  [ 7cf2 f2ee 8282 4438 ]
@mouse2_icn  [ 7c9e 9eee 8282 4438 ]
--- a/examples/gui.label.usm
+++ b/examples/gui.label.usm
@ -0,0 +1,137 @@
+( draw routines )
+
+&Screen { width 2 height 2 pad 4 x 2 y 2 color 1 }
+&Sprite { pad 8 x 2 y 2 addr 2 color 1 }
+
+&Label2d { x 2 y 2 color 1 addr 2 width 2 }
+&Rect2d { x1 2 y1 2 x2 2 y2 2 }
+&Point2d { x 2 y 2 }
+
+;label Label2d
+;rect Rect2d
+;center Point2d
+;i 2
+
+|0100 @RESET
+	
+	( find screen center )
+	~dev/screen.width #0002 DIV2 =center.x
+	~dev/screen.height #0002 DIV2 =center.y
+
+	( draw ver line )
+	#0000 =i
+	~center.x =dev/screen.x
+	@draw-ver
+		#03 ~i =dev/screen.y =dev/screen.color
+		~i #0002 ADD2 =i ( increment )
+	~i ~dev/screen.width LTH2 ,draw-ver ROT JMP? POP2
+
+	~center.x ~center.y #0010 SUB2 #0c ,text1 ,draw-label-left JSR
+	~center.x ~center.y #0c ,text2 ,draw-label-middle JSR
+	~center.x ~center.y #0010 ADD2 #0c ,text3 ,draw-label-right JSR
+	~center.x ~center.y #0020 ADD2 #0c ,text4 ,draw-label-middle JSR
+	~center.x ~center.y #0030 ADD2 #0c ,text5 ,draw-label-middle JSR
+	
+BRK
+
+@draw-label-left ( x y color addr )
+	
+	( load ) =label.addr =label.color =dev/sprite.y =dev/sprite.x 
+	~label.addr
+	@draw-label-left-loop
+		( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =dev/sprite.addr ~label.color =dev/sprite.color
+		( incr ) #0001 ADD2
+		( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x
+		DUP2 #0001 ADD2  LDR #00 NEQ ,draw-label-left-loop ROT JMP? POP2
+	POP2
+
+RTS
+
+@draw-label-middle ( x y color addr )
+	
+	( load ) =label.addr =label.color =dev/sprite.y
+	( align ) ~label.addr ,get-text-length JSR #0008 MUL2 #0002 DIV2 SUB2 =dev/sprite.x 
+	~label.addr
+	@draw-label-middle-loop
+		( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =dev/sprite.addr ~label.color =dev/sprite.color
+		( incr ) #0001 ADD2
+		( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x
+		DUP2 #0001 ADD2 LDR #00 NEQ ,draw-label-middle-loop ROT JMP? POP2
+	POP2
+
+RTS
+
+@draw-label-right ( x y color addr )
+	
+	( load ) =label.addr =label.color =dev/sprite.y
+	( align ) ~label.addr ,get-text-length JSR #0008 MUL2 SUB2 =dev/sprite.x 
+	~label.addr
+	@draw-label-right-loop
+		( draw ) DUP2 LDR #00 SWP #0008 MUL2 ,font ADD2 =dev/sprite.addr ~label.color =dev/sprite.color
+		( incr ) #0001 ADD2
+		( incr ) ~dev/sprite.x #0008 ADD2 =dev/sprite.x
+		DUP2 #0001 ADD2  LDR #00 NEQ ,draw-label-right-loop ROT JMP? POP2
+	POP2
+
+RTS
+
+@get-text-length ( label )
+	
+	#0000 ( counter )
+	@get-text-length-loop
+		( incr ) #0001 ADD2 OVR2 OVR2 ADD2 
+		LDR #00 NEQ ,get-text-length-loop ROT JMP? POP2
+	SWP2 POP2 #0001 SUB2
+
+RTS
+
+@font ( spectrum-zx font ) 
+[
+	0000 0000 0000 0000 0000 2400 7e3c 0000 0000 2400 3c42 0000 0000 6c7c 7c38 1000
+	0010 387c 7c38 1000 0038 387c 6c10 3800 0010 387c 7c10 3800 0000 0018 1800 0000
+	007e 4242 4242 7e00 0000 1824 2418 0000 0018 2442 4224 1800 001e 063a 4a48 3000
+	0038 446c 107c 1000 000c 0808 0838 3800 003e 2222 2266 6600 0000 0822 0022 0800
+	0000 1018 1c18 1000 0000 0818 3818 0800 0008 1c00 001c 0800 0028 2828 2800 2800
+	003e 4a4a 3a0a 0a00 000c 3046 620c 3000 0000 0000 0000 ffff 0010 3800 3810 0038
+	0008 1c2a 0808 0800 0008 0808 2a1c 0800 0000 0804 7e04 0800 0000 1020 7e20 1000
+	0000 4040 7e00 0000 0000 0024 6624 0000 0000 1038 7c00 0000 0000 007c 3810 0000
+	0000 0000 0000 0000 0008 0808 0800 0800 0014 1400 0000 0000 0024 7e24 247e 2400
+	0008 1e28 1c0a 3c08 0042 0408 1020 4200 0030 4832 4c44 3a00 0008 1000 0000 0000
+	0004 0808 0808 0400 0010 0808 0808 1000 0000 1408 3e08 1400 0000 0808 3e08 0800
+	0000 0000 0008 0810 0000 0000 3c00 0000 0000 0000 0000 0800 0000 0204 0810 2000
+	003c 464a 5262 3c00 0018 2808 0808 3e00 003c 4202 3c40 7e00 003c 421c 0242 3c00
+	0008 1828 487e 0800 007e 407c 0242 3c00 003c 407c 4242 3c00 007e 0204 0810 1000
+	003c 423c 4242 3c00 003c 4242 3e02 3c00 0000 0008 0000 0800 0000 0800 0008 0810
+	0000 0810 2010 0800 0000 003e 003e 0000 0000 1008 0408 1000 003c 4202 0c00 0800
+	003c 425a 5442 3c00 0018 2442 7e42 4200 007c 427c 4242 7c00 003c 4240 4042 3c00
+	0078 4442 4244 7800 007e 407c 4040 7e00 003e 4040 7c40 4000 003c 4240 4e42 3c00
+	0042 427e 4242 4200 003e 0808 0808 3e00 0002 0202 4242 3c00 0044 4870 4844 4200
+	0040 4040 4040 7e00 0042 665a 4242 4200 0042 6252 4a46 4200 003c 4242 4242 3c00
+	007c 4242 7c40 4000 003c 4242 524a 3c00 007c 4242 7c44 4200 003c 403c 0242 3c00
+	00fe 1010 1010 1000 0042 4242 4242 3c00 0042 4242 4224 1800 0042 4242 5a66 4200
+	0042 2418 1824 4200 0082 4428 1010 1000 007e 0408 1020 7e00 000c 0808 0808 0c00
+	0040 2010 0804 0200 0018 0808 0808 1800 0008 1422 0000 0000 0000 0000 0000 7e00
+	0008 0400 0000 0000 0000 1c02 1e22 1e00 0020 203c 2222 3c00 0000 1e20 2020 1e00
+	0002 021e 2222 1e00 0000 1c22 3c20 1e00 000c 101c 1010 1000 0000 1c22 221e 021c
+	0020 202c 3222 2200 0008 0018 0808 0400 0008 0008 0808 4830 0020 2428 3028 2400
+	0010 1010 1010 0c00 0000 6854 5454 5400 0000 5864 4444 4400 0000 3844 4444 3800
+	0000 7844 4478 4040 0000 3c44 443c 0406 0000 2c30 2020 2000 0000 3840 3804 7800
+	0010 103c 1010 0c00 0000 4444 4444 3800 0000 4444 2828 1000 0000 4454 5454 2800
+	0000 4428 1028 4400 0000 4444 443c 0438 0000 7c08 1020 7c00 000c 0810 1008 0c00
+	0008 0808 0808 0800 0030 1008 0810 3000 0000 0032 4c00 0000 3c42 99a1 a199 423c
+]
+
+@text1 [ Left Aligned 00 ]
+@text2 [ Middle Aligned 00 ]
+@text3 [ Right Aligned 00 ]
+@text4 [ even 00 ]
+@text5 [ odd 00 ]
+
+|c000 @FRAME BRK 
+|d000 @ERROR BRK 
+
+|FF10 ;dev/screen Screen
+|FF20 ;dev/sprite Sprite
+
+|FFF0 .RESET .FRAME .ERROR ( vectors )
+|FFF8 [ 0f0f 0fff 0ff0 ] ( palette )