Compare commits

..

6 Commits

19 changed files with 315 additions and 56 deletions

52
Cargo.lock generated
View File

@@ -301,6 +301,15 @@ dependencies = [
"syn",
]
[[package]]
name = "deranged"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
dependencies = [
"powerfmt",
]
[[package]]
name = "derive_more"
version = "1.0.0"
@@ -561,6 +570,12 @@ dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "num-conv"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
[[package]]
name = "num-traits"
version = "0.2.19"
@@ -608,6 +623,7 @@ dependencies = [
"strum_macros",
"thiserror",
"thousands",
"time",
"tracing",
"tracing-error",
"tracing-subscriber",
@@ -722,6 +738,12 @@ dependencies = [
"portable-atomic",
]
[[package]]
name = "powerfmt"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
[[package]]
name = "ppv-lite86"
version = "0.2.21"
@@ -1032,6 +1054,36 @@ dependencies = [
"once_cell",
]
[[package]]
name = "time"
version = "0.3.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83bde6f1ec10e72d583d91623c939f623002284ef622b87de38cfd546cbf2031"
dependencies = [
"deranged",
"num-conv",
"powerfmt",
"serde",
"time-core",
"time-macros",
]
[[package]]
name = "time-core"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
[[package]]
name = "time-macros"
version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
dependencies = [
"num-conv",
"time-core",
]
[[package]]
name = "toml_datetime"
version = "0.6.11"

View File

@@ -24,6 +24,7 @@ pathfinding = "4.14"
tracing = { version = "0.1.41", features = ["max_level_debug", "release_max_level_debug"]}
tracing-error = "0.2.0"
tracing-subscriber = {version = "0.3.20", features = ["env-filter"]}
time = { version = "0.3.43", features = ["formatting", "macros"] }
thiserror = "2.0.16"
anyhow = "1.0"
smallvec = "1.15.1"

View File

@@ -40,5 +40,6 @@ samply:
samply record ./target/profile/pacman{{ binary_extension }}
# Build the project for Emscripten
web:
bun run web.build.ts; caddy file-server --root dist
web *args:
bun run web.build.ts {{args}};
caddy file-server --root dist

View File

@@ -1,11 +1,16 @@
use std::collections::HashMap;
use std::time::{Duration, Instant};
use crate::error::{GameError, GameResult};
use crate::constants::{CANVAS_SIZE, LOOP_TIME, SCALE};
use crate::formatter;
use crate::game::Game;
use crate::platform;
use sdl2::pixels::PixelFormatEnum;
use sdl2::render::RendererInfo;
use sdl2::{AudioSubsystem, Sdl};
use tracing::debug;
/// Main application wrapper that manages SDL initialization, window lifecycle, and the game loop.
///
@@ -50,15 +55,51 @@ impl App {
.build()
.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
.into_canvas()
.accelerated()
// .index(index)
.build()
.map_err(|e| GameError::Sdl(e.to_string()))?;
canvas
.set_logical_size(CANVAS_SIZE.x, CANVAS_SIZE.y)
.map_err(|e| GameError::Sdl(e.to_string()))?;
debug!("Renderer: {:?}", canvas.info());
let texture_creator = canvas.texture_creator();
@@ -91,6 +132,9 @@ impl App {
let dt = self.last_tick.elapsed().as_secs_f32();
self.last_tick = start;
// Increment the global tick counter for tracing
formatter::increment_tick();
let exit = self.game.tick(dt);
if exit {

View File

@@ -49,6 +49,13 @@ pub const CANVAS_SIZE: UVec2 = UVec2::new(
(BOARD_CELL_SIZE.y + BOARD_CELL_OFFSET.y) * CELL_SIZE,
);
pub const LARGE_SCALE: f32 = 2.6;
pub const LARGE_CANVAS_SIZE: UVec2 = UVec2::new(
(((BOARD_CELL_SIZE.x + BOARD_CELL_OFFSET.x) * CELL_SIZE) as f32 * LARGE_SCALE) as u32,
(((BOARD_CELL_SIZE.y + BOARD_CELL_OFFSET.y) * CELL_SIZE) as f32 * LARGE_SCALE) as u32,
);
/// Collider size constants for different entity types
pub mod collider {
use super::CELL_SIZE;

94
src/formatter.rs Normal file
View File

@@ -0,0 +1,94 @@
//! Custom tracing formatter with tick counter integration
use std::fmt;
use std::sync::atomic::{AtomicU64, Ordering};
use time::macros::format_description;
use time::{format_description::FormatItem, OffsetDateTime};
use tracing::{Event, Subscriber};
use tracing_subscriber::fmt::format::Writer;
use tracing_subscriber::fmt::{FmtContext, FormatEvent, FormatFields};
use tracing_subscriber::registry::LookupSpan;
/// Global atomic counter for tracking game ticks
static TICK_COUNTER: AtomicU64 = AtomicU64::new(0);
/// Maximum value for tick counter display (16-bit hex)
const TICK_DISPLAY_MASK: u64 = 0xFFFF;
/// Cached format description for timestamps
/// Uses 3 subsecond digits on Emscripten, 5 otherwise for better performance
#[cfg(target_os = "emscripten")]
const TIMESTAMP_FORMAT: &[FormatItem<'static>] = format_description!("[hour]:[minute]:[second].[subsecond digits:3]");
#[cfg(not(target_os = "emscripten"))]
const TIMESTAMP_FORMAT: &[FormatItem<'static>] = format_description!("[hour]:[minute]:[second].[subsecond digits:5]");
/// A custom formatter that includes both timestamp and tick counter in hexadecimal
///
/// This formatter provides:
/// - High-precision timestamps (HH:MM:SS.mmm on Emscripten, HH:MM:SS.mmmmm otherwise)
/// - Hexadecimal tick counter for frame correlation
/// - Standard log level and target information
///
/// Performance considerations:
/// - Timestamp format is cached at compile time
/// - Tick counter access is atomic and very fast
/// - Combined formatting operations for efficiency
pub struct CustomFormatter;
impl<S, N> FormatEvent<S, N> for CustomFormatter
where
S: Subscriber + for<'a> LookupSpan<'a>,
N: for<'a> FormatFields<'a> + 'static,
{
fn format_event(&self, ctx: &FmtContext<'_, S, N>, mut writer: Writer<'_>, event: &Event<'_>) -> fmt::Result {
// Format timestamp using cached format description
let now = OffsetDateTime::now_utc();
let formatted_time = now.format(&TIMESTAMP_FORMAT).map_err(|e| {
// Preserve the original error information for debugging
eprintln!("Failed to format timestamp: {}", e);
fmt::Error
})?;
// Get tick count and format everything together
let tick_count = get_tick_count();
let metadata = event.metadata();
// Combined formatting: timestamp, tick counter, level, and target in one write
write!(
writer,
"{} 0x{:04X} {:5} {}: ",
formatted_time,
tick_count & TICK_DISPLAY_MASK,
metadata.level(),
metadata.target()
)?;
// Format the fields (the actual log message)
ctx.field_format().format_fields(writer.by_ref(), event)?;
writeln!(writer)
}
}
/// Increment the global tick counter by 1
///
/// This should be called once per game tick/frame from the main game loop
pub fn increment_tick() {
TICK_COUNTER.fetch_add(1, Ordering::Relaxed);
}
/// Get the current tick count
///
/// Returns the current value of the global tick counter
pub fn get_tick_count() -> u64 {
TICK_COUNTER.load(Ordering::Relaxed)
}
/// Reset the tick counter to 0
///
/// This can be used for testing or when restarting the game
#[allow(dead_code)]
pub fn reset_tick_counter() {
TICK_COUNTER.store(0, Ordering::Relaxed);
}

View File

@@ -157,9 +157,9 @@ impl Game {
map_texture.set_scale_mode(ScaleMode::Nearest);
// Create debug texture at output resolution for crisp debug rendering
let output_size = canvas.output_size().unwrap();
let output_size = constants::LARGE_CANVAS_SIZE;
let mut debug_texture = texture_creator
.create_texture_target(Some(sdl2::pixels::PixelFormatEnum::ARGB8888), output_size.0, output_size.1)
.create_texture_target(Some(sdl2::pixels::PixelFormatEnum::ARGB8888), output_size.x, output_size.y)
.map_err(|e| GameError::Sdl(e.to_string()))?;
// Debug texture is copied over the backbuffer, it requires transparency abilities

View File

@@ -6,6 +6,7 @@ pub mod audio;
pub mod constants;
pub mod error;
pub mod events;
pub mod formatter;
pub mod game;
pub mod map;
pub mod platform;

View File

@@ -2,7 +2,7 @@
#![windows_subsystem = "windows"]
use crate::{app::App, constants::LOOP_TIME};
use tracing::{debug, info, warn};
use tracing::info;
mod app;
mod asset;
@@ -11,6 +11,7 @@ mod constants;
mod error;
mod events;
mod formatter;
mod game;
mod map;
mod platform;
@@ -22,19 +23,9 @@ mod texture;
/// This function initializes SDL, the window, the game state, and then enters
/// the main game loop.
pub fn main() {
if platform::requires_console() {
// Setup buffered tracing subscriber that will buffer logs until console is ready
let switchable_writer = platform::tracing_buffer::setup_switchable_subscriber();
// Initialize platform-specific console
platform::init_console().expect("Could not initialize console");
// Now that console is initialized, flush buffered logs and switch to direct output
debug!("Switching to direct logging mode and flushing buffer...");
if let Err(error) = switchable_writer.switch_to_direct_mode() {
warn!("Failed to flush buffered logs to console: {error:?}");
}
}
// On Windows, this connects output streams to the console dynamically
// On Emscripten, this connects the subscriber to the browser console
platform::init_console().expect("Could not initialize console");
let mut app = App::new().expect("Could not create app");

View File

@@ -1,3 +1,5 @@
#![allow(dead_code)]
//! Buffered writer for tracing logs that can store logs before console attachment.
use parking_lot::Mutex;

View File

@@ -20,9 +20,13 @@ pub fn sleep(duration: Duration, focused: bool) {
pub fn init_console() -> Result<(), PlatformError> {
#[cfg(windows)]
{
use crate::platform::tracing_buffer::setup_switchable_subscriber;
use tracing::{debug, info};
use windows::Win32::System::Console::GetConsoleWindow;
// Setup buffered tracing subscriber that will buffer logs until console is ready
let switchable_writer = setup_switchable_subscriber();
// Check if we already have a console window
if unsafe { !GetConsoleWindow().0.is_null() } {
debug!("Already have a console window");
@@ -40,15 +44,19 @@ pub fn init_console() -> Result<(), PlatformError> {
attach_to_parent_console()?;
info!("Successfully attached to parent console");
}
// Now that console is initialized, flush buffered logs and switch to direct output
debug!("Switching to direct logging mode and flushing buffer...");
if let Err(error) = switchable_writer.switch_to_direct_mode() {
use tracing::warn;
warn!("Failed to flush buffered logs to console: {error:?}");
}
}
Ok(())
}
pub fn requires_console() -> bool {
cfg!(windows)
}
pub fn get_asset_bytes(asset: Asset) -> Result<Cow<'static, [u8]>, AssetError> {
match asset {
Asset::Wav1 => Ok(Cow::Borrowed(include_bytes!("../../assets/game/sound/waka/1.ogg"))),

View File

@@ -1,18 +1,22 @@
//! Emscripten platform implementation.
use std::borrow::Cow;
use std::time::Duration;
use crate::asset::Asset;
use crate::error::{AssetError, PlatformError};
use crate::formatter::CustomFormatter;
use rand::{rngs::SmallRng, SeedableRng};
use sdl2::rwops::RWops;
use std::borrow::Cow;
use std::ffi::CString;
use std::io::{self, Read, Write};
use std::time::Duration;
// Emscripten FFI functions
#[allow(dead_code)]
extern "C" {
fn emscripten_get_now() -> f64;
fn emscripten_sleep(ms: u32);
fn emscripten_get_element_css_size(target: *const u8, width: *mut f64, height: *mut f64) -> i32;
// Standard C functions that Emscripten redirects to console
fn printf(format: *const u8, ...) -> i32;
}
pub fn sleep(duration: Duration, _focused: bool) {
@@ -22,11 +26,43 @@ pub fn sleep(duration: Duration, _focused: bool) {
}
pub fn init_console() -> Result<(), PlatformError> {
Ok(()) // No-op for Emscripten
use tracing_subscriber::{fmt, layer::SubscriberExt, EnvFilter};
// Set up a custom tracing subscriber that writes directly to emscripten console
let subscriber = tracing_subscriber::registry()
.with(
fmt::layer()
.with_writer(|| EmscriptenConsoleWriter)
.with_ansi(false)
.event_format(CustomFormatter),
)
.with(EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("debug")));
tracing::subscriber::set_global_default(subscriber)
.map_err(|e| PlatformError::ConsoleInit(format!("Failed to set tracing subscriber: {}", e)))?;
Ok(())
}
pub fn requires_console() -> bool {
false
/// A writer that outputs to the browser console via printf (redirected by emscripten)
struct EmscriptenConsoleWriter;
impl Write for EmscriptenConsoleWriter {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
if let Ok(s) = std::str::from_utf8(buf) {
if let Ok(cstr) = CString::new(s.trim_end_matches('\n')) {
let format_str = CString::new("%s\n").unwrap();
unsafe {
printf(format_str.as_ptr().cast(), cstr.as_ptr());
}
}
}
Ok(buf.len())
}
fn flush(&mut self) -> io::Result<()> {
Ok(())
}
}
#[allow(dead_code)]
@@ -44,18 +80,13 @@ pub fn get_canvas_size() -> Option<(u32, u32)> {
}
pub fn get_asset_bytes(asset: Asset) -> Result<Cow<'static, [u8]>, AssetError> {
use sdl2::rwops::RWops;
use std::io::Read;
let path = format!("assets/game/{}", asset.path());
let mut rwops = RWops::from_file(&path, "rb").map_err(|_| AssetError::NotFound(asset.path().to_string()))?;
let len = rwops.len().ok_or_else(|| AssetError::NotFound(asset.path().to_string()))?;
let mut buf = vec![0u8; len];
rwops
.read_exact(&mut buf)
.map_err(|e| AssetError::Io(std::io::Error::other(e)))?;
rwops.read_exact(&mut buf).map_err(|e| AssetError::Io(io::Error::other(e)))?;
Ok(Cow::Owned(buf))
}

View File

@@ -1,10 +1,12 @@
//! Platform abstraction layer for cross-platform functionality.
pub mod buffered_writer;
pub mod tracing_buffer;
#[cfg(not(target_os = "emscripten"))]
pub mod buffered_writer;
#[cfg(not(target_os = "emscripten"))]
mod desktop;
#[cfg(not(target_os = "emscripten"))]
pub mod tracing_buffer;
#[cfg(not(target_os = "emscripten"))]
pub use desktop::*;
#[cfg(target_os = "emscripten")]

View File

@@ -1,5 +1,8 @@
#![allow(dead_code)]
//! Buffered tracing setup for handling logs before console attachment.
use crate::formatter::CustomFormatter;
use crate::platform::buffered_writer::BufferedWriter;
use std::io;
use tracing::{debug, Level};
@@ -88,6 +91,7 @@ pub fn setup_switchable_subscriber() -> SwitchableWriter {
let _subscriber = tracing_subscriber::fmt()
.with_ansi(cfg!(not(target_os = "emscripten")))
.with_max_level(Level::DEBUG)
.event_format(CustomFormatter)
.with_writer(make_writer)
.finish()
.with(ErrorLayer::default());

View File

@@ -142,8 +142,6 @@ pub fn ghost_collision_system(
events.write(AudioEvent::PlayEat);
} else {
// Pac-Man dies (this would need a death system)
// For now, just log it
tracing::warn!("Pac-Man collided with ghost while not frightened!");
}
}
}

View File

@@ -1,13 +1,13 @@
//! Debug rendering system
use std::cmp::Ordering;
use crate::constants::{BOARD_PIXEL_OFFSET, CANVAS_SIZE};
use crate::constants::{self, BOARD_PIXEL_OFFSET};
use crate::map::builder::Map;
use crate::systems::{Collider, CursorPosition, NodeId, Position, SystemTimings};
use crate::texture::ttf::{TtfAtlas, TtfRenderer};
use bevy_ecs::resource::Resource;
use bevy_ecs::system::{Query, Res};
use glam::{IVec2, UVec2, Vec2};
use glam::{IVec2, Vec2};
use sdl2::pixels::Color;
use sdl2::rect::{Point, Rect};
use sdl2::render::{Canvas, Texture};
@@ -215,10 +215,6 @@ pub fn debug_render_system(
if !debug_state.enabled {
return;
}
let output = UVec2::from(canvas.output_size().unwrap()).as_vec2();
let logical = CANVAS_SIZE.as_vec2();
let scale = (output / logical).min_element();
// Create debug text renderer
let text_renderer = TtfRenderer::new(1.0);
@@ -251,8 +247,8 @@ pub fn debug_render_system(
let pos = position.get_pixel_position(&map.graph).unwrap();
// Transform position and size using common methods
let pos = (pos * scale).as_ivec2();
let size = (collider.size * scale) as u32;
let pos = (pos * constants::LARGE_SCALE).as_ivec2();
let size = (collider.size * constants::LARGE_SCALE) as u32;
Rect::from_center(Point::from((pos.x, pos.y)), size, size)
})
@@ -268,7 +264,7 @@ pub fn debug_render_system(
}
canvas.set_draw_color(Color {
a: f32_to_u8(0.6),
a: f32_to_u8(0.65),
..Color::RED
});
canvas.set_blend_mode(sdl2::render::BlendMode::Blend);
@@ -282,8 +278,8 @@ pub fn debug_render_system(
.nodes()
.enumerate()
.filter_map(|(id, node)| {
let pos = transform_position_with_offset(node.position, scale);
let size = (2.0 * scale) as u32;
let pos = transform_position_with_offset(node.position, constants::LARGE_SCALE);
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);
// If the node is the one closest to the cursor, draw it immediately
@@ -313,7 +309,7 @@ pub fn debug_render_system(
// Render node ID if a node is highlighted
if let Some(closest_node_id) = closest_node {
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 text_pos = Vec2::new((pos.x + 10) as f32, (pos.y - 5) as f32);
@@ -325,7 +321,7 @@ pub fn debug_render_system(
&node_id_text,
text_pos,
Color {
a: f32_to_u8(0.4),
a: f32_to_u8(0.9),
..Color::WHITE
},
)

View File

@@ -6,8 +6,13 @@ use bevy_ecs::{
system::{NonSendMut, Res, ResMut},
};
use glam::Vec2;
use sdl2::{event::Event, keyboard::Keycode, EventPump};
use sdl2::{
event::{Event, WindowEvent},
keyboard::Keycode,
EventPump,
};
use smallvec::{smallvec, SmallVec};
use tracing::{debug, info};
use crate::systems::components::DeltaTime;
use crate::{
@@ -293,6 +298,17 @@ pub fn input_system(
simple_key_events.push(SimpleKeyEvent::KeyUp(key));
}
}
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
}
_ => {
tracing::warn!("Unhandled event, consider disabling: {:?}", event);
}

View File

@@ -50,7 +50,7 @@ fn test_atlas_mapper_multiple_frames() {
assert!(mapper.frames.contains_key("tile1"));
assert!(mapper.frames.contains_key("tile2"));
assert!(!mapper.frames.contains_key("tile3"));
assert!(mapper.frames.get("nonexistent").is_none());
assert!(!mapper.frames.contains_key("nonexistent"));
}
#[test]

View File

@@ -501,7 +501,6 @@ async function activateEmsdk(
return { vars };
}
async function main() {
// Print the OS detected
logger.debug(
@@ -515,7 +514,19 @@ async function main() {
.exhaustive()
);
const release = process.env.RELEASE !== "0";
// Parse command line args for build mode
const args = process.argv.slice(2);
let release = true; // Default to release mode
for (let i = 0; i < args.length; i++) {
const arg = args[i];
if (arg === "-d" || arg === "--debug") {
release = false;
} else if (arg === "-r" || arg === "--release") {
release = true;
}
}
const emsdkDir = resolve("./emsdk");
// Activate the Emscripten SDK (returns null if already activated)