commit 63c05a7
Devine Lu Linvega
·
2024-12-16 16:59:54 +0000 UTC
parent 98712d1
(screen.bounds) Added test for 1bpp
1 files changed,
+47,
-28
+47,
-28
1@@ -19,8 +19,8 @@
2 #a1 .Screen/pixel DEO
3 ( | guide )
4 <draw-guide>
5- #00a0 .Screen/x DEO2
6- #00a0 .Screen/y DEO2
7+ #0028 .Screen/x DEO2
8+ #0028 .Screen/y DEO2
9 <draw-portraits>
10 BRK
11
12@@ -33,28 +33,29 @@
13 ( | cursor )
14 #41 ;cursor-icn <update-cursor>
15 <draw-portraits>
16- ( | 1bpp )
17- #0020 .Screen/x DEO2
18- #0020 .Screen/y DEO2
19- <draw-box>
20+ ( | dot )
21+ .Mouse/x DEI2 .Screen/x DEO2
22+ .Mouse/y DEI2 .Screen/y DEO2
23+ #43 .Screen/pixel DEO
24 BRK
25
26 @<draw-portraits> ( -- )
27- ( | 2bpp )
28 [ LIT2 36 -Screen/auto ] DEO
29+ .Mouse/state DEI ?<draw-box>
30+ ( | top-left )
31 .Screen/x DEI2k #0008 ADD2 ROT DEO2
32 .Screen/y DEI2k #0020 SUB2 ROT DEO2
33 #8140 ORA <draw-portrait>
34- .Screen/x DEI2k #0010 SUB2 ROT DEO2
35+ .Screen/x DEI2k #0008 SUB2 ROT DEO2
36 .Screen/y DEI2k #0020 SUB2 ROT DEO2
37 #9140 ORA <draw-portrait>
38 .Screen/x DEI2k #0000 SUB2 ROT DEO2
39- .Screen/y DEI2k #0020 ADD2 ROT DEO2
40+ .Screen/y DEI2k #0018 ADD2 ROT DEO2
41 #b140 ORA <draw-portrait>
42- .Screen/x DEI2k #0010 ADD2 ROT DEO2
43+ .Screen/x DEI2k #0008 ADD2 ROT DEO2
44 .Screen/y DEI2k #0020 ADD2 ROT DEO2
45- #a140 ORA !<draw-portrait>
46-
47+ #a140 ORA <draw-portrait>
48+ JMP2r
49
50 @<draw-portrait> ( color -- )
51 ;portrait-chr .Screen/addr DEO2
52@@ -62,8 +63,26 @@
53 JMP2r
54
55 @<draw-box> ( -- )
56+ ( | top left )
57+ .Screen/x DEI2k #0020 SUB2 ROT DEO2
58+ .Screen/y DEI2k #0020 SUB2 ROT DEO2
59 ;box-icn .Screen/addr DEO2
60- #05 .Screen/sprite DEOk DEOk DEOk DEO
61+ #43 .Screen/sprite DEOk DEOk DEOk DEO
62+ ( | top right )
63+ .Screen/x DEI2k #0038 ADD2 ROT DEO2
64+ .Screen/y DEI2k #0020 SUB2 ROT DEO2
65+ ;box-icn .Screen/addr DEO2
66+ #53 .Screen/sprite DEOk DEOk DEOk DEO
67+ ( | bottom right )
68+ .Screen/x DEI2k #0000 ADD2 ROT DEO2
69+ .Screen/y DEI2k #0018 ADD2 ROT DEO2
70+ ;box-icn .Screen/addr DEO2
71+ #73 .Screen/sprite DEOk DEOk DEOk DEO
72+ ( | bottom left )
73+ .Screen/x DEI2k #0038 SUB2 ROT DEO2
74+ .Screen/y DEI2k #0020 ADD2 ROT DEO2
75+ ;box-icn .Screen/addr DEO2
76+ #63 .Screen/sprite DEOk DEOk DEOk DEO
77 JMP2r
78
79 @<draw-circle> ( color -- )
80@@ -78,18 +97,18 @@
81 JMP2r
82
83 @<draw-guide> ( -- )
84- #0080 DUP2 .Screen/x DEO2
85+ #0008 DUP2 .Screen/x DEO2
86 .Screen/y DEO2
87- #f2 .Screen/auto DEO
88+ #e2 .Screen/auto DEO
89 ;guide-icn .Screen/addr DEO2
90- #1000
91+ #0f00
92 &>l ( -- )
93 #01 .Screen/sprite DEO
94 INC GTHk ?&>l
95 POP2
96 ( | circles 1bpp )
97- #0090 .Screen/x DEO2
98- #0010 .Screen/y DEO2
99+ #0088 .Screen/x DEO2
100+ #0008 .Screen/y DEO2
101 #01 .Screen/auto DEO
102 #0f00
103 &>ll ( -- )
104@@ -97,8 +116,8 @@
105 INC GTHk ?&>ll
106 POP2
107 ( | circles 2bpp )
108- #0090 .Screen/x DEO2
109- #0020 .Screen/y DEO2
110+ #0088 .Screen/x DEO2
111+ #0018 .Screen/y DEO2
112 #01 .Screen/auto DEO
113 #0f00
114 &>lll ( -- )
115@@ -145,14 +164,14 @@
116 3c80 8080 80c0 c0e0 0003 3fbf bfbf dfef ]
117
118 @box-icn [
119- 001f 2050 4844 4241 00ff 0000 0000 0000
120- 00ff 0000 0000 0000 00f8 040a 1222 4282
121- 4040 4040 4040 4040 8040 2010 0804 0201
122- 0102 0408 1020 4080 0202 0202 0202 0202
123- 4040 4040 4040 4040 0102 0408 1020 4080
124- 8040 2010 0804 0201 0202 0202 0202 0202
125- 4142 4448 5020 1f00 0000 0000 0000 ff00
126- 0000 0000 0000 ff00 8242 2212 0a04 f800 ]
127+ 0000 0000 0001 0204 0000 0f30 c000 0000
128+ 03fc 0000 0000 0000 ff00 0000 0000 0000
129+ 0808 1010 2020 2020 0000 0000 0000 0000
130+ 0000 0000 0000 0000 0000 0000 0000 0000
131+ 4040 4040 4040 8080 0000 0000 0000 0000
132+ 0000 0000 0000 0000 0000 0000 0000 0000
133+ 8080 8080 8080 8080 0000 0000 0000 0000
134+ 0000 0000 0000 0000 0000 0000 0000 0000 ]
135
136 @circle-chr [ 071f 3c70 60e3 c7c7 0000 030f 1f1f 3f3f ]
137