Browse code

Cleanup

neauoire authored on 02/04/2021 04:53:41
Showing 11 changed files
... ...
@@ -1,4 +1,4 @@
1
-( hello world )
1
+( Dev/Console )
2 2
 
3 3
 %RTN { JMP2r }
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-( Controller )
1
+( Dev/Controller )
2 2
 
3 3
 %++ { #0001 ADD2 }
4 4
 %-- { #0001 SUB2 }
... ...
@@ -1,4 +1,4 @@
1
-( hello world )
1
+( Dev/File )
2 2
 
3 3
 %RTN { JMP2r }
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-( Keys )
1
+( Dev/Keys )
2 2
 
3 3
 %8+  { #0008 ADD2 }
4 4
 %8*  { #0030 SFT2 }
... ...
@@ -1,4 +1,4 @@
1
-( draw routines )
1
+( Dev/Mouse )
2 2
 
3 3
 %RTN { JMP2r }
4 4
 %++  { #0001 ADD2 }
... ...
@@ -1,4 +1,4 @@
1
-( draw routines )
1
+( Dev/Screen )
2 2
 
3 3
 %RTN { JMP2r }
4 4
 %++  { #0001 ADD2 }
... ...
@@ -1,3 +1,5 @@
1
+( Dev/Time )
2
+
1 3
 %RTN { JMP2r }
2 4
 %ABS2 { DUP2 #000f SFT2 EQU #04 JNZ #ffff MUL2 }
3 5
 %SCALEX { #0002 DIV2 ~Screen.width #0002 DIV2 ADD2 #0040 SUB2 }
... ...
@@ -6,9 +8,9 @@
6 8
 %MOD { DUP2 DIV MUL SUB }
7 9
 
8 10
 ;current { second 1 }
11
+;needles { hx 2 hy 2 mx 2 my 2 sx 2 sy 2 }
9 12
 ;line { x0 2 y0 2 x 2 y 2 sx 2 sy 2 dx 2 dy 2 e1 2 e2 2 }
10 13
 ;color { byte 1 }
11
-;needles { hx 2 hy 2 mx 2 my 2 sx 2 sy 2 }
12 14
 
13 15
 ( devices )
14 16
 
... ...
@@ -17,6 +19,9 @@
17 19
 |0120 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 }
18 20
 |0190 ;Time { year 2 month 1 day 1 hour 1 minute 1 second 1 dow 1 doy 2 isdst 1 get 1 }
19 21
 |01F0 ;System { pad 8 r 2 g 2 b 2 }
22
+
23
+( vectors )
24
+
20 25
 |0200 ^RESET JMP
21 26
 |0204 ,ERROR JMP2
22 27
 |0208 ,FRAME JMP2
... ...
@@ -27,13 +32,13 @@
27 32
 	
28 33
 	( theme ) #0ff8 =System.r #0f08 =System.g #0f08 =System.b
29 34
 
30
-	,draw-circle JSR2
31
-
32 35
 BRK
33 36
 
34 37
 @FRAME
35 38
 	
36 39
 	#00 =Time.get
40
+
41
+	( only draw once per second )
37 42
 	~Time.second ~current.second NEQ #01 JNZ BRK
38 43
 	~Time.second =current.second
39 44
 
... ...
@@ -44,40 +49,21 @@ BRK
44 49
 
45 50
 	( place )
46 51
 	#00 ~Time.second #0002 MUL2 ,table ADD2 LDR2
47
-	#00 SWP SCALEY =needles.sy #00 SWP SCALEX =needles.sx
52
+		#00 SWP SCALEY =needles.sy 
53
+		#00 SWP SCALEX =needles.sx
48 54
 	#00 ~Time.minute #0002 MUL2 ,table ADD2 LDR2
49
-	#00 SWP #0004 DIV2 #0003 MUL2 #0020 ADD2 SCALEY =needles.my 
50
-	#00 SWP #0004 DIV2 #0003 MUL2 #0020 ADD2 SCALEX =needles.mx
55
+		#00 SWP #0004 DIV2 #0003 MUL2 #0020 ADD2 SCALEY =needles.my 
56
+		#00 SWP #0004 DIV2 #0003 MUL2 #0020 ADD2 SCALEX =needles.mx
51 57
 	#00 ~Time.hour 12HOURS #05 MUL #0002 MUL2 ,table ADD2 LDR2
52
-	#00 SWP #0002 DIV2 #0040 ADD2 SCALEY =needles.hy 
53
-	#00 SWP #0002 DIV2 #0040 ADD2 SCALEX =needles.hx
58
+		#00 SWP #0002 DIV2 #0040 ADD2 SCALEY =needles.hy 
59
+		#00 SWP #0002 DIV2 #0040 ADD2 SCALEX =needles.hx
54 60
 
55
-	( draw )
61
+	( needles )
56 62
 	#0080 SCALEX #0080 SCALEY ~needles.sx ~needles.sy #02 ,draw-line JSR2
57 63
 	#0080 SCALEX #0080 SCALEY ~needles.mx ~needles.my #01 ,draw-line JSR2
58 64
 	#0080 SCALEX #0080 SCALEY ~needles.hx ~needles.hy #03 ,draw-line JSR2
59 65
 
60
-	,draw-circle JSR2
61
-
62
-	( display )
63
-	~Screen.height #0002 DIV2 #0048 ADD2 =Sprite.y
64
-	~Screen.width #0002 DIV2
65
-	DUP2 #0020 SUB2 =Sprite.x ,font_hex #00 ~Time.hour #0a DIV #08 MUL ADD2 =Sprite.addr #02 =Sprite.color
66
-	DUP2 #0018 SUB2 =Sprite.x ,font_hex #00 ~Time.hour #0a MOD #08 MUL ADD2 =Sprite.addr #02 =Sprite.color
67
-	DUP2 #0008 SUB2 =Sprite.x ,font_hex #00 ~Time.minute #0a DIV #08 MUL ADD2 =Sprite.addr #02 =Sprite.color
68
-	DUP2 =Sprite.x ,font_hex #00 ~Time.minute #0a MOD #08 MUL ADD2 =Sprite.addr #02 =Sprite.color
69
-	DUP2 #0010 ADD2 =Sprite.x ,font_hex #00 ~Time.second #0a DIV #08 MUL ADD2 =Sprite.addr #02 =Sprite.color
70
-	DUP2 #0018 ADD2 =Sprite.x ,font_hex #00 ~Time.second #0a MOD #08 MUL ADD2 =Sprite.addr #02 =Sprite.color
71
-	POP2
72
-
73
-BRK
74
-
75
-@ERROR 
76
-
77
-BRK
78
-
79
-@draw-circle ( -- )
80
-	
66
+	( circle )
81 67
 	#00 #3c 
82 68
 	$loop
83 69
 		( load ) OVR #00 SWP #0002 MUL2 ,table ADD2 LDR2 
... ...
@@ -88,7 +74,30 @@ BRK
88 74
 		DUP2 LTH ^$loop JNZ
89 75
 	POP2
90 76
 
91
-RTN
77
+	( display )
78
+	~Screen.height #0002 DIV2 #0048 ADD2 =Sprite.y
79
+	~Screen.width #0002 DIV2
80
+	DUP2 #0020 SUB2 =Sprite.x 
81
+		,font_hex #00 ~Time.hour #0a DIV #08 MUL ADD2 =Sprite.addr 
82
+		#02 =Sprite.color
83
+	DUP2 #0018 SUB2 =Sprite.x 
84
+		,font_hex #00 ~Time.hour #0a MOD #08 MUL ADD2 =Sprite.addr 
85
+		#02 =Sprite.color
86
+	DUP2 #0008 SUB2 =Sprite.x 
87
+		,font_hex #00 ~Time.minute #0a DIV #08 MUL ADD2 =Sprite.addr 
88
+		#02 =Sprite.color
89
+	DUP2 =Sprite.x 
90
+		,font_hex #00 ~Time.minute #0a MOD #08 MUL ADD2 =Sprite.addr 
91
+		#02 =Sprite.color
92
+	DUP2 #0010 ADD2 =Sprite.x 
93
+		,font_hex #00 ~Time.second #0a DIV #08 MUL ADD2 =Sprite.addr 
94
+		#02 =Sprite.color
95
+	DUP2 #0018 ADD2 =Sprite.x 
96
+		,font_hex #00 ~Time.second #0a MOD #08 MUL ADD2 =Sprite.addr 
97
+		#02 =Sprite.color
98
+	POP2
99
+
100
+BRK
92 101
 
93 102
 @draw-line ( x1 y1 x2 y2 color -- )
94 103
 	
... ...
@@ -116,6 +125,8 @@ RTN
116 125
 
117 126
 RTN
118 127
 
128
+@ERROR BRK
129
+
119 130
 @table ( 60 positions on a circle in bytes )
120 131
 [
121 132
 	8000 8d00 9a02 a706 b40b c011 cb18 d520 
... ...
@@ -1,4 +1,4 @@
1
-( draw routines )
1
+( GUI Hover )
2 2
 
3 3
 %RTN { JMP2r }
4 4
 %RTN? { #00 EQU #02 JNZ STH2r JMP2 }
... ...
@@ -1,4 +1,4 @@
1
-( draw routines )
1
+( GUI Labels )
2 2
 
3 3
 %RTN { JMP2r }
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-( gui/picture )
1
+( GUI Picture )
2 2
 
3 3
 %RTN { JMP2r }
4 4
 
... ...
@@ -1,4 +1,4 @@
1
-( draw routines )
1
+( GUI Shapes )
2 2
 
3 3
 %RTN { JMP2r }
4 4
 %++  { #0001 ADD2 }