noteuclid/refraction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move multiplication out of flat-global vector conversion

Browse Source 
The conversion is necessarily linear so...
This commit is contained in:
numzero 2024-06-09 23:23:26 +03:00
parent 2b7ae9485b
commit f3288c7331
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/flat.rs
View File

@ -68,13 +68,13 @@ pub fn main() {
gc.stroke_color(Color::Rgba(0.0, 0.0, 0.0, 0.5)); gc.stroke_color(Color::Rgba(0.0, 0.0, 0.0, 0.5));
draw_loop(gc, itertools_num::linspace(0.0, 2.0 * PI, 32).skip(1).map(|φ| { draw_loop(gc, itertools_num::linspace(0.0, 2.0 * PI, 32).skip(1).map(|φ| {
let dir = Vec2::from_angle(φ) * obj.r; let dir = Vec2::from_angle(φ) * obj.r;
let dir = space.flat_to_global(pos, dir); let dir = space.flat_to_global(pos) * dir;
pos + dir pos + dir
})); }));
gc.stroke_color(Color::Rgba(0.0, 0.5, 1.0, 0.5)); gc.stroke_color(Color::Rgba(0.0, 0.5, 1.0, 0.5));
draw_loop(gc, itertools_num::linspace(0.0, 2.0 * PI, 32).skip(1).map(|φ| { draw_loop(gc, itertools_num::linspace(0.0, 2.0 * PI, 32).skip(1).map(|φ| {
let dir = Vec2::from_angle(φ) * obj.r; let dir = Vec2::from_angle(φ) * obj.r;
let dir = space.flat_to_global(pos, dir); let dir = space.flat_to_global(pos) * dir;
space.trace_step(Ray { pos, dir }).pos space.trace_step(Ray { pos, dir }).pos
})); }));
gc.stroke_color(Color::Rgba(0.5, 0.0, 1.0, 1.0)); gc.stroke_color(Color::Rgba(0.5, 0.0, 1.0, 1.0));
@ -82,7 +82,7 @@ pub fn main() {
let n = obj.r.floor(); let n = obj.r.floor();
let d = obj.r / n; let d = obj.r / n;
let dir = Vec2::from_angle(φ); let dir = Vec2::from_angle(φ);
let dir = space.flat_to_global(pos, dir) * d; let dir = space.flat_to_global(pos) * dir * d;
space.trace_iter(Ray { pos, dir }).nth(n as usize).unwrap().pos space.trace_iter(Ray { pos, dir }).nth(n as usize).unwrap().pos
})); }));
} }
@ -134,12 +134,12 @@ impl Space {
} }
} }
fn flat_to_global(&self, at: Vec2, v: Vec2) -> Vec2 { fn flat_to_global(&self, at: Vec2) -> Mat2 {
Mat2::from(self.rect.sqrt_at(at).inverse()) * v Mat2::from(self.rect.sqrt_at(at).inverse())
} }
fn global_to_flat(&self, at: Vec2, v: Vec2) -> Vec2 { fn global_to_flat(&self, at: Vec2) -> Mat2 {
Mat2::from(self.rect.sqrt_at(at)) * v Mat2::from(self.rect.sqrt_at(at))
} }
/// Выполняет один шаг трассировки. Работает в любой части пространства, но вне Boundary доступны более эффективные методы. /// Выполняет один шаг трассировки. Работает в любой части пространства, но вне Boundary доступны более эффективные методы.