gr: lines: working on bresenham lines

This commit is contained in:
Vince Weaver 2021-03-27 16:31:52 -04:00
parent d9fd1e96bc
commit 9b28d5420a
7 changed files with 877 additions and 0 deletions

View File

@ -0,0 +1,50 @@
include ../../../Makefile.inc
DOS33 = ../../../utils/dos33fs-utils/dos33
TOKENIZE = ../../../utils/asoft_basic-utils/tokenize_asoft
LINKERSCRIPTS = ../../../linker_scripts
EMPTYDISK = ../../../empty_disk/empty.dsk
all: lines.dsk
lines.dsk: HELLO LINES LINES_SMALL LINES_ROM
cp $(EMPTYDISK) lines.dsk
$(DOS33) -y lines.dsk SAVE A HELLO
$(DOS33) -y lines.dsk BSAVE -a 0xC00 LINES
$(DOS33) -y lines.dsk BSAVE -a 0xC00 LINES_SMALL
$(DOS33) -y lines.dsk BSAVE -a 0xC00 LINES_ROM
###
HELLO: hello.bas
$(TOKENIZE) < hello.bas > HELLO
###
LINES: lines.o
ld65 -o LINES lines.o -C $(LINKERSCRIPTS)/apple2_c00.inc
lines.o: lines.s
ca65 -o lines.o lines.s -l lines.lst
###
LINES_SMALL: lines_small.o
ld65 -o LINES_SMALL lines_small.o -C $(LINKERSCRIPTS)/apple2_c00.inc
lines_small.o: lines_small.s
ca65 -o lines_small.o lines_small.s -l lines_small.lst
###
LINES_ROM: lines_rom.o
ld65 -o LINES_ROM lines_rom.o -C $(LINKERSCRIPTS)/apple2_c00.inc
lines_rom.o: lines_rom.s
ca65 -o lines_rom.o lines_rom.s -l lines_rom.lst
###
clean:
rm -f *~ *.o *.lst HELLO LINES LINES_SMALL LINES_ROM

View File

