Browse code
Improved draw example
neauoire authored on 13/02/2021 03:51:39
Showing 3 changed files
| ... | ... |
@@ -24,5 +24,5 @@ rm -f ./bin/emulator |
| 24 | 24 |
cc -std=c89 -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werror=implicit-int -Werror=incompatible-pointer-types -Werror=int-conversion -Wvla -g -Og -fsanitize=address -fsanitize=undefined uxn.c emulator.c -L/usr/local/lib -lSDL2 -o bin/emulator |
| 25 | 25 |
|
| 26 | 26 |
# run |
| 27 |
-./bin/assembler examples/line.usm bin/boot.rom |
|
| 27 |
+./bin/assembler examples/draw.usm bin/boot.rom |
|
| 28 | 28 |
./bin/emulator bin/boot.rom |
| ... | ... |
@@ -4,6 +4,7 @@ |
| 4 | 4 |
:dev/w fff9 ( std write port ) |
| 5 | 5 |
|
| 6 | 6 |
;x_ 2 ;y_ 2 ;x 2 ;y 2 ;w 2 ;h 2 ;color 1 |
| 7 |
+;x0 2 ;y0 2 ;x1 2 ;y1 2 ;dx 2 ;dy 2 ;err1 2 ;err2 2 ( line ) |
|
| 7 | 8 |
|
| 8 | 9 |
|0100 @RESET |
| 9 | 10 |
|
| ... | ... |
@@ -38,6 +39,23 @@ |
| 38 | 39 |
( fill rect x y w h ) |
| 39 | 40 |
,0028 ,0038 ,0050 ,0030 ,linerect JSR |
| 40 | 41 |
|
| 42 |
+ |
|
| 43 |
+ ( positive ) |
|
| 44 |
+ ,01 ,color STR |
|
| 45 |
+ +0030 ,x0 STR^ +0040 ,y0 STR^ |
|
| 46 |
+ +0100 ,x1 STR^ +0060 ,y1 STR^ |
|
| 47 |
+ ,line JSR |
|
| 48 |
+ |
|
| 49 |
+ ,02 ,color STR |
|
| 50 |
+ +0020 ,x0 STR^ +0010 ,y0 STR^ |
|
| 51 |
+ +0090 ,x1 STR^ +0070 ,y1 STR^ |
|
| 52 |
+ ,line JSR |
|
| 53 |
+ |
|
| 54 |
+ ,03 ,color STR |
|
| 55 |
+ +0010 ,x0 STR^ +0040 ,y0 STR^ |
|
| 56 |
+ +0070 ,x1 STR^ +0060 ,y1 STR^ |
|
| 57 |
+ ,line JSR |
|
| 58 |
+ |
|
| 41 | 59 |
,redraw JSR |
| 42 | 60 |
|
| 43 | 61 |
BRK |
| ... | ... |
@@ -70,6 +88,31 @@ BRK |
| 70 | 88 |
,x_ LDR^ ,w LDR^ ,x LDR^ ADD^ ,0001 ADD^ LTH^ ,linerectrow ROT JMP? POP^ |
| 71 | 89 |
RTS |
| 72 | 90 |
|
| 91 |
+@line |
|
| 92 |
+ ,x0 LDR^ ,x_ STR^ ,y0 LDR^ ,y_ STR^ ( start at x0,y0 ) |
|
| 93 |
+ ,x1 LDR^ ,x0 LDR^ ,diff16sub JSR ,dx STR^ ( int dx = abs[x1 - x0] ) |
|
| 94 |
+ ,y1 LDR^ ,y0 LDR^ ,diff16sub JSR -0001 MUL!^ ,dy STR^ ( int dy = -abs[y1 - y0] ) |
|
| 95 |
+ ,dx LDR^ ,dy LDR^ ADD!^ ,err1 STR^ ( int err1 = dx + dy, e2; ) |
|
| 96 |
+ @lineloop |
|
| 97 |
+ ,x_ LDR^ ,y_ LDR^ ,putpixel JSR ( draw ) |
|
| 98 |
+ @line-x |
|
| 99 |
+ ,err1 LDR^ +0002 MUL!^ ,err2 STR^ ( e2 = 2 * err; ) |
|
| 100 |
+ ,err2 LDR^ ,dy LDR^ LTH!^ ,line-y ROT JMP? POP^ ( e2 >= dy ) |
|
| 101 |
+ ,err1 LDR^ ,dy LDR^ ADD!^ ,err1 STR^ ( err1 += dy; ) |
|
| 102 |
+ ,x_ LDR^ +0001 ADD!^ ,x_ STR^ ( y0 += y0 < y1 ? 1 : -1; ) |
|
| 103 |
+ @line-y |
|
| 104 |
+ ,err2 LDR^ ,dx LDR^ GTH!^ ,line-end ROT JMP? POP^ ( e2 <= dx ) |
|
| 105 |
+ ,err1 LDR^ ,dx LDR^ ADD!^ ,err1 STR^ ( err1 += dx; ) |
|
| 106 |
+ ,y_ LDR^ +0001 ADD!^ ,y_ STR^ ( y0 += y0 < y1 ? 1 : -1; ) |
|
| 107 |
+ @line-end |
|
| 108 |
+ ,x_ LDR^ ,x1 LDR^ NEQ!^ ,lineloop ROT JMP? POP^ ( loop ) |
|
| 109 |
+ RTS |
|
| 110 |
+ |
|
| 111 |
+@diff16 |
|
| 112 |
+ OVR^ OVR^ GTH^ ,diff16sub ROT JMP? POP^ |
|
| 113 |
+ SWP^ @diff16sub SUB^ |
|
| 114 |
+RTS |
|
| 115 |
+ |
|
| 73 | 116 |
@redraw |
| 74 | 117 |
,0000 IOW^ |
| 75 | 118 |
,0000 IOW^ |
| ... | ... |
@@ -3,27 +3,28 @@ |
| 3 | 3 |
:dev/r fff8 ( std read port ) |
| 4 | 4 |
:dev/w fff9 ( std write port ) |
| 5 | 5 |
|
| 6 |
-;x_ 2 ;y_ 2 ;x0 2 ;y0 2 ;x1 2 ;y1 2 ;color 1 |
|
| 7 |
-;dx 2 ;dy 2 ;err 2 ;err2 2 |
|
| 6 |
+;x_ 2 ;y_ 2 ;color 1 |
|
| 7 |
+;x0 2 ;y0 2 ;x1 2 ;y1 2 ;dx 2 ;dy 2 ;err1 2 ;err2 2 |
|
| 8 | 8 |
|
| 9 | 9 |
|0100 @RESET |
| 10 | 10 |
|
| 11 | 11 |
( set dev/write to screen ) |
| 12 | 12 |
,01 ,dev/w STR |
| 13 | 13 |
|
| 14 |
+ ( positive ) |
|
| 14 | 15 |
,01 ,color STR |
| 15 | 16 |
+0030 ,x0 STR^ +0040 ,y0 STR^ |
| 16 |
- +0050 ,x1 STR^ +0060 ,y1 STR^ |
|
| 17 |
+ +0100 ,x1 STR^ +0060 ,y1 STR^ |
|
| 17 | 18 |
,line JSR |
| 18 | 19 |
|
| 19 | 20 |
,02 ,color STR |
| 20 | 21 |
+0020 ,x0 STR^ +0010 ,y0 STR^ |
| 21 |
- +0060 ,x1 STR^ +0070 ,y1 STR^ |
|
| 22 |
+ +0090 ,x1 STR^ +0070 ,y1 STR^ |
|
| 22 | 23 |
,line JSR |
| 23 | 24 |
|
| 24 | 25 |
,03 ,color STR |
| 25 | 26 |
+0010 ,x0 STR^ +0040 ,y0 STR^ |
| 26 |
- +0080 ,x1 STR^ +0060 ,y1 STR^ |
|
| 27 |
+ +0070 ,x1 STR^ +0060 ,y1 STR^ |
|
| 27 | 28 |
,line JSR |
| 28 | 29 |
|
| 29 | 30 |
( draw control points ) |
| ... | ... |
@@ -39,19 +40,20 @@ BRK |
| 39 | 40 |
,x0 LDR^ ,x_ STR^ ,y0 LDR^ ,y_ STR^ ( start at x0,y0 ) |
| 40 | 41 |
,x1 LDR^ ,x0 LDR^ ,diff16sub JSR ,dx STR^ ( int dx = abs[x1 - x0] ) |
| 41 | 42 |
,y1 LDR^ ,y0 LDR^ ,diff16sub JSR -0001 MUL!^ ,dy STR^ ( int dy = -abs[y1 - y0] ) |
| 42 |
- ,dx LDR^ ,dy LDR^ ADD!^ ,err STR^ ( int err = dx + dy, e2; ) |
|
| 43 |
- @loop |
|
| 43 |
+ ,dx LDR^ ,dy LDR^ ADD!^ ,err1 STR^ ( int err1 = dx + dy, e2; ) |
|
| 44 |
+ @lineloop |
|
| 44 | 45 |
,x_ LDR^ ,y_ LDR^ ,putpixel JSR ( draw ) |
| 45 |
- ,err LDR^ +0002 MUL!^ ,err2 STR^ ( e2 = 2 * err; ) |
|
| 46 |
- ,err2 LDR^ ,dy LDR^ LTH!^ ,continue1 ROT JMP? POP^ ( e2 >= dy ) |
|
| 47 |
- ,err LDR^ ,dy LDR^ ADD!^ ,err STR^ ( err += dy; ) |
|
| 46 |
+ @line-x |
|
| 47 |
+ ,err1 LDR^ +0002 MUL!^ ,err2 STR^ ( e2 = 2 * err; ) |
|
| 48 |
+ ,err2 LDR^ ,dy LDR^ LTH!^ ,line-y ROT JMP? POP^ ( e2 >= dy ) |
|
| 49 |
+ ,err1 LDR^ ,dy LDR^ ADD!^ ,err1 STR^ ( err1 += dy; ) |
|
| 48 | 50 |
,x_ LDR^ +0001 ADD!^ ,x_ STR^ ( y0 += y0 < y1 ? 1 : -1; ) |
| 49 |
- @continue1 |
|
| 50 |
- ,err2 LDR^ ,dx LDR^ GTH!^ ,continue2 ROT JMP? POP^ ( e2 <= dx ) |
|
| 51 |
- ,err LDR^ ,dx LDR^ ADD!^ ,err STR^ ( err += dx; ) |
|
| 51 |
+ @line-y |
|
| 52 |
+ ,err2 LDR^ ,dx LDR^ GTH!^ ,line-end ROT JMP? POP^ ( e2 <= dx ) |
|
| 53 |
+ ,err1 LDR^ ,dx LDR^ ADD!^ ,err1 STR^ ( err1 += dx; ) |
|
| 52 | 54 |
,y_ LDR^ +0001 ADD!^ ,y_ STR^ ( y0 += y0 < y1 ? 1 : -1; ) |
| 53 |
- @continue2 |
|
| 54 |
- ,x_ LDR^ ,x1 LDR^ LTH!^ ,loop ROT JMP? POP^ ( loop ) |
|
| 55 |
+ @line-end |
|
| 56 |
+ ,x_ LDR^ ,x1 LDR^ NEQ!^ ,lineloop ROT JMP? POP^ ( loop ) |
|
| 55 | 57 |
RTS |
| 56 | 58 |
|
| 57 | 59 |
@redraw |