lisk77/comet
1
0
Fork 0
mirror of https://github.com/lisk77/comet.git synced 2025-12-12 09:08:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(renderer): change world corner transformation vecs and text generating function signature

Browse source
This commit is contained in:
lisk77 2025-11-17 22:31:36 +01:00
parent 1a463770a3
commit a01a52766d
1 changed files with 59 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

86
crates/comet_renderer/src/renderer2d.rs
View file

@ -562,6 +562,7 @@ impl<'a> Renderer2D<'a> {
.textures() .textures()
.contains_key(texture_path) .contains_key(texture_path)
{ {
#[cfg(comet_debug)]
error!("Texture {} not found in atlas", texture_path); error!("Texture {} not found in atlas", texture_path);
} }
self.resource_manager self.resource_manager
@ -570,12 +571,13 @@ impl<'a> Renderer2D<'a> {
.get(texture_path) .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); let key = format!("{}::{}", font, glyph);
match self.resource_manager.font_atlas().textures().get(&key) { match self.resource_manager.font_atlas().textures().get(&key) {
Some(region) => region, Some(region) => region,
None => { None => {
#[cfg(comet_debug)]
warn!( warn!(
"Missing glyph for character '{}' in font '{}', using fallback.", "Missing glyph for character '{}' in font '{}', using fallback.",
glyph, font glyph, font
@ -586,7 +588,7 @@ impl<'a> Renderer2D<'a> {
.textures() .textures()
.get(&fallback_key) .get(&fallback_key)
.unwrap_or_else(|| { .unwrap_or_else(|| {
panic!( fatal!(
"No fallback glyph available (space also missing) for font '{}'", "No fallback glyph available (space also missing) for font '{}'",
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 mut bounds = v2::ZERO;
let _ = let _ =
@ -606,8 +608,8 @@ impl<'a> Renderer2D<'a> {
pub fn add_text_to_buffers( pub fn add_text_to_buffers(
&self, &self,
text: String, text: &str,
font: String, font: &str,
size: f32, size: f32,
position: comet_math::v2, position: comet_math::v2,
color: wgpu::Color, color: wgpu::Color,
@ -672,7 +674,7 @@ impl<'a> Renderer2D<'a> {
for line in lines { for line in lines {
for c in line.chars() { 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 (dim_x, dim_y) = region.dimensions();
let w = (dim_x as f32 / config.width as f32) * scale_factor; 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 cos_angle = rotation_angle.cos();
let sin_angle = rotation_angle.sin(); let sin_angle = rotation_angle.sin();
let rotated_world_corners: Vec<(f32, f32)> = world_corners let rotated_world_corners = [
.iter() (
.map(|(x, y)| { world_corners[0].0 * cos_angle - world_corners[0].1 * sin_angle
( + world_position.x(),
x * cos_angle - y * sin_angle + world_position.x(), world_corners[0].0 * sin_angle + world_corners[0].1 * cos_angle
x * sin_angle + y * cos_angle + world_position.y(), + world_position.y(),
) ),
}) (
.collect(); 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 let inv_width = 1.0 / self.render_context.config().width as f32;
.iter() let inv_height = 1.0 / self.render_context.config().height as f32;
.map(|(x, y)| {
( let snapped_screen_corners = [
x.round() / self.render_context.config().width as f32, (
y.round() / self.render_context.config().height as f32, rotated_world_corners[0].0.round() * inv_width,
) rotated_world_corners[0].1.round() * inv_height,
}) ),
.collect(); (
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_buffer.extend_from_slice(&[
Vertex::new( Vertex::new(
@ -867,16 +898,16 @@ impl<'a> Renderer2D<'a> {
continue; continue;
} }
let font = text_component.font().to_string(); let font = text_component.font();
let size = text_component.font_size(); let size = text_component.font_size();
let color = text_component.color().to_wgpu(); 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 mut bounds = comet_math::v2::ZERO;
let (vertices, indices) = self.add_text_to_buffers( let (vertices, indices) = self.add_text_to_buffers(
content, content,
font.clone(), font,
size, size,
position, position,
color, color,
@ -968,6 +999,7 @@ impl<'a> Renderer2D<'a> {
} }
if resources.get_bind_group_layout("Font").is_none() { if resources.get_bind_group_layout("Font").is_none() {
#[cfg(comet_debug)]
debug!("Font pass not initialized yet; skipping Font camera bind group setup."); debug!("Font pass not initialized yet; skipping Font camera bind group setup.");
} }
} }