@ -0,0 +1,105 @@
;; HARDWARE LOCATIONS
KEYPRESS = $C000
KEYRESET = $C010
;; SOFT SWITCHES
CLR80COL = $C000 ; PAGE0/PAGE1 normal
SET80COL = $C001 ; PAGE0/PAGE1 switches PAGE0 in Aux instead
EIGHTYCOLOFF = $C00C
EIGHTYCOLON = $C00D
TBCOLOR = $C022 ; IIgs text foreground / background colors
NEWVIDEO = $C029 ; IIgs graphics modes
SPEAKER = $C030
CLOCKCTL = $C034 ; bits 0-3 are IIgs border color
SET_GR = $C050
SET_TEXT = $C051
FULLGR = $C052
TEXTGR = $C053
PAGE0 = $C054
PAGE1 = $C055
LORES = $C056 ; Enable LORES graphics
HIRES = $C057 ; Enable HIRES graphics
AN3 = $C05E ; Annunciator 3
PADDLE_BUTTON0 = $C061
PADDLE_BUTTON1 = $C062
PADDL0 = $C064
PTRIG = $C070
;; BASIC ROUTINES
NORMAL = $F273
;; MONITOR ROUTINES
PLOT = $F800 ;; PLOT AT Y,A
PLOT1 = $F80E ;; PLOT at (GBASL),Y (need MASK to be $0f or $f0)
SCRN2 = $F879 ;; set A to top or bottom nibble based on C
HLINE = $F819 ;; HLINE Y,$2C at A
VLINE = $F828 ;; VLINE A,$2D at Y
CLRSCR = $F832 ;; Clear low-res screen
CLRTOP = $F836 ;; clear only top of low-res screen
GBASCALC= $F847 ;; take Y-coord/2 in A, put address in GBASL/H ( a trashed, C clear)
NEXTCOL = $F85F ;; COLOR=COLOR+3
SETCOL = $F864 ;; COLOR=A
ROM_TEXT2COPY = $F962 ;; iigs
SETTXT = $FB36
SETGR = $FB40 ;; A is $D0 after
TABV = $FB5B ;; VTAB to A
ROM_MACHINEID = $FBB3 ;; iigs
BELL = $FBDD ;; ring the bell
BASCALC = $FBC1 ;;
VTAB = $FC22 ;; VTAB to CV
HOME = $FC58 ;; Clear the text screen
WAIT = $FCA8 ;; delay 1/2(26+27A+5A^2) us
CROUT1 = $FD8B
SETINV = $FE80 ;; INVERSE
SETNORM = $FE84 ;; NORMAL
COUT = $FDED ;; output A to screen
COUT1 = $FDF0 ;; output A to screen
COLOR_BLACK = 0
COLOR_RED = 1
COLOR_DARKBLUE = 2
COLOR_PURPLE = 3
COLOR_DARKGREEN = 4
COLOR_GREY = 5
COLOR_MEDIUMBLUE = 6
COLOR_LIGHTBLUE = 7
COLOR_BROWN = 8
COLOR_ORANGE = 9
COLOR_GREY2 = 10
COLOR_PINK = 11
COLOR_LIGHTGREEN = 12
COLOR_YELLOW = 13
COLOR_AQUA = 14
COLOR_WHITE = 15
COLOR_BOTH_BLACK = $00
COLOR_BOTH_RED = $11
COLOR_BOTH_DARKBLUE = $22
COLOR_BOTH_DARKGREEN = $44
COLOR_BOTH_GREY = $55
COLOR_BOTH_MEDIUMBLUE = $66
COLOR_BOTH_LIGHTBLUE = $77
COLOR_BOTH_BROWN = $88
COLOR_BOTH_ORANGE = $99
COLOR_BOTH_PINK = $BB
COLOR_BOTH_LIGHTGREEN = $CC
COLOR_BOTH_YELLOW = $DD
COLOR_BOTH_AQUA = $EE
COLOR_BOTH_WHITE = $FF

View File

@ -0,0 +1,2 @@
5 HOME
10 PRINT CHR$(4);"CATALOG"

183
graphics/gr/lines/lines.s Normal file
View File

@ -0,0 +1,183 @@
; Bresenham Lines
; by Vince `deater` Weaver <vince@deater.net>
; based on code from https://gist.github.com/petrihakkinen/
.include "zp.inc"
.include "hardware.inc"
B_Y1 = $F0
B_Y2 = $F1
B_X1 = $F2
B_X2 = $F3
B_DY = $F4
B_DX = $F5
B_SY = $F6
B_SX = $F7
B_ERR = $F8
lines:
jsr SETGR ; set lo-res 40x40 mode
; A=$D0 afterward
lda #6
jsr SETCOL
lda #10
sta B_X1
sta B_Y1
lda #30
sta B_X2
sta B_Y2
jsr draw_line
end:
jmp end
draw_line:
jsr init_bresenham
line_loop:
ldy B_X1
lda B_Y1
jsr PLOT ; PLOT AT Y,A
ldy B_X1
cpy B_X2
bne line_no_end
lda B_Y1
cmp B_Y2
beq done_line
line_no_end:
jsr step_bresenham
jmp draw_line
done_line:
rts
;========================
; step
;========================
step_bresenham:
; err2 = err
lda B_ERR
pha ; push err2
; if err2 > -dx:
; err = err - dy
; x = x + sx
clc
adc B_DX ; skip if err2 + dx <= 0
bmi skip_x
beq skip_x
lda B_ERR
sec
sbc B_DY
sta B_ERR
lda B_X1
clc
adc B_SX
sta B_X1
skip_x:
; if err2 < dy:
; err = err + dx
; y = y + sy
pla ; pop err2
cmp B_DY ; skip if err2 - dy >= 0
bpl skip_y
lda B_ERR
clc
adc B_DX
sta B_ERR
lda B_Y1
clc
adc B_SY
sta B_Y1
skip_y:
rts
;========================
; init
;========================
init_bresenham:
; dx = abs(x2 - x1)
; dy = abs(y2 - y1)
; sx = x1 < x2 ? 1 : -1
; sy = y1 < y2 ? 1 : -1
; err = dx > dy ? dx : -dy
; dx = dx * 2
; dy = dy * 2
; if y1 < y2:
; sy = 1
; dy = y2 - y1
; else:
; sy = -1
; dy = y1 - y2
ldx #$ff ; X = -1
lda B_Y1
sec
sbc B_Y2 ; A = y1 - y2
bpl yskip
ldx #1 ; X = 1
jsr neg ; A = y2 - y1
yskip:
sta B_DY
stx B_SY
; if x1 < x2:
; sx = 1
; dx = x2 - x1
; else:
; sx = -1
; dx = x1 - x2
ldx #$ff ; X = -1
lda B_X1
sec
sbc B_X2 ; A = x1 - x2
bpl xskip
ldx #1 ; X = 1
jsr neg ; A = x2 - x1
xskip:
sta B_DX
stx B_SX
; err = dx > dy ? dx : -dy
; lda B_DX
cmp B_DY ; dx - dy > 0
beq errneg
bpl skiperr
errneg:
lda B_DY
jsr neg
skiperr:
sta B_ERR
; dx = dx * 2
; dy = dy * 2
asl B_DX
asl B_DY
rts
neg:
eor #$ff
clc
adc #1
rts

