shadowcat/fractal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix resizing snapshot stretch bug

Browse Source
This commit is contained in:
shadow cat
2025-03-31 23:27:20 -04:00
parent d859412e88
commit bd0c8690b4
9 changed files with 22 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/client/render/output/data.rs
View File

@@ -1,13 +1,12 @@
use nalgebra::Vector2;
use super::{Camera, CHUNK_WIDTH};
use super::Camera;
#[repr(C, align(8))]
#[derive(Clone, Copy, Default, PartialEq)]
pub struct WindowView {
pub stretch: Vector2<f32>,
pub pos: Vector2<f32>,
pub rendered_chunks: Vector2<u32>,
pub snapshot: u32,
}
@@ -15,40 +14,16 @@ unsafe impl bytemuck::Pod for WindowView {}
unsafe impl bytemuck::Zeroable for WindowView {}
impl WindowView {
pub fn from_camera_size(
camera: &Camera,
ss_cam: Option<&Camera>,
size: &Vector2<u32>,
snapshot: bool,
) -> Self {
// TODO: most of this is useless and just preparation for chunked textures if I add them
let visible_chunks = (size * 2 / CHUNK_WIDTH).add_scalar(1);
let rendered_chunks = Vector2::new(
visible_chunks.x.next_power_of_two(),
visible_chunks.y.next_power_of_two(),
);
// let adj_zoom = camera.zoom.level() - CHUNK_POW as i32;
// let pos = camera.pos.zip_map(&rendered_chunks, |pos, rc| {
// let p = (pos << adj_zoom).with_lens(1, 1);
// let (pw, pd) = p.split_whole_dec();
// let mut chunk = (pw.parts().first().unwrap_or(&0) & (rc - 1)) as f32;
// if pw.is_neg() {
// chunk = rc as f32 - chunk;
// }
// let dec = f32::from(pd);
// chunk + dec
// });
//
// let stretch = size.cast::<f32>() * camera.zoom.rel_zoom() / (CHUNK_WIDTH as f32);
pub fn from_camera(camera: &Camera, ss_cam: Option<&Camera>, snapshot: bool) -> Self {
let (pos, stretch) = if let Some(ss_cam) = ss_cam {
let aspect = camera.inv_stretch() * 2.0;
let s = camera.zoom.mult() * ss_cam.zoom.inv_mult();
let s_mult = camera.stretch().component_div(&ss_cam.stretch());
let aspect = camera.inv_stretch().component_mul(&s_mult) * 2.0;
let s = s_mult * f32::from(camera.zoom.mult() * ss_cam.zoom.inv_mult());
(
((&camera.pos - &ss_cam.pos) * ss_cam.zoom.inv_mult().clone())
.map(f32::from)
.component_mul(&aspect),
Vector2::from_element(f32::from(s)),
s,
)
} else {
(Vector2::default(), Vector2::default())
@@ -57,7 +32,6 @@ impl WindowView {
Self {
pos,
stretch,
rendered_chunks,
snapshot: snapshot as u32,
}
}