stickynotememo/wolf_renderer
1
0
Fork 0
mirror of https://github.com/stickynotememo/wolf_renderer.git synced 2026-07-30 06:46:03 +10:00
Code Issues Packages Projects Releases Wiki Activity

Draw lines

Browse Source 
Additionally convert Point2D to use f64
This commit is contained in:
stickynotememo
2026-01-09 14:32:22 +11:00
parent 0850bc1032
commit 2f5865555b
4 changed files with 73 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/points.rs
+23 -15
View File
@@ -1,7 +1,7 @@
use crate::consts::*;
#[derive(Debug)]
pub struct Point2D(pub u32, pub u32);
pub struct Point2D(pub f64, pub f64);
impl Point2D {
pub fn to_canvas_coordinates(&self) -> Point3D {
todo!();
@@ -10,9 +10,10 @@ impl Point2D {
pub fn distance(self, p2: &Point2D) -> f64 {
let p1 = self;
// Pythagorean formula
// TODO: use hypot function
f64::sqrt(
(u32::pow(p2.0.max(p1.0) - p1.0.min(p2.0), 2)
+ u32::pow(p2.1.max(p1.1) - p1.1.min(p2.1), 2)) as f64,
(f64::powf(p2.0.max(p1.0) - p1.0.min(p2.0), 2.0)
+ f64::powf(p2.1.max(p1.1) - p1.1.min(p2.1), 2.0)) as f64,
)
}
}
@@ -23,25 +24,32 @@ impl Point3D {
pub fn to_screen_coordinates(&self) -> Point2D {
let Point3D(x, y, z) = *self;
// Normalize to the interval [0, 1]
let x = (x / f64::MAX + 1.0) / 2.0;
let y = (-y / f64::MAX + 1.0) / 2.0;
let z = (z / f64::MAX + 1.0) / 2.0;
assert!(x <= 1.0 && y <= 1.0 && z <= 1.0);
if self.2 == 0.0 {
// Normalize to the interval [0, 1]
let x = (x / f64::MAX + 1.0) / 2.0;
let y = (-y / f64::MAX + 1.0) / 2.0;
let z = (z / f64::MAX + 1.0) / 2.0;
assert!(x <= 1.0 && y <= 1.0 && z <= 1.0);
Point2D(
(x * (SCREEN_WIDTH - 1) as f64) as u32, // Scale to the interval [0, SCREEN_WIDTH)
(y * (SCREEN_HEIGHT - 1) as f64) as u32, // Scale to the interval [0, SCREEN_HEIGHT)
x * (SCREEN_WIDTH - 1) as f64, // Scale to the interval [0, SCREEN_WIDTH)
y * (SCREEN_HEIGHT - 1) as f64, // Scale to the interval [0, SCREEN_HEIGHT)
)
} else {
let x = x / z;
let y = y / z;
// Normalize to the interval [0, 1]
let x = (x / f64::MAX + 1.0) / 2.0;
let y = (-y / f64::MAX + 1.0) / 2.0;
let z = (z / f64::MAX + 1.0) / 2.0;
assert!(x <= 1.0 && y <= 1.0 && z <= 1.0);
Point2D(
(x * (SCREEN_WIDTH - 1) as f64) as u32,
(y * (SCREEN_HEIGHT - 1) as f64) as u32,
x * (SCREEN_WIDTH - 1) as f64,
y * (SCREEN_HEIGHT - 1) as f64,
)
}
}
@@ -50,7 +58,7 @@ impl Point3D {
let p1 = self;
// Pythagorean formula
f64::sqrt(
f64::powf(p2.0 - p1.0, 2.0) + f64::powf(p2.1 - p1.1, 2.0) + f64::powf(p2.2 - p1.2, 2.0),
f64::powf(p2.0 - p1.0, 2.0) + f64::powf(p2.1 - p1.1, 2.0) + f64::powf(p2.2 - p1.2, 2.0) // Fix to use max and min
)
}
}