Skip to content

feat(chaosymmetry): implemented adjustable multiplier for zooming and panning commands #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ElkeVSant wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(chaosymmetry): implemented adjustable multiplier for zooming and panning commands #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 66 additions & 30 deletions rust/chaosymmetry/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ mod symmetry;
use std::fs::File;
use std::io::BufWriter;
use std::sync::Arc;
use std::time::Instant;
use std::{fs, thread};
use std::time::{Duration, Instant, SystemTime};
use std::{default, fs, thread};

use chrono::Local;
use clap::Parser;
Expand Down Expand Up @@ -86,14 +86,30 @@ fn main() {
window: None,
pixels: None,
render: renderer,
mult: Mult::default(),
};
event_loop.run_app(&mut app).unwrap();
}

struct Mult {
value: String,
valid_since: SystemTime,
}

impl Default for Mult {
fn default() -> Self {
Mult {
value: "1".to_string(),
valid_since: SystemTime::UNIX_EPOCH,
}
}
}

struct App {
window: Option<Arc<Window>>,
pixels: Option<Pixels<'static>>,
render: Renderer,
mult: Mult,
Copy link
Copy Markdown
Owner

@OliverHofkens OliverHofkens May 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aangezien dit in de App zit zou ik de struct iets generieker noemen, bv:

InputState {
    buffer: String,
    last_input: Instant
}

Dan kunnen we dat nog voor andere zaken ook gebruiken, terwijl Mult impliceert dat er maar 1 functie is voor inputs.

}

impl ApplicationHandler for App {
Expand Down Expand Up @@ -179,36 +195,56 @@ impl ApplicationHandler for App {
is_synthetic: false,
..
} => {
if event.logical_key == Key::Character("+".into()) && event.state.is_pressed() {
self.render.scale *= ZOOM_FACTOR;
} else if event.logical_key == Key::Character("-".into())
&& event.state.is_pressed()
if event.state.is_pressed()
// Since "+" requires pressing "Shift", this would otherwise reset the multiplier to "1" before zooming in
&& event.logical_key != Key::Named(winit::keyboard::NamedKey::Shift)
Copy link
Copy Markdown
Owner

@OliverHofkens OliverHofkens May 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dit kunnen we denk ik nog wel wat refactoren:

En aangezien de is_pressed() nu buiten staat kunnen we hier wel overwegen om een grote match statement te maken. Da gaat properder zijn en geeft veel opties door de flexibiliteit van de syntax in match statements.

{
self.render.scale /= ZOOM_FACTOR;
} else if event.logical_key == Key::Character("s".into())
&& event.state.is_pressed()
{
let data = self.pixels.as_ref().unwrap().frame();
if self.mult.valid_since.elapsed().unwrap() > Duration::from_secs(5) {
self.mult = Default::default()
}
if Key::Character("0".into()) <= event.logical_key
&& event.logical_key <= Key::Character("9".into())
{
if self.mult.valid_since.elapsed().unwrap() <= Duration::from_secs(5) {
self.mult.value.push_str(&event.text.unwrap().to_string());
} else {
self.mult.value = event.text.unwrap().to_string();
}
self.mult.valid_since = SystemTime::now();
} else {
if event.logical_key == Key::Character("s".into()) {
let data = self.pixels.as_ref().unwrap().frame();

let filename = format!("{}.png", Local::now().to_rfc3339());
let path = Path::new(&filename);
save_png(data, self.render.win_width, path);
} else if event.logical_key == Key::Named(winit::keyboard::NamedKey::ArrowUp)
&& event.state.is_pressed()
{
self.render.position.vertical -= PAN_STEP;
} else if event.logical_key == Key::Named(winit::keyboard::NamedKey::ArrowDown)
&& event.state.is_pressed()
{
self.render.position.vertical += PAN_STEP;
} else if event.logical_key == Key::Named(winit::keyboard::NamedKey::ArrowRight)
&& event.state.is_pressed()
{
self.render.position.horizontal += PAN_STEP;
} else if event.logical_key == Key::Named(winit::keyboard::NamedKey::ArrowLeft)
&& event.state.is_pressed()
{
self.render.position.horizontal -= PAN_STEP;
let filename = format!("{}.png", Local::now().to_rfc3339());
let path = Path::new(&filename);
save_png(data, self.render.win_width, path);
} else if event.logical_key == Key::Character("+".into()) {
self.render.scale *= ZOOM_FACTOR.powf(self.mult.value.parse().unwrap());
} else if event.logical_key == Key::Character("-".into()) {
self.render.scale /= ZOOM_FACTOR.powf(self.mult.value.parse().unwrap());
} else if event.logical_key
== Key::Named(winit::keyboard::NamedKey::ArrowUp)
{
self.render.position.vertical -=
self.mult.value.parse::<isize>().unwrap() * PAN_STEP;
} else if event.logical_key
== Key::Named(winit::keyboard::NamedKey::ArrowDown)
{
self.render.position.vertical +=
self.mult.value.parse::<isize>().unwrap() * PAN_STEP;
} else if event.logical_key
== Key::Named(winit::keyboard::NamedKey::ArrowRight)
{
self.render.position.horizontal +=
self.mult.value.parse::<isize>().unwrap() * PAN_STEP;
} else if event.logical_key
== Key::Named(winit::keyboard::NamedKey::ArrowLeft)
{
self.render.position.horizontal -=
self.mult.value.parse::<isize>().unwrap() * PAN_STEP;
}
self.mult = Default::default();
}
}
}
_ => (),
Expand Down