View File

@ -0,0 +1,168 @@
; Bresenham Lines
; by Vince `deater` Weaver <vince@deater.net>
; based on the HGR line code from Applesoft ROM
.include "zp.inc"
.include "hardware.inc"
; 171 -- initial
; 167 -- inline init
B_X1 = $F0
B_Y1 = $F1
B_X2 = $F2
B_Y2 = $F3
B_DX = $F4
B_DY = $F5
B_SX = $F6
B_SY = $F7
B_ERR = $F8
COUNT = $F9
lines:
jsr SETGR ; set lo-res 40x40 mode
; A=$D0 afterward
lda #0
sta COUNT
lines_loop:
jsr NEXTCOL
lda #0
sta B_X1
lda #36
; lda #35
sta B_Y2
lda COUNT
cmp #10
end:
beq end
asl
asl
sta B_Y1
sta B_X2
jsr draw_line
inc COUNT
jmp lines_loop
;============================
; draw line
; from x1,y1 to x2,y2
;============================
draw_line:
init_bresenham:
; compute DX = X2-X1
sec
lda B_X2
sbc B_X1
sta B_SX ; dx sign, +=right -=left
bcs no_invert_dx ; get ABS
eor #$ff
sec
adc #1
no_invert_dx:
sta B_DX
sta B_ERR
lda B_Y2 ; get DY=Y2-Y1
clc
sbc B_Y1 ; actually do DY= -ABS(Y2-Y1)-1
bcc no_invert_dy
eor #$ff
adc #$fe
no_invert_dy:
sta B_DY
ror B_SX ; get y direction into quadrant
sec ; count = dx - (-dy)
sbc B_DX
line_loop:
ldy B_X1
lda B_Y1
jsr PLOT ; PLOT AT Y,A
ldy B_X1
cpy B_X2
bne line_no_end
lda B_Y1
cmp B_Y2
beq done_line
line_no_end:
jsr step_bresenham
jmp line_loop
done_line:
rts
;========================
; step
;========================
step_bresenham:
; err2 = err
lda B_ERR
pha ; push err2
; if err2 > -dx:
; err = err - dy
; x = x + sx
clc
adc B_DX ; skip if err2 + dx <= 0
bmi skip_x
beq skip_x
lda B_ERR
sec
sbc B_DY
sta B_ERR
lda B_X1
clc
adc B_SX
sta B_X1
skip_x:
; if err2 < dy:
; err = err + dx
; y = y + sy
pla ; pop err2
cmp B_DY ; skip if err2 - dy >= 0
bpl skip_y
lda B_ERR
clc
adc B_DX
sta B_ERR
lda B_Y1
clc
adc B_SY
sta B_Y1
skip_y:
rts
neg:
eor #$ff
clc
adc #1
rts

