Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-07-30 01:29:08 +00:00
Code Issues Projects Releases Wiki Activity

fixed circle and disc geometry

Browse Source
This commit is contained in:
Irmen de Jong 2020-12-30 00:06:01 +01:00
parent c3b82f2cfa
commit df6698c98f
1 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
compiler/res/prog8lib/c64/graphics.p8
View File

@ -31,6 +31,7 @@ graphics {
txt.fill_screen(pixelcolor << 4 | bgcolor, 0) txt.fill_screen(pixelcolor << 4 | bgcolor, 0)
} }
; TODO optimize if horizontal or vertical:
sub line(uword @zp x1, ubyte @zp y1, uword @zp x2, ubyte @zp y2) { sub line(uword @zp x1, ubyte @zp y1, uword @zp x2, ubyte @zp y2) {
; Bresenham algorithm. ; Bresenham algorithm.
; This code special-cases various quadrant loops to allow simple ++ and -- operations. ; This code special-cases various quadrant loops to allow simple ++ and -- operations.
@ -108,42 +109,71 @@ graphics {
} }
} }
sub fillrect(uword x, uword y, uword width, uword height) {
; TODO cx16.GRAPH_draw_rect(x, y, width, height, 0, 1)
}
sub rect(uword x, uword y, uword width, uword height) {
; TODO cx16.GRAPH_draw_rect(x, y, width, height, 0, 0)
}
sub horizontal_line(uword x, ubyte y, uword length) {
if not length
return
internal_plotx = x
repeat length {
internal_plot(y)
internal_plotx++
}
}
sub vertical_line(uword x, ubyte y, ubyte height) {
if not height
return
internal_plotx = x
repeat height {
internal_plot(y)
y++
}
}
sub circle(uword xcenter, ubyte ycenter, ubyte radius) { sub circle(uword xcenter, ubyte ycenter, ubyte radius) {
; Midpoint algorithm ; Midpoint algorithm
if radius==0 if radius==0
return return
ubyte @zp ploty ubyte @zp ploty
ubyte @zp xx = radius
ubyte @zp yy = 0 ubyte @zp yy = 0
byte @zp decisionOver2 = 1-xx as byte word @zp decisionOver2 = (1 as word)-radius
while xx>=yy { while radius>=yy {
internal_plotx = xcenter + xx internal_plotx = xcenter + radius
ploty = ycenter + yy ploty = ycenter + yy
internal_plot(ploty) internal_plot(ploty)
internal_plotx = xcenter - xx internal_plotx = xcenter - radius
internal_plot(ploty) internal_plot(ploty)
internal_plotx = xcenter + xx internal_plotx = xcenter + radius
ploty = ycenter - yy ploty = ycenter - yy
internal_plot(ploty) internal_plot(ploty)
internal_plotx = xcenter - xx internal_plotx = xcenter - radius
internal_plot(ploty) internal_plot(ploty)
internal_plotx = xcenter + yy internal_plotx = xcenter + yy
ploty = ycenter + xx ploty = ycenter + radius
internal_plot(ploty) internal_plot(ploty)
internal_plotx = xcenter - yy internal_plotx = xcenter - yy
internal_plot(ploty) internal_plot(ploty)
internal_plotx = xcenter + yy internal_plotx = xcenter + yy
ploty = ycenter - xx ploty = ycenter - radius
internal_plot(ploty) internal_plot(ploty)
internal_plotx = xcenter - yy internal_plotx = xcenter - yy
internal_plot(ploty) internal_plot(ploty)
yy++ yy++
if decisionOver2<=0 if decisionOver2<=0
decisionOver2 += 2*yy+1 decisionOver2 += (yy as word)*2+1
else { else {
xx-- radius--
decisionOver2 += 2*(yy-xx)+1 decisionOver2 += (yy as word -radius)*2+1
} }
} }
} }
@ -152,34 +182,33 @@ graphics {
; Midpoint algorithm, filled ; Midpoint algorithm, filled
if radius==0 if radius==0
return return
ubyte @zp xx = radius
ubyte @zp yy = 0 ubyte @zp yy = 0
byte decisionOver2 = 1-xx as byte word decisionOver2 = (1 as word)-radius
while xx>=yy { while radius>=yy {
ubyte ycenter_plus_yy = ycenter + yy ubyte ycenter_plus_yy = ycenter + yy
ubyte ycenter_min_yy = ycenter - yy ubyte ycenter_min_yy = ycenter - yy
ubyte ycenter_plus_xx = ycenter + xx ubyte ycenter_plus_radius = ycenter + radius
ubyte ycenter_min_xx = ycenter - xx ubyte ycenter_min_radius = ycenter - radius
internal_plotx = xcenter-xx internal_plotx = xcenter-radius
repeat xx*2+1 { repeat radius*2+1 {
internal_plot(ycenter_plus_yy) internal_plot(ycenter_plus_yy)
internal_plot(ycenter_min_yy) internal_plot(ycenter_min_yy)
internal_plotx++ internal_plotx++
} }
internal_plotx = xcenter-yy internal_plotx = xcenter-yy
repeat yy*2+1 { repeat yy*2+1 {
internal_plot(ycenter_plus_xx) internal_plot(ycenter_plus_radius)
internal_plot(ycenter_min_xx) internal_plot(ycenter_min_radius)
internal_plotx++ internal_plotx++
} }
yy++ yy++
if decisionOver2<=0 if decisionOver2<=0
decisionOver2 += 2*yy+1 decisionOver2 += (yy as word)*2+1
else { else {
xx-- radius--
decisionOver2 += 2*(yy-xx)+1 decisionOver2 += (yy as word -radius)*2+1
} }
} }
} }