mirror of
https://github.com/lisk77/comet.git
synced 2025-12-12 17:18:50 +00:00
Compare commits
No commits in common. "a01a52766dfde65259c2cf7fac36fa71e733be79" and "9c5a471519f2060f1de0b86a7f65e35c9f88203a" have entirely different histories.
a01a52766d
...
9c5a471519
4 changed files with 45 additions and 78 deletions
|
|
@ -370,9 +370,15 @@ 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);
|
||||
|
|
@ -404,6 +410,7 @@ impl App {
|
|||
_ => {}
|
||||
},
|
||||
Event::AboutToWait => {
|
||||
elwt.set_control_flow(ControlFlow::Poll);
|
||||
self.delta_time = renderer.update();
|
||||
|
||||
if self.dt() != f32::INFINITY {
|
||||
|
|
@ -418,14 +425,6 @@ 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);
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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) -> &str;
|
||||
fn get_texture(&self) -> String;
|
||||
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) -> &str {
|
||||
self.texture_name
|
||||
fn get_texture(&self) -> String {
|
||||
self.texture_name.parse().unwrap()
|
||||
}
|
||||
|
||||
/// Use the actual file name of the texture instead of the path
|
||||
|
|
|
|||
|
|
@ -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,8 +66,7 @@ macro_rules! fatal {
|
|||
"\x1b[41mFATAL\x1b[0m",
|
||||
format!($fmt $(, $args)*)
|
||||
);
|
||||
std::process::exit(1)
|
||||
}};
|
||||
};
|
||||
}
|
||||
|
||||
#[macro_export]
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@ 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);
|
||||
}
|
||||
|
||||
|
|
@ -555,29 +556,27 @@ impl<'a> Renderer2D<'a> {
|
|||
))
|
||||
}
|
||||
|
||||
fn get_texture_region(&self, texture_path: &str) -> Option<&TextureRegion> {
|
||||
fn get_texture_region(&self, texture_path: String) -> Option<&TextureRegion> {
|
||||
if !self
|
||||
.resource_manager
|
||||
.texture_atlas()
|
||||
.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
|
||||
.texture_atlas()
|
||||
.textures()
|
||||
.get(texture_path)
|
||||
.get(&texture_path)
|
||||
}
|
||||
|
||||
fn get_glyph_region(&self, glyph: char, font: &str) -> &TextureRegion {
|
||||
fn get_glyph_region(&self, glyph: char, font: String) -> &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
|
||||
|
|
@ -588,7 +587,7 @@ impl<'a> Renderer2D<'a> {
|
|||
.textures()
|
||||
.get(&fallback_key)
|
||||
.unwrap_or_else(|| {
|
||||
fatal!(
|
||||
panic!(
|
||||
"No fallback glyph available (space also missing) for font '{}'",
|
||||
font
|
||||
)
|
||||
|
|
@ -597,7 +596,7 @@ impl<'a> Renderer2D<'a> {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn precompute_text_bounds(&self, text: &str, font: &str, size: f32) -> v2 {
|
||||
pub fn precompute_text_bounds(&self, text: String, font: String, size: f32) -> v2 {
|
||||
let mut bounds = v2::ZERO;
|
||||
|
||||
let _ =
|
||||
|
|
@ -608,8 +607,8 @@ impl<'a> Renderer2D<'a> {
|
|||
|
||||
pub fn add_text_to_buffers(
|
||||
&self,
|
||||
text: &str,
|
||||
font: &str,
|
||||
text: String,
|
||||
font: String,
|
||||
size: f32,
|
||||
position: comet_math::v2,
|
||||
color: wgpu::Color,
|
||||
|
|
@ -674,7 +673,7 @@ impl<'a> Renderer2D<'a> {
|
|||
|
||||
for line in lines {
|
||||
for c in line.chars() {
|
||||
let region = self.get_glyph_region(c, font);
|
||||
let region = self.get_glyph_region(c, font.clone());
|
||||
|
||||
let (dim_x, dim_y) = region.dimensions();
|
||||
let w = (dim_x as f32 / config.width as f32) * scale_factor;
|
||||
|
|
@ -774,7 +773,7 @@ impl<'a> Renderer2D<'a> {
|
|||
let rotation_angle = transform_component.rotation().to_radians();
|
||||
|
||||
let region =
|
||||
match self.get_texture_region(renderer_component.get_texture()) {
|
||||
match self.get_texture_region(renderer_component.get_texture().to_string()) {
|
||||
Some(r) => r,
|
||||
None => continue,
|
||||
};
|
||||
|
|
@ -796,54 +795,25 @@ impl<'a> Renderer2D<'a> {
|
|||
let cos_angle = rotation_angle.cos();
|
||||
let sin_angle = rotation_angle.sin();
|
||||
|
||||
let rotated_world_corners = [
|
||||
let rotated_world_corners: Vec<(f32, f32)> = world_corners
|
||||
.iter()
|
||||
.map(|(x, y)| {
|
||||
(
|
||||
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(),
|
||||
),
|
||||
];
|
||||
x * cos_angle - y * sin_angle + world_position.x(),
|
||||
x * sin_angle + y * cos_angle + world_position.y(),
|
||||
)
|
||||
})
|
||||
.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 = [
|
||||
let snapped_screen_corners: Vec<(f32, f32)> = rotated_world_corners
|
||||
.iter()
|
||||
.map(|(x, y)| {
|
||||
(
|
||||
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,
|
||||
),
|
||||
];
|
||||
x.round() / self.render_context.config().width as f32,
|
||||
y.round() / self.render_context.config().height as f32,
|
||||
)
|
||||
})
|
||||
.collect();
|
||||
|
||||
vertex_buffer.extend_from_slice(&[
|
||||
Vertex::new(
|
||||
|
|
@ -898,16 +868,16 @@ impl<'a> Renderer2D<'a> {
|
|||
continue;
|
||||
}
|
||||
|
||||
let font = text_component.font();
|
||||
let font = text_component.font().to_string();
|
||||
let size = text_component.font_size();
|
||||
let color = text_component.color().to_wgpu();
|
||||
let content = text_component.content();
|
||||
let content = text_component.content().to_string();
|
||||
|
||||
let mut bounds = comet_math::v2::ZERO;
|
||||
|
||||
let (vertices, indices) = self.add_text_to_buffers(
|
||||
content,
|
||||
font,
|
||||
font.clone(),
|
||||
size,
|
||||
position,
|
||||
color,
|
||||
|
|
@ -999,7 +969,6 @@ 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.");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue