mirror of
https://github.com/Xevion/Pac-Man.git
synced 2025-12-07 03:15:49 -06:00
feat: enumerate and display render driver info, increase node id text opacity
This commit is contained in:
40
src/app.rs
40
src/app.rs
@@ -1,3 +1,4 @@
|
|||||||
|
use std::collections::HashMap;
|
||||||
use std::time::{Duration, Instant};
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
use crate::error::{GameError, GameResult};
|
use crate::error::{GameError, GameResult};
|
||||||
@@ -5,7 +6,10 @@ use crate::error::{GameError, GameResult};
|
|||||||
use crate::constants::{CANVAS_SIZE, LOOP_TIME, SCALE};
|
use crate::constants::{CANVAS_SIZE, LOOP_TIME, SCALE};
|
||||||
use crate::game::Game;
|
use crate::game::Game;
|
||||||
use crate::platform;
|
use crate::platform;
|
||||||
|
use sdl2::pixels::PixelFormatEnum;
|
||||||
|
use sdl2::render::RendererInfo;
|
||||||
use sdl2::{AudioSubsystem, Sdl};
|
use sdl2::{AudioSubsystem, Sdl};
|
||||||
|
use tracing::debug;
|
||||||
|
|
||||||
/// Main application wrapper that manages SDL initialization, window lifecycle, and the game loop.
|
/// Main application wrapper that manages SDL initialization, window lifecycle, and the game loop.
|
||||||
///
|
///
|
||||||
@@ -50,15 +54,51 @@ impl App {
|
|||||||
.build()
|
.build()
|
||||||
.map_err(|e| GameError::Sdl(e.to_string()))?;
|
.map_err(|e| GameError::Sdl(e.to_string()))?;
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
struct DriverDetail {
|
||||||
|
info: RendererInfo,
|
||||||
|
index: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
let drivers: HashMap<&'static str, DriverDetail> = sdl2::render::drivers()
|
||||||
|
.enumerate()
|
||||||
|
.map(|(index, d)| (d.name, DriverDetail { info: d, index }))
|
||||||
|
.collect::<HashMap<_, _>>();
|
||||||
|
|
||||||
|
let get_driver =
|
||||||
|
|name: &'static str| -> Option<u32> { drivers.get(name.to_lowercase().as_str()).map(|d| d.index as u32) };
|
||||||
|
|
||||||
|
{
|
||||||
|
let mut names = drivers.keys().collect::<Vec<_>>();
|
||||||
|
names.sort_by_key(|k| get_driver(k));
|
||||||
|
debug!("Drivers: {names:?}")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Count the number of times each pixel format is supported by each driver
|
||||||
|
let pixel_format_counts: HashMap<PixelFormatEnum, usize> = drivers
|
||||||
|
.values()
|
||||||
|
.flat_map(|d| d.info.texture_formats.iter())
|
||||||
|
.fold(HashMap::new(), |mut counts, format| {
|
||||||
|
*counts.entry(*format).or_insert(0) += 1;
|
||||||
|
counts
|
||||||
|
});
|
||||||
|
|
||||||
|
debug!("Pixel format counts: {pixel_format_counts:?}");
|
||||||
|
|
||||||
|
let index = get_driver("direct3d");
|
||||||
|
debug!("Driver index: {index:?}");
|
||||||
|
|
||||||
let mut canvas = window
|
let mut canvas = window
|
||||||
.into_canvas()
|
.into_canvas()
|
||||||
.accelerated()
|
.accelerated()
|
||||||
|
// .index(index)
|
||||||
.build()
|
.build()
|
||||||
.map_err(|e| GameError::Sdl(e.to_string()))?;
|
.map_err(|e| GameError::Sdl(e.to_string()))?;
|
||||||
|
|
||||||
canvas
|
canvas
|
||||||
.set_logical_size(CANVAS_SIZE.x, CANVAS_SIZE.y)
|
.set_logical_size(CANVAS_SIZE.x, CANVAS_SIZE.y)
|
||||||
.map_err(|e| GameError::Sdl(e.to_string()))?;
|
.map_err(|e| GameError::Sdl(e.to_string()))?;
|
||||||
|
debug!("Renderer: {:?}", canvas.info());
|
||||||
|
|
||||||
let texture_creator = canvas.texture_creator();
|
let texture_creator = canvas.texture_creator();
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ use crate::systems::{Collider, CursorPosition, NodeId, Position, SystemTimings};
|
|||||||
use crate::texture::ttf::{TtfAtlas, TtfRenderer};
|
use crate::texture::ttf::{TtfAtlas, TtfRenderer};
|
||||||
use bevy_ecs::resource::Resource;
|
use bevy_ecs::resource::Resource;
|
||||||
use bevy_ecs::system::{Query, Res};
|
use bevy_ecs::system::{Query, Res};
|
||||||
use glam::{IVec2, UVec2, Vec2};
|
use glam::{IVec2, Vec2};
|
||||||
use sdl2::pixels::Color;
|
use sdl2::pixels::Color;
|
||||||
use sdl2::rect::{Point, Rect};
|
use sdl2::rect::{Point, Rect};
|
||||||
use sdl2::render::{Canvas, Texture};
|
use sdl2::render::{Canvas, Texture};
|
||||||
@@ -215,8 +215,6 @@ pub fn debug_render_system(
|
|||||||
if !debug_state.enabled {
|
if !debug_state.enabled {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let scale = constants::LARGE_SCALE as f32;
|
|
||||||
|
|
||||||
// Create debug text renderer
|
// Create debug text renderer
|
||||||
let text_renderer = TtfRenderer::new(1.0);
|
let text_renderer = TtfRenderer::new(1.0);
|
||||||
|
|
||||||
@@ -249,8 +247,8 @@ pub fn debug_render_system(
|
|||||||
let pos = position.get_pixel_position(&map.graph).unwrap();
|
let pos = position.get_pixel_position(&map.graph).unwrap();
|
||||||
|
|
||||||
// Transform position and size using common methods
|
// Transform position and size using common methods
|
||||||
let pos = (pos * scale).as_ivec2();
|
let pos = (pos * constants::LARGE_SCALE).as_ivec2();
|
||||||
let size = (collider.size * scale) as u32;
|
let size = (collider.size * constants::LARGE_SCALE) as u32;
|
||||||
|
|
||||||
Rect::from_center(Point::from((pos.x, pos.y)), size, size)
|
Rect::from_center(Point::from((pos.x, pos.y)), size, size)
|
||||||
})
|
})
|
||||||
@@ -266,7 +264,7 @@ pub fn debug_render_system(
|
|||||||
}
|
}
|
||||||
|
|
||||||
canvas.set_draw_color(Color {
|
canvas.set_draw_color(Color {
|
||||||
a: f32_to_u8(0.6),
|
a: f32_to_u8(0.65),
|
||||||
..Color::RED
|
..Color::RED
|
||||||
});
|
});
|
||||||
canvas.set_blend_mode(sdl2::render::BlendMode::Blend);
|
canvas.set_blend_mode(sdl2::render::BlendMode::Blend);
|
||||||
@@ -280,8 +278,8 @@ pub fn debug_render_system(
|
|||||||
.nodes()
|
.nodes()
|
||||||
.enumerate()
|
.enumerate()
|
||||||
.filter_map(|(id, node)| {
|
.filter_map(|(id, node)| {
|
||||||
let pos = transform_position_with_offset(node.position, scale);
|
let pos = transform_position_with_offset(node.position, constants::LARGE_SCALE);
|
||||||
let size = (2.0 * scale) as u32;
|
let size = (2.0 * constants::LARGE_SCALE) as u32;
|
||||||
let rect = Rect::new(pos.x - (size as i32 / 2), pos.y - (size as i32 / 2), size, size);
|
let rect = Rect::new(pos.x - (size as i32 / 2), pos.y - (size as i32 / 2), size, size);
|
||||||
|
|
||||||
// If the node is the one closest to the cursor, draw it immediately
|
// If the node is the one closest to the cursor, draw it immediately
|
||||||
@@ -311,7 +309,7 @@ pub fn debug_render_system(
|
|||||||
// Render node ID if a node is highlighted
|
// Render node ID if a node is highlighted
|
||||||
if let Some(closest_node_id) = closest_node {
|
if let Some(closest_node_id) = closest_node {
|
||||||
let node = map.graph.get_node(closest_node_id as NodeId).unwrap();
|
let node = map.graph.get_node(closest_node_id as NodeId).unwrap();
|
||||||
let pos = transform_position_with_offset(node.position, scale);
|
let pos = transform_position_with_offset(node.position, constants::LARGE_SCALE);
|
||||||
|
|
||||||
let node_id_text = closest_node_id.to_string();
|
let node_id_text = closest_node_id.to_string();
|
||||||
let text_pos = Vec2::new((pos.x + 10) as f32, (pos.y - 5) as f32);
|
let text_pos = Vec2::new((pos.x + 10) as f32, (pos.y - 5) as f32);
|
||||||
@@ -323,7 +321,7 @@ pub fn debug_render_system(
|
|||||||
&node_id_text,
|
&node_id_text,
|
||||||
text_pos,
|
text_pos,
|
||||||
Color {
|
Color {
|
||||||
a: f32_to_u8(0.4),
|
a: f32_to_u8(0.9),
|
||||||
..Color::WHITE
|
..Color::WHITE
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -6,8 +6,13 @@ use bevy_ecs::{
|
|||||||
system::{NonSendMut, Res, ResMut},
|
system::{NonSendMut, Res, ResMut},
|
||||||
};
|
};
|
||||||
use glam::Vec2;
|
use glam::Vec2;
|
||||||
use sdl2::{event::Event, keyboard::Keycode, EventPump};
|
use sdl2::{
|
||||||
|
event::{Event, WindowEvent},
|
||||||
|
keyboard::Keycode,
|
||||||
|
EventPump,
|
||||||
|
};
|
||||||
use smallvec::{smallvec, SmallVec};
|
use smallvec::{smallvec, SmallVec};
|
||||||
|
use tracing::{debug, info};
|
||||||
|
|
||||||
use crate::systems::components::DeltaTime;
|
use crate::systems::components::DeltaTime;
|
||||||
use crate::{
|
use crate::{
|
||||||
@@ -293,7 +298,15 @@ pub fn input_system(
|
|||||||
simple_key_events.push(SimpleKeyEvent::KeyUp(key));
|
simple_key_events.push(SimpleKeyEvent::KeyUp(key));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Event::RenderTargetsReset { .. } | Event::Window { .. } => {
|
Event::Window { win_event, .. } => match win_event {
|
||||||
|
WindowEvent::Resized(w, h) => {
|
||||||
|
info!("Window resized to {}x{}", w, h);
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
debug!("Window event: {:?}", win_event);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
Event::RenderTargetsReset { .. } => {
|
||||||
// No-op
|
// No-op
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
|
|||||||
Reference in New Issue
Block a user