From 4bc7eb4014ac32558e1eef8d3a43a5f5a80207e2 Mon Sep 17 00:00:00 2001 From: memdmp Date: Wed, 15 Jan 2025 22:08:40 +0100 Subject: feat: unbind from frame rate --- src/main.rs | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 9855cdc..50320b7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,8 +12,7 @@ use sdl2::rect::Rect; use sdl2::render::Texture; use sdl2::surface::Surface; use std::ops::DerefMut; -use std::sync::Arc; -use std::time::Duration; +use std::time::{Duration, SystemTime}; pub fn main() { let sdl_context = sdl2::init().unwrap(); @@ -34,16 +33,15 @@ pub fn main() { let mut i = 0; // amount to incr sin_offset by per frame - // TODO: do not bind to framerate u silly bean - let sin_speed = 0.0025; - let mut sin_offset = 0.5; + let start_time = SystemTime::now(); + let movement_per_second = 0.5; 'running: loop { + let time = SystemTime::now() + .duration_since(start_time) + .expect("Time went back between frames"); + let time = f64::from(time.as_millis() as u32) / 1000.0; i = (i + 1) % 255; - if sin_offset > 1.0 { - sin_offset -= 1.0; - } - canvas.set_draw_color(Color::RGB(12, 12, 12)); canvas.clear(); @@ -73,7 +71,7 @@ pub fn main() { let f64_w = f64::from(w); let f64_h = f64::from(h); let sin_x = { - let mut sin_x = f64::from(x) + (sin_offset * f64_w); + let mut sin_x = f64::from(x) + ((time * movement_per_second) * f64_w); if sin_x > f64_w { sin_x = sin_x - f64_w; } @@ -91,7 +89,6 @@ pub fn main() { f[idx + 3] = if sin_y < y as usize { 255 } else { 0 }; } } - sin_offset += sin_speed; let sin_texture = Texture::from_surface(&sin_surface, &texture_creator).unwrap(); @@ -125,6 +122,6 @@ pub fn main() { } // The rest of the game loop goes here... canvas.present(); - ::std::thread::sleep(Duration::new(0, 1_000_000_000u32 / 120)); + ::std::thread::sleep(Duration::new(0, 1_000_000_000u32 / 12000)); } } -- cgit v1.2.3 From dcc9baa255438bb0502918c2c581bed5f9e77d09 Mon Sep 17 00:00:00 2001 From: memdmp Date: Wed, 15 Jan 2025 22:28:27 +0100 Subject: feat: render.rs --- src/main.rs | 84 ++++--------------------------------------------------------- 1 file changed, 5 insertions(+), 79 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 50320b7..29760d3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,18 +2,12 @@ extern crate sdl2; mod font; pub mod generated; +mod render; -use font::BakedFont; -use generated::fonts::{FONT_CHERRY_BOMB_ONE, FONT_GALMURI}; -use sdl2::event::Event; -use sdl2::keyboard::Keycode; -use sdl2::pixels::{Color, PixelFormatEnum}; -use sdl2::rect::Rect; -use sdl2::render::Texture; -use sdl2::surface::Surface; -use std::ops::DerefMut; use std::time::{Duration, SystemTime}; +use sdl2::{event::Event, keyboard::Keycode}; + pub fn main() { let sdl_context = sdl2::init().unwrap(); let video_subsystem = sdl_context.video().unwrap(); @@ -30,86 +24,17 @@ pub fn main() { canvas.clear(); canvas.present(); let mut event_pump = sdl_context.event_pump().unwrap(); - let mut i = 0; // amount to incr sin_offset by per frame let start_time = SystemTime::now(); - let movement_per_second = 0.5; 'running: loop { let time = SystemTime::now() .duration_since(start_time) .expect("Time went back between frames"); let time = f64::from(time.as_millis() as u32) / 1000.0; - i = (i + 1) % 255; - - canvas.set_draw_color(Color::RGB(12, 12, 12)); - canvas.clear(); - - let mut offset: f32 = 0.0; - for c in "UwU-Space".chars() { - let char = FONT_CHERRY_BOMB_ONE.get_char(c); - canvas - .copy( - &char - .to_texture(&texture_creator, Color::RGB(i, 64, 255 - i)) - .unwrap(), - None, - char.to_rect(offset as i32 + 16, 16), - ) - .unwrap(); - offset += char.advance_width; - } - - { - let mut sin_surface = Surface::new(512, 256, PixelFormatEnum::RGBA32).unwrap(); - - let w = sin_surface.width(); - let h = sin_surface.height(); - let f = &mut sin_surface.deref_mut().without_lock_mut().unwrap(); - for x in 0..w { - let f64_w = f64::from(w); - let f64_h = f64::from(h); - let sin_x = { - let mut sin_x = f64::from(x) + ((time * movement_per_second) * f64_w); - if sin_x > f64_w { - sin_x = sin_x - f64_w; - } - sin_x - }; - let sin_y = - ((f64::sin(sin_x * (3.141 * 2.0) / f64_w) + 1.0) * (f64_h / 2.0)).floor() as usize; - // let sin_idx = (sin_y * w as usize + x as usize) * 4; + render::render(&mut canvas, &texture_creator, time); - for y in 0..h { - let idx = (y * w + x) as usize * 4; - f[idx] = 122 - (x / 8) as u8; - f[idx + 1] = 255 - (x / 2) as u8; - f[idx + 2] = (x / 2) as u8; - f[idx + 3] = if sin_y < y as usize { 255 } else { 0 }; - } - } - - let sin_texture = Texture::from_surface(&sin_surface, &texture_creator).unwrap(); - - canvas - .copy(&sin_texture, None, Rect::new(0, 0, 512, 256)) - .unwrap(); - } - offset = 0.0; - for c in "Come to Cosin25 :3".chars() { - let char = FONT_GALMURI.get_char(c); - canvas - .copy( - &char - .to_texture(&texture_creator, Color::RGB(i, 64, 255 - i)) - .unwrap(), - None, - char.to_rect(offset as i32 + 18, 16 + 36), - ) - .unwrap(); - offset += char.advance_width; - } for event in event_pump.poll_iter() { match event { Event::Quit { .. } @@ -120,6 +45,7 @@ pub fn main() { _ => {} } } + // The rest of the game loop goes here... canvas.present(); ::std::thread::sleep(Duration::new(0, 1_000_000_000u32 / 12000)); -- cgit v1.2.3 From 4ea043a85c6258262e4db3f93959f6fd5a128cfb Mon Sep 17 00:00:00 2001 From: memdmp Date: Wed, 15 Jan 2025 22:29:22 +0100 Subject: feat: things --- src/main.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 29760d3..5a653cd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,8 +20,9 @@ pub fn main() { let mut canvas = window.clone().into_canvas().build().unwrap(); let texture_creator = canvas.texture_creator(); - // let uwu_font = font::UwUFont::new(&texture_creator); - canvas.clear(); + + render::render(&mut canvas, &texture_creator, 0.001); + canvas.present(); let mut event_pump = sdl_context.event_pump().unwrap(); -- cgit v1.2.3 From 677017e3381df6de0f7fe4c236d7185a500b033d Mon Sep 17 00:00:00 2001 From: memdmp Date: Thu, 16 Jan 2025 11:04:38 +0100 Subject: feat: oh god the horrors --- src/main.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 5a653cd..f9c52f9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,6 +2,7 @@ extern crate sdl2; mod font; pub mod generated; +mod interpolation; mod render; use std::time::{Duration, SystemTime}; -- cgit v1.2.3 From d8fe5abc51c708367bca57493d1fd38142581ef9 Mon Sep 17 00:00:00 2001 From: memdmp Date: Thu, 16 Jan 2025 12:21:04 +0100 Subject: feat: in theory this "works" --- src/main.rs | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index f9c52f9..c7a7606 100644 --- a/src/main.rs +++ b/src/main.rs @@ -27,7 +27,6 @@ pub fn main() { canvas.present(); let mut event_pump = sdl_context.event_pump().unwrap(); - // amount to incr sin_offset by per frame let start_time = SystemTime::now(); 'running: loop { let time = SystemTime::now() -- cgit v1.2.3