dranke/microw8
1
0
Fork 0
mirror of https://github.com/exoticorn/microw8.git synced 2026-01-20 19:26:43 +01:00
Code Issues Projects Releases Wiki Activity

further improve line drawing, start/end pixels still buggy

Browse Source
This commit is contained in:
Dennis Ranke
2021-12-11 00:04:58 +01:00
parent 940d6a1957
commit 88182f94ee
1 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
examples/curlywas/line.cwa
View File

@@ -16,13 +16,13 @@ fn line(x1: f32, y1: f32, x2: f32, y2: f32, col: i32) {
y1 = y2; y1 = y2;
y2 = swapTmp; y2 = swapTmp;
} }
if x1 < 0.5 & x2 >= 0.5 { if x1 < 0 as f32 & x2 >= 0 as f32 {
y1 = y1 + (y2 - y1) * (0.5 - x1) / (x2 - x1); y1 = y1 + (y2 - y1) * -x1 / (x2 - x1);
x1 = 0.5; x1 = 0 as f32;
} }
if x1 < 319.5 & x2 >= 319.5 { if x1 < 320 as f32 & x2 >= 320 as f32 {
y2 = y2 + (y2 - y1) * (319.5 - x2) / (x2 - x1); y2 = y2 + (y2 - y1) * (320 as f32 - x2) / (x2 - x1);
x2 = 319.5; x2 = 320 as f32;
} }
if y1 > y2 { if y1 > y2 {
@@ -33,41 +33,69 @@ fn line(x1: f32, y1: f32, x2: f32, y2: f32, col: i32) {
y1 = y2; y1 = y2;
y2 = swapTmp; y2 = swapTmp;
} }
if y1 < 0.5 & y2 >= 0.5 { if y1 < 0 as f32 & y2 >= 0 as f32 {
x1 = x1 + (x2 - x1) * (0.5 - y1) / (y2 - y1); x1 = x1 + (x2 - x1) * -y1 / (y2 - y1);
y1 = 0.5; y1 = 0.0;
} }
if y1 < 239.5 & y2 >= 239.5 { if y1 < 240 as f32 & y2 >= 240 as f32 {
x2 = x2 + (x2 - x1) * (239.5 - y2) / (y2 - y1); x2 = x2 + (x2 - x1) * (240 as f32 - y2) / (y2 - y1);
y2 = 239.5; y2 = 240 as f32;
} }
let dx = x2 - x1; let dx = x2 - x1;
let dy = y2 - y1; let dy = y2 - y1;
let steps: i32; let max_axis: f32;
let p: f32;
if abs(dx) >= dy { if abs(dx) >= dy {
dy = dy / abs(dx); max_axis = dx;
steps = abs(dx) as i32; p = x1;
dx = select(dx > 0 as f32, 1 as f32, -1 as f32);
} else { } else {
dx = dx / dy; max_axis = dy;
steps = dy as i32; p = y1;
dy = 1 as f32;
} }
let steps = floor(p + max_axis) as i32 - floor(p) as i32;
p = floor(p) + 0.5 - p;
if max_axis < 0 as f32 {
steps = -steps;
p = 1 as f32 - p;
max_axis = -max_axis;
}
dx = dx / max_axis;
dy = dy / max_axis;
let f = min(max_axis, max(0 as f32, p));
setPixel((x1 + f * dx) as i32, (y1 + f * dy) as i32, col);
if !steps {
return;
}
x1 = x1 + (1 as f32 + p) * dx;
y1 = y1 + (1 as f32 + p) * dy;
p = p + steps as f32;
loop pixels { loop pixels {
if steps := steps - 1 {
setPixel(x1 as i32, y1 as i32, col); setPixel(x1 as i32, y1 as i32, col);
x1 = x1 + dx; x1 = x1 + dx;
y1 = y1 + dy; y1 = y1 + dy;
branch_if (steps := steps - 1) >= 0: pixels; branch pixels;
} }
}
f = min(max_axis, p) - p;
setPixel((x1 + f * dx) as i32, (y1 + f * dy) as i32, col);
} }
export fn upd() { export fn upd() {
cls(0); cls(0);
//line(0.0, 4.0, 7.0, -2.0, 15);
//return;
let i: i32; let i: i32;
loop lines { loop lines {
let angle = i as f32 * (3.1415 / 25.0) + time() * 0.1; let angle = i as f32 * (3.1415 / 25.0) + time() * 0.01;
line(160.0, 120.0, 160.0 + sin(angle) * 200.0, 120.0 + cos(angle) * 200.0, 47); line(160.0, 120.0, 160.0 + sin(angle) * 200.0, 120.0 + cos(angle) * 200.0, 47);
branch_if (i := i + 1) < 50: lines; branch_if (i := i + 1) < 50: lines;
} }