From 86686727231a7d7b3650141fa3ad5c2674547148 Mon Sep 17 00:00:00 2001 From: Micha White Date: Thu, 20 Oct 2022 08:55:35 -0400 Subject: Move the event loop into the renderer --- examples/black.rs | 8 ++++---- examples/bmp.rs | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'examples') diff --git a/examples/black.rs b/examples/black.rs index 291fafb..c66b080 100644 --- a/examples/black.rs +++ b/examples/black.rs @@ -1,7 +1,8 @@ #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] use alligator_render::{RenderWindowConfig, Renderer}; -use winit::event_loop::EventLoop; + +fn update(_renderer: &mut Renderer) {} fn main() { let start = std::time::Instant::now(); @@ -13,9 +14,8 @@ fn main() { ..Default::default() }; - let event_loop = EventLoop::new(); - let renderer = Renderer::new(&config, &event_loop).unwrap(); + let renderer = Renderer::new(&config).unwrap(); println!("Startup time: {:?}", start.elapsed()); - renderer.run(event_loop); + renderer.run(&update); } diff --git a/examples/bmp.rs b/examples/bmp.rs index 9db50d1..6c8774c 100644 --- a/examples/bmp.rs +++ b/examples/bmp.rs @@ -3,7 +3,11 @@ use std::num::NonZeroU32; use alligator_render::{ImageFormat, Instance, RenderWindowConfig, Renderer}; -use winit::event_loop::EventLoop; + +fn update(renderer: &mut Renderer) { + let camera = renderer.camera_mut(); + camera.set_rotation(camera.rotation() + 0.01); +} fn main() { // configure the render window @@ -17,8 +21,7 @@ fn main() { ..Default::default() }; - let event_loop = EventLoop::new(); - let mut renderer = Renderer::new(&config, &event_loop).unwrap(); + let mut renderer = Renderer::new(&config).unwrap(); // render the alligator let gator = include_bytes!("res/gator.ff"); @@ -51,7 +54,6 @@ fn main() { let icon_x = renderer.textures().texture_x(icon_id).unwrap(); let icon_y = renderer.textures().texture_y(icon_id).unwrap(); - // TODO we can make a helper function that makes a square to fit a texture renderer.instances_mut().push_instance(Instance { position: [0.5, 0.5], size: [0.75; 2], @@ -81,7 +83,5 @@ fn main() { ..Default::default() }); - renderer.camera_mut().set_rotation(0.1); - - renderer.run(event_loop); + renderer.run(&update); } -- cgit v1.2.3