View File

@ -0,0 +1,211 @@
; Bresenham Lines
; by Vince `deater` Weaver <vince@deater.net>
; based on code from https://gist.github.com/petrihakkinen/
; note this code can break if X>32 or Y>32
; notice this if you try to plot 0,36 to 36,35
.include "zp.inc"
.include "hardware.inc"
; 171 -- initial
; 167 -- inline init
B_X1 = $F0
B_Y1 = $F1
B_X2 = $F2
B_Y2 = $F3
B_DX = $F4
B_DY = $F5
B_SX = $F6
B_SY = $F7
B_ERR = $F8
COUNT = $F9
lines:
jsr SETGR ; set lo-res 40x40 mode
; A=$D0 afterward
lda #0
sta COUNT
lines_loop:
jsr NEXTCOL
lda #0
sta B_X1
; lda #36
lda #35
sta B_Y2
lda COUNT
cmp #10
end:
beq end
asl
asl
sta B_Y1
sta B_X2
jsr draw_line
inc COUNT
jmp lines_loop
;============================
; draw line
; from x1,y1 to x2,y2
;============================
draw_line:
; from wikipedia
; dx = abs(x2 - x1)
; sx = x1 < x2 ? 1 : -1
; dy = -abs(y2 - y1)
; sy = y1 < y2 ? 1 : -1
; err = dx+dy
; dx=dx*2
; dy=dy*2
init_bresenham:
; dy = abs(y2-y1)
; sy = y1 < y2 ? 1 : -1
ldx #$ff ; X = -1
lda B_Y1
sec
sbc B_Y2 ; A = y1 - y2
bpl yskip
inx
inx ; X = 1
jsr neg ; A = y2 - y1
yskip:
sta B_DY
stx B_SY
; dx = abs(x2-x1)
; sx = x1<x2 ? 1 : -1
ldx #$ff ; X = -1
lda B_X1
sec
sbc B_X2 ; A = x1 - x2
bpl xskip
inx
inx ; X = 1
jsr neg ; A = x2 - x1
xskip:
sta B_DX
stx B_SX
; err = dx > dy ? dx : -dy
; lda B_DX
cmp B_DY ; dx - dy > 0
beq noskiperr
bpl skiperr
noskiperr:
lda B_DY
jsr neg
skiperr:
sta B_ERR
; dx = dx * 2
; dy = dy * 2
asl B_DX
asl B_DY
line_loop:
ldy B_X1
lda B_Y1
jsr PLOT ; PLOT AT Y,A
ldy B_X1
cpy B_X2
bne line_no_end
lda B_Y1
cmp B_Y2
beq done_line
line_no_end:
jsr step_bresenham
jmp line_loop
done_line:
rts
;========================
; step
;========================
step_bresenham:
; err2 = err
lda B_ERR
pha ; push err2
; if err2 > -dx:
; err = err - dy
; x = x + sx
clc
adc B_DX ; skip if err2 + dx <= 0
bmi skip_x
beq skip_x
lda B_ERR
sec
sbc B_DY
sta B_ERR
lda B_X1
clc
adc B_SX
sta B_X1
skip_x:
; if err2 < dy:
; err = err + dx
; y = y + sy
pla ; pop err2
cmp B_DY ; skip if err2 - dy >= 0
bpl skip_y
lda B_ERR
clc
adc B_DX
sta B_ERR
lda B_Y1
clc
adc B_SY
sta B_Y1
skip_y:
rts
neg:
eor #$ff
clc
adc #1
rts

158
graphics/gr/lines/zp.inc Normal file
View File

@ -0,0 +1,158 @@
;; Zero page monitor routines addresses
;; LZSA addresses
NIBCOUNT = $00
WNDLFT = $20
WNDWDTH = $21
WNDTOP = $22
WNDBTM = $23
CH = $24
CV = $25
GBASL = $26
GBASH = $27
BASL = $28
BASH = $29
H2 = $2C
V2 = $2D
MASK = $2E
COLOR = $30
INVFLG = $32
; More zero-page addresses
; we try not to conflict with anything DOS, MONITOR or BASIC related
;; Flying Routine Only
TURNING = $60
;SCREEN_X = $61 ; not used?
SCREEN_Y = $62
ANGLE = $63
HORIZ_SCALE_I = $64
HORIZ_SCALE_F = $65
SCALE_I = $64
SCALE_F = $65
FACTOR_I = $66
FACTOR_F = $67
DX_I = $68
DX_F = $69
SPACEX_I = $6A
SPACEX_F = $6B
CX_I = $6C
CX_F = $6D
DY_I = $6E
DY_F = $6F
SPACEY_I = $70
SPACEY_F = $71
CY_I = $72
CY_F = $73
TEMP_I = $74
TEMP_F = $75
DISTANCE_I = $76
DISTANCE_F = $77
SPACEZ_I = $78
SPACEZ_F = $79
DRAW_SPLASH = $7A
SPEED = $7B
SPLASH_COUNT = $7C
OVER_LAND = $7D
NUM1L = $7E
NUM1H = $7F
NUM2L = $80
NUM2H = $81
RESULT = $82 ; 83,84,85
NEGATE = $86 ; UNUSED?
LAST_SPACEX_I = $87
LAST_SPACEY_I = $88
LAST_MAP_COLOR = $89
COLOR_MASK = $8A
;; World Map Only
ODD = $7B
DIRECTION = $7C
REFRESH = $7D
ON_BIRD = $7E
MOVED = $7F
STEPS = $80
TFV_X = $81
TFV_Y = $82
NEWX = $83
NEWY = $84
MAP_X = $85
GROUND_COLOR = $86
LEVEL_OVER = $A0
JOYSTICK_ENABLED= $A1
FRAMEL = $A2
FRAMEH = $A3
WHICH_LOAD = $A4
MENU_RESULT = $A5
SOUND_STATUS = $A6
SOUND_DISABLED = $80
SOUND_IN_LC = $01 ; $01 sound effects in language card
SOUND_MOCKINGBOARD = $02 ; mockingboard detected
JS_BUTTON_STATE = $A7
COLOR1 = $E0
COLOR2 = $E1
MATCH = $E2
XX = $E3
YY = $E4
SHIPY = $E4
YADD = $E5
LOOP = $E6
;MEMPTRL = $E7
;MEMPTRH = $E8
NAMEL = $E9
NAMEH = $EA
NAMEX = $EB
CHAR = $EC
DISP_PAGE = $ED
DRAW_PAGE = $EE
FIRST = $F0
LASTKEY = $F1
PADDLE_STATUS = $F2
XPOS = $F3
YPOS = $F4
TEMP = $FA
RUN = $FA
TEMP2 = $FB
TEMPY = $FB
INL = $FC
INH = $FD
OUTL = $FE
OUTH = $FF
; read any file slot 6 version
; based on FASTLD6 and RTS copyright (c) Peter Ferrie 2011-2013,2018
; modified to assemble with ca65 -- vmw
; added code to patch it to run from current disk slot -- vmw
adrlo = $26 ; constant from boot prom
adrhi = $27 ; constant from boot prom
tmpsec = $3c ; constant from boot prom
reqsec = $3d ; constant from boot prom
sizelo = $44
sizehi = $45
secsize = $46
ldsizel = $70
ldsizeh = $71
namlo = $7b
namhi = $7c
step = $7d ; state for stepper motor
tmptrk = $7e ; temporary copy of current track
phase = $7f ; current phase for /seek