From 4ed42b3de0a143709735e39d302b87123f7978fc Mon Sep 17 00:00:00 2001 From: lisk77 Date: Mon, 17 Nov 2025 17:32:21 +0100 Subject: [PATCH 1/5] fix(renderer): deduplicate texture atlas creation --- crates/comet_renderer/src/renderer2d.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/comet_renderer/src/renderer2d.rs b/crates/comet_renderer/src/renderer2d.rs index 69b887b..d45c3de 100644 --- a/crates/comet_renderer/src/renderer2d.rs +++ b/crates/comet_renderer/src/renderer2d.rs @@ -84,7 +84,6 @@ impl<'a> Renderer2D<'a> { paths.push(texture_path.clone() + path.unwrap().file_name().to_str().unwrap()); } - self.resource_manager.create_texture_atlas(paths.clone()); self.init_atlas_by_paths(paths); } From 8aec280447690d7d6aaf71c1bd49c29f5e888249 Mon Sep 17 00:00:00 2001 From: lisk77 Date: Mon, 17 Nov 2025 17:58:48 +0100 Subject: [PATCH 2/5] refactor(renderer): texture look up does not need a String as key anymore --- crates/comet_ecs/src/component.rs | 6 +++--- crates/comet_renderer/src/renderer2d.rs | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/comet_ecs/src/component.rs b/crates/comet_ecs/src/component.rs index 53e958f..ab17c9b 100755 --- a/crates/comet_ecs/src/component.rs +++ b/crates/comet_ecs/src/component.rs @@ -131,7 +131,7 @@ pub trait Collider { pub trait Render { fn is_visible(&self) -> bool; fn set_visibility(&mut self, is_visible: bool); - fn get_texture(&self) -> String; + fn get_texture(&self) -> &str; fn set_texture(&mut self, texture: &'static str); } @@ -320,8 +320,8 @@ impl Render for Render2D { self.is_visible = is_visible; } - fn get_texture(&self) -> String { - self.texture_name.parse().unwrap() + fn get_texture(&self) -> &str { + self.texture_name } /// Use the actual file name of the texture instead of the path diff --git a/crates/comet_renderer/src/renderer2d.rs b/crates/comet_renderer/src/renderer2d.rs index d45c3de..3279603 100644 --- a/crates/comet_renderer/src/renderer2d.rs +++ b/crates/comet_renderer/src/renderer2d.rs @@ -555,19 +555,19 @@ impl<'a> Renderer2D<'a> { )) } - fn get_texture_region(&self, texture_path: String) -> Option<&TextureRegion> { + fn get_texture_region(&self, texture_path: &str) -> Option<&TextureRegion> { if !self .resource_manager .texture_atlas() .textures() - .contains_key(&texture_path) + .contains_key(texture_path) { - error!("Texture {} not found in atlas", &texture_path); + error!("Texture {} not found in atlas", texture_path); } self.resource_manager .texture_atlas() .textures() - .get(&texture_path) + .get(texture_path) } fn get_glyph_region(&self, glyph: char, font: String) -> &TextureRegion { @@ -772,7 +772,7 @@ impl<'a> Renderer2D<'a> { let rotation_angle = transform_component.rotation().to_radians(); let region = - match self.get_texture_region(renderer_component.get_texture().to_string()) { + match self.get_texture_region(renderer_component.get_texture()) { Some(r) => r, None => continue, }; From 90e514f6425558ca2b252126c8d78f126d179644 Mon Sep 17 00:00:00 2001 From: lisk77 Date: Mon, 17 Nov 2025 18:20:22 +0100 Subject: [PATCH 3/5] fix(log): fatal log message now exits the system and never returns --- crates/comet_log/src/lib.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/comet_log/src/lib.rs b/crates/comet_log/src/lib.rs index 5330f81..2d42d75 100644 --- a/crates/comet_log/src/lib.rs +++ b/crates/comet_log/src/lib.rs @@ -57,7 +57,7 @@ macro_rules! error { #[macro_export] macro_rules! fatal { - ($fmt:expr $(, $args:expr)*) => { + ($fmt:expr $(, $args:expr)*) => {{ eprintln!( "{} [{}::{}] [{}] : {}", chrono::Local::now().format("%Y-%m-%d %H:%M:%S"), @@ -66,7 +66,8 @@ macro_rules! fatal { "\x1b[41mFATAL\x1b[0m", format!($fmt $(, $args)*) ); - }; + std::process::exit(1) + }}; } #[macro_export] From 1a463770a33a9b33feff9fac6012805353c1161b Mon Sep 17 00:00:00 2001 From: lisk77 Date: Mon, 17 Nov 2025 22:29:44 +0100 Subject: [PATCH 4/5] fix(app): changed mainloop to mitigate no response from application --- crates/comet_app/src/app.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/crates/comet_app/src/app.rs b/crates/comet_app/src/app.rs index 31112b2..083aa48 100755 --- a/crates/comet_app/src/app.rs +++ b/crates/comet_app/src/app.rs @@ -370,15 +370,9 @@ impl App { WindowEvent::CloseRequested {} => elwt.exit(), WindowEvent::Focused(focused) => { window_focused = *focused; - if window_focused && !window_occluded { - window.request_redraw(); - } } WindowEvent::Occluded(occluded) => { window_occluded = *occluded; - if window_focused && !window_occluded { - window.request_redraw(); - } } WindowEvent::Resized(physical_size) => { renderer.resize(*physical_size); @@ -410,7 +404,6 @@ impl App { _ => {} }, Event::AboutToWait => { - elwt.set_control_flow(ControlFlow::Poll); self.delta_time = renderer.update(); if self.dt() != f32::INFINITY { @@ -425,6 +418,14 @@ impl App { if window_focused && !window_occluded { window.request_redraw(); } + + if self.dt().is_finite() { + let next_frame = std::time::Instant::now() + + std::time::Duration::from_secs_f32(self.update_timer); + elwt.set_control_flow(ControlFlow::WaitUntil(next_frame)); + } else { + elwt.set_control_flow(ControlFlow::Wait); + } } _ => {} } From a01a52766dfde65259c2cf7fac36fa71e733be79 Mon Sep 17 00:00:00 2001 From: lisk77 Date: Mon, 17 Nov 2025 22:31:36 +0100 Subject: [PATCH 5/5] refactor(renderer): change world corner transformation vecs and text generating function signature --- crates/comet_renderer/src/renderer2d.rs | 86 +++++++++++++++++-------- 1 file changed, 59 insertions(+), 27 deletions(-) diff --git a/crates/comet_renderer/src/renderer2d.rs b/crates/comet_renderer/src/renderer2d.rs index 3279603..1601295 100644 --- a/crates/comet_renderer/src/renderer2d.rs +++ b/crates/comet_renderer/src/renderer2d.rs @@ -562,6 +562,7 @@ impl<'a> Renderer2D<'a> { .textures() .contains_key(texture_path) { + #[cfg(comet_debug)] error!("Texture {} not found in atlas", texture_path); } self.resource_manager @@ -570,12 +571,13 @@ impl<'a> Renderer2D<'a> { .get(texture_path) } - fn get_glyph_region(&self, glyph: char, font: String) -> &TextureRegion { + fn get_glyph_region(&self, glyph: char, font: &str) -> &TextureRegion { let key = format!("{}::{}", font, glyph); match self.resource_manager.font_atlas().textures().get(&key) { Some(region) => region, None => { + #[cfg(comet_debug)] warn!( "Missing glyph for character '{}' in font '{}', using fallback.", glyph, font @@ -586,7 +588,7 @@ impl<'a> Renderer2D<'a> { .textures() .get(&fallback_key) .unwrap_or_else(|| { - panic!( + fatal!( "No fallback glyph available (space also missing) for font '{}'", font ) @@ -595,7 +597,7 @@ impl<'a> Renderer2D<'a> { } } - pub fn precompute_text_bounds(&self, text: String, font: String, size: f32) -> v2 { + pub fn precompute_text_bounds(&self, text: &str, font: &str, size: f32) -> v2 { let mut bounds = v2::ZERO; let _ = @@ -606,8 +608,8 @@ impl<'a> Renderer2D<'a> { pub fn add_text_to_buffers( &self, - text: String, - font: String, + text: &str, + font: &str, size: f32, position: comet_math::v2, color: wgpu::Color, @@ -672,7 +674,7 @@ impl<'a> Renderer2D<'a> { for line in lines { for c in line.chars() { - let region = self.get_glyph_region(c, font.clone()); + let region = self.get_glyph_region(c, font); let (dim_x, dim_y) = region.dimensions(); let w = (dim_x as f32 / config.width as f32) * scale_factor; @@ -794,25 +796,54 @@ impl<'a> Renderer2D<'a> { let cos_angle = rotation_angle.cos(); let sin_angle = rotation_angle.sin(); - let rotated_world_corners: Vec<(f32, f32)> = world_corners - .iter() - .map(|(x, y)| { - ( - x * cos_angle - y * sin_angle + world_position.x(), - x * sin_angle + y * cos_angle + world_position.y(), - ) - }) - .collect(); + let rotated_world_corners = [ + ( + world_corners[0].0 * cos_angle - world_corners[0].1 * sin_angle + + world_position.x(), + world_corners[0].0 * sin_angle + world_corners[0].1 * cos_angle + + world_position.y(), + ), + ( + world_corners[1].0 * cos_angle - world_corners[1].1 * sin_angle + + world_position.x(), + world_corners[1].0 * sin_angle + world_corners[1].1 * cos_angle + + world_position.y(), + ), + ( + world_corners[2].0 * cos_angle - world_corners[2].1 * sin_angle + + world_position.x(), + world_corners[2].0 * sin_angle + world_corners[2].1 * cos_angle + + world_position.y(), + ), + ( + world_corners[3].0 * cos_angle - world_corners[3].1 * sin_angle + + world_position.x(), + world_corners[3].0 * sin_angle + world_corners[3].1 * cos_angle + + world_position.y(), + ), + ]; - let snapped_screen_corners: Vec<(f32, f32)> = rotated_world_corners - .iter() - .map(|(x, y)| { - ( - x.round() / self.render_context.config().width as f32, - y.round() / self.render_context.config().height as f32, - ) - }) - .collect(); + let inv_width = 1.0 / self.render_context.config().width as f32; + let inv_height = 1.0 / self.render_context.config().height as f32; + + let snapped_screen_corners = [ + ( + rotated_world_corners[0].0.round() * inv_width, + rotated_world_corners[0].1.round() * inv_height, + ), + ( + rotated_world_corners[1].0.round() * inv_width, + rotated_world_corners[1].1.round() * inv_height, + ), + ( + rotated_world_corners[2].0.round() * inv_width, + rotated_world_corners[2].1.round() * inv_height, + ), + ( + rotated_world_corners[3].0.round() * inv_width, + rotated_world_corners[3].1.round() * inv_height, + ), + ]; vertex_buffer.extend_from_slice(&[ Vertex::new( @@ -867,16 +898,16 @@ impl<'a> Renderer2D<'a> { continue; } - let font = text_component.font().to_string(); + let font = text_component.font(); let size = text_component.font_size(); let color = text_component.color().to_wgpu(); - let content = text_component.content().to_string(); + let content = text_component.content(); let mut bounds = comet_math::v2::ZERO; let (vertices, indices) = self.add_text_to_buffers( content, - font.clone(), + font, size, position, color, @@ -968,6 +999,7 @@ impl<'a> Renderer2D<'a> { } if resources.get_bind_group_layout("Font").is_none() { + #[cfg(comet_debug)] debug!("Font pass not initialized yet; skipping Font camera bind group setup."); } }