Compare commits

..

15 Commits

Author SHA1 Message Date
9b441fa35c feat: shared blinking textures for power pellets 2025-07-24 16:23:09 -05:00
61ca537909 fix: continue removing lifetime annotations 2025-07-24 16:09:25 -05:00
0a82aea922 refactor: intentionally unsafe leak to drop annoying lifetimes, use IVec2 in all remaining spots 2025-07-24 16:04:47 -05:00
f41c550bb8 feat: enable basic binary size reduction options 2025-07-24 15:39:16 -05:00
829462d3b6 refactor: move direction & edible into entity submodule 2025-07-24 12:48:39 -05:00
002da46045 refactor: split up and move texture-related code into src/texture submodule 2025-07-24 12:48:39 -05:00
cfa73c58a8 refactor: move entity-related code into src/entity submodule 2025-07-24 12:36:48 -05:00
5728effcc6 chore: bump to v0.2.0 2025-07-24 12:14:26 -05:00
fa1a0175b0 ci: remove save-always, remove old vcpkg cache key, flush vcpkg caches 2025-07-24 03:29:22 -05:00
85edb18380 ci: drop linux dependencies: build-essential gettext zlib1g-dev 2025-07-24 03:26:05 -05:00
3a535ee04f fix: linux build linking arg, working build 2025-07-24 02:59:58 -05:00
9b31b392d2 fix(wasm): increase asyncify stack size, working wasm build 2025-07-24 02:39:57 -05:00
999fa14059 chore: remove unused config.toml comments 2025-07-24 02:37:49 -05:00
e925376b7a feat: setup emscripten module for api layer 2025-07-24 02:37:41 -05:00
2596034365 feat: use smallrng for emscripten compat 2025-07-24 02:37:27 -05:00
22 changed files with 545 additions and 387 deletions

View File

@@ -1,12 +1,16 @@
[target.'cfg(target_os = "emscripten")'] [target.'cfg(target_os = "emscripten")']
# TODO: Document what the fuck this is.
rustflags = [ rustflags = [
# "-O", "-C", "link-args=-O2 --profiling", # Stack size is required for this project, it will crash otherwise.
#"-C", "link-args=-O3 --closure 1", "-C", "link-args=-sASYNCIFY=1 -sASYNCIFY_STACK_SIZE=8192 -sALLOW_MEMORY_GROWTH=1",
# "-C", "link-args=-g -gsource-map",
"-C", "link-args=-sASYNCIFY -sALLOW_MEMORY_GROWTH=1",
# "-C", "link-args=-sALLOW_MEMORY_GROWTH=1",
"-C", "link-args=-sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_SDL_MIXER=2 -sUSE_OGG=1 -sUSE_SDL_GFX=2 -sUSE_SDL_TTF=2 -sSDL2_IMAGE_FORMATS=['png']", "-C", "link-args=-sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_SDL_MIXER=2 -sUSE_OGG=1 -sUSE_SDL_GFX=2 -sUSE_SDL_TTF=2 -sSDL2_IMAGE_FORMATS=['png']",
# USE_OGG, USE_VORBIS for OGG/VORBIS usage
"-C", "link-args=--preload-file assets/game/", "-C", "link-args=--preload-file assets/game/",
] ]
[target.'cfg(target_os = "linux")']
rustflags = [
# Manually link zlib.
# The `sdl2` crate's build script uses `libpng`, which requires `zlib`.
# By adding `-lz` here, we ensure it's passed to the linker after `libpng`,
# which is required for the linker to correctly resolve symbols.
"-C", "link-arg=-lz",
]

View File

@@ -44,18 +44,16 @@ jobs:
- name: Cache vcpkg - name: Cache vcpkg
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
save-always: true # deprecated
path: target/vcpkg path: target/vcpkg
key: vcpkg-${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('Cargo.toml', 'Cargo.lock') }} key: A-vcpkg-${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('Cargo.toml', 'Cargo.lock') }}
restore-keys: | restore-keys: |
${{ runner.os }}-vcpkg A-vcpkg-${{ runner.os }}-${{ matrix.target }}-
vcpkg-${{ runner.os }}-${{ matrix.target }}-
- name: Vcpkg Linux Dependencies - name: Vcpkg Linux Dependencies
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y build-essential gettext libltdl-dev zlib1g-dev sudo apt-get install -y libltdl-dev
- name: Vcpkg - name: Vcpkg
run: | run: |

42
Cargo.lock generated
View File

@@ -174,7 +174,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]] [[package]]
name = "pacman" name = "pacman"
version = "0.1.0" version = "0.2.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"glam", "glam",
@@ -212,15 +212,6 @@ version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
[[package]]
name = "ppv-lite86"
version = "0.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
dependencies = [
"zerocopy",
]
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.95" version = "1.0.95"
@@ -251,17 +242,6 @@ version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
dependencies = [ dependencies = [
"rand_chacha",
"rand_core",
]
[[package]]
name = "rand_chacha"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
dependencies = [
"ppv-lite86",
"rand_core", "rand_core",
] ]
@@ -647,23 +627,3 @@ checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
dependencies = [ dependencies = [
"bitflags 2.9.1", "bitflags 2.9.1",
] ]
[[package]]
name = "zerocopy"
version = "0.8.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
version = "0.8.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
dependencies = [
"proc-macro2",
"quote",
"syn",
]

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "pacman" name = "pacman"
version = "0.1.0" version = "0.2.0"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -12,13 +12,19 @@ tracing-subscriber = {version = "0.3.17", features = ["env-filter"]}
lazy_static = "1.5.0" lazy_static = "1.5.0"
sdl2 = { version = "0.38.0", features = ["image", "ttf"] } sdl2 = { version = "0.38.0", features = ["image", "ttf"] }
spin_sleep = "1.3.2" spin_sleep = "1.3.2"
rand = "0.9.2" rand = { version = "0.9.2", default-features = false, features = ["small_rng", "os_rng"] }
pathfinding = "4.14" pathfinding = "4.14"
once_cell = "1.21.3" once_cell = "1.21.3"
thiserror = "1.0" thiserror = "1.0"
anyhow = "1.0" anyhow = "1.0"
glam = "0.30.4" glam = "0.30.4"
[profile.release]
lto = true
panic = "abort"
panic-strategy = "abort"
opt-level = "z"
[target.'cfg(target_os = "windows")'.dependencies.winapi] [target.'cfg(target_os = "windows")'.dependencies.winapi]
version = "0.3" version = "0.3"
features = ["consoleapi", "fileapi", "handleapi", "processenv", "winbase", "wincon", "winnt", "winuser", "windef", "minwindef"] features = ["consoleapi", "fileapi", "handleapi", "processenv", "winbase", "wincon", "winnt", "winuser", "windef", "minwindef"]

View File

@@ -1,136 +0,0 @@
//! This module provides a simple animation and atlas system for textures.
use sdl2::{
rect::Rect,
render::{Canvas, Texture},
video::Window,
};
use crate::direction::Direction;
/// Trait for drawable atlas-based textures
pub trait FrameDrawn {
fn render(&self, canvas: &mut Canvas<Window>, position: (i32, i32), direction: Direction, frame: Option<u32>);
}
/// A texture atlas abstraction for static (non-animated) rendering.
pub struct AtlasTexture<'a> {
pub raw_texture: Texture<'a>,
pub offset: (i32, i32),
pub frame_count: u32,
pub frame_width: u32,
pub frame_height: u32,
}
impl<'a> AtlasTexture<'a> {
pub fn new(texture: Texture<'a>, frame_count: u32, frame_width: u32, frame_height: u32, offset: Option<(i32, i32)>) -> Self {
AtlasTexture {
raw_texture: texture,
frame_count,
frame_width,
frame_height,
offset: offset.unwrap_or((0, 0)),
}
}
pub fn get_frame_rect(&self, frame: u32) -> Option<Rect> {
if frame >= self.frame_count {
return None;
}
Some(Rect::new(
frame as i32 * self.frame_width as i32,
0,
self.frame_width,
self.frame_height,
))
}
pub fn set_color_modulation(&mut self, r: u8, g: u8, b: u8) {
self.raw_texture.set_color_mod(r, g, b);
}
}
impl<'a> FrameDrawn for AtlasTexture<'a> {
fn render(&self, canvas: &mut Canvas<Window>, position: (i32, i32), direction: Direction, frame: Option<u32>) {
let texture_source_frame_rect = self.get_frame_rect(frame.unwrap_or(0));
let canvas_destination_rect = Rect::new(
position.0 + self.offset.0,
position.1 + self.offset.1,
self.frame_width,
self.frame_height,
);
canvas
.copy_ex(
&self.raw_texture,
texture_source_frame_rect,
Some(canvas_destination_rect),
direction.angle(),
None,
false,
false,
)
.expect("Could not render texture on canvas");
}
}
/// An animated texture using a texture atlas.
pub struct AnimatedAtlasTexture<'a> {
pub atlas: AtlasTexture<'a>,
pub ticks_per_frame: u32,
pub ticker: u32,
pub reversed: bool,
pub paused: bool,
}
impl<'a> AnimatedAtlasTexture<'a> {
pub fn new(
texture: Texture<'a>,
ticks_per_frame: u32,
frame_count: u32,
width: u32,
height: u32,
offset: Option<(i32, i32)>,
) -> Self {
AnimatedAtlasTexture {
atlas: AtlasTexture::new(texture, frame_count, width, height, offset),
ticks_per_frame,
ticker: 0,
reversed: false,
paused: false,
}
}
fn current_frame(&self) -> u32 {
self.ticker / self.ticks_per_frame
}
/// Advances the animation by one tick, unless paused.
pub fn tick(&mut self) {
if self.paused {
return;
}
if self.reversed {
if self.ticker > 0 {
self.ticker -= 1;
}
if self.ticker == 0 {
self.reversed = !self.reversed;
}
} else {
self.ticker += 1;
if self.ticker + 1 == self.ticks_per_frame * self.atlas.frame_count {
self.reversed = !self.reversed;
}
}
}
pub fn set_color_modulation(&mut self, r: u8, g: u8, b: u8) {
self.atlas.set_color_modulation(r, g, b);
}
}
impl<'a> FrameDrawn for AnimatedAtlasTexture<'a> {
fn render(&self, canvas: &mut Canvas<Window>, position: (i32, i32), direction: Direction, frame: Option<u32>) {
let frame = frame.unwrap_or_else(|| self.current_frame());
self.atlas.render(canvas, position, direction, Some(frame));
}
}

View File

@@ -1,7 +1,7 @@
//! Debug rendering utilities for Pac-Man. //! Debug rendering utilities for Pac-Man.
use crate::{ use crate::{
constants::{MapTile, BOARD_HEIGHT, BOARD_WIDTH}, constants::{MapTile, BOARD_HEIGHT, BOARD_WIDTH},
ghosts::blinky::Blinky, entity::blinky::Blinky,
map::Map, map::Map,
}; };
use glam::{IVec2, UVec2}; use glam::{IVec2, UVec2};

View File

@@ -1,82 +0,0 @@
//! Edible entity for Pac-Man: pellets, power pellets, and fruits.
use crate::animation::{AtlasTexture, FrameDrawn};
use crate::constants::{FruitType, MapTile, BOARD_HEIGHT, BOARD_WIDTH};
use crate::direction::Direction;
use crate::entity::{Entity, Renderable, StaticEntity};
use crate::map::Map;
use glam::{IVec2, UVec2};
use sdl2::{render::Canvas, video::Window};
use std::cell::RefCell;
use std::rc::Rc;
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum EdibleKind {
Pellet,
PowerPellet,
Fruit(FruitType),
}
pub struct Edible<'a> {
pub base: StaticEntity,
pub kind: EdibleKind,
pub sprite: Rc<AtlasTexture<'a>>,
}
impl<'a> Edible<'a> {
pub fn new(kind: EdibleKind, cell_position: UVec2, sprite: Rc<AtlasTexture<'a>>) -> Self {
let pixel_position = Map::cell_to_pixel(cell_position);
Edible {
base: StaticEntity::new(pixel_position, cell_position),
kind,
sprite,
}
}
/// Checks collision with Pac-Man (or any entity)
pub fn collide(&self, pacman: &dyn Entity) -> bool {
self.base.is_colliding(pacman)
}
}
impl<'a> Entity for Edible<'a> {
fn base(&self) -> &StaticEntity {
&self.base
}
}
impl<'a> Renderable for Edible<'a> {
fn render(&self, canvas: &mut Canvas<Window>) {
let pos = self.base.pixel_position;
self.sprite.render(canvas, (pos.x, pos.y), Direction::Right, Some(0));
}
}
/// Reconstruct all edibles from the original map layout
pub fn reconstruct_edibles<'a>(
map: Rc<RefCell<Map>>,
pellet_sprite: Rc<AtlasTexture<'a>>,
power_pellet_sprite: Rc<AtlasTexture<'a>>,
_fruit_sprite: Rc<AtlasTexture<'a>>,
) -> Vec<Edible<'a>> {
let mut edibles = Vec::new();
for x in 0..BOARD_WIDTH {
for y in 0..BOARD_HEIGHT {
let tile = map.borrow().get_tile(IVec2::new(x as i32, y as i32));
match tile {
Some(MapTile::Pellet) => {
edibles.push(Edible::new(EdibleKind::Pellet, UVec2::new(x, y), Rc::clone(&pellet_sprite)));
}
Some(MapTile::PowerPellet) => {
edibles.push(Edible::new(
EdibleKind::PowerPellet,
UVec2::new(x, y),
Rc::clone(&power_pellet_sprite),
));
}
// Fruits can be added here if you have fruit positions
_ => {}
}
}
}
edibles
}

31
src/emscripten.rs Normal file
View File

@@ -0,0 +1,31 @@
#[allow(dead_code)]
#[cfg(target_os = "emscripten")]
pub mod emscripten {
use std::os::raw::c_uint;
extern "C" {
pub fn emscripten_get_now() -> f64;
pub fn emscripten_sleep(ms: c_uint);
pub fn emscripten_get_element_css_size(target: *const u8, width: *mut f64, height: *mut f64) -> i32;
}
// milliseconds since start of program
pub fn now() -> f64 {
unsafe { emscripten_get_now() }
}
pub fn sleep(ms: u32) {
unsafe {
emscripten_sleep(ms);
}
}
pub fn get_canvas_size() -> (u32, u32) {
let mut width = 0.0;
let mut height = 0.0;
unsafe {
emscripten_get_element_css_size("canvas\0".as_ptr(), &mut width, &mut height);
}
(width as u32, height as u32)
}
}

View File

@@ -4,32 +4,32 @@ use std::rc::Rc;
use sdl2::render::{Canvas, Texture}; use sdl2::render::{Canvas, Texture};
use sdl2::video::Window; use sdl2::video::Window;
use crate::direction::Direction; use crate::entity::direction::Direction;
use crate::entity::ghost::{Ghost, GhostMode, GhostType};
use crate::entity::pacman::Pacman;
use crate::entity::{Entity, Moving, Renderable, StaticEntity}; use crate::entity::{Entity, Moving, Renderable, StaticEntity};
use crate::ghost::{Ghost, GhostMode, GhostType};
use crate::map::Map; use crate::map::Map;
use crate::pacman::Pacman;
use glam::{IVec2, UVec2}; use glam::{IVec2, UVec2};
pub struct Blinky<'a> { pub struct Blinky {
ghost: Ghost<'a>, ghost: Ghost,
} }
impl<'a> Blinky<'a> { impl Blinky {
pub fn new( pub fn new(
starting_position: UVec2, starting_position: UVec2,
body_texture: Texture<'a>, body_texture: Texture<'_>,
eyes_texture: Texture<'a>, eyes_texture: Texture<'_>,
map: Rc<RefCell<Map>>, map: Rc<RefCell<Map>>,
pacman: Rc<RefCell<Pacman<'a>>>, pacman: Rc<RefCell<Pacman>>,
) -> Blinky<'a> { ) -> Blinky {
Blinky { Blinky {
ghost: Ghost::new(GhostType::Blinky, starting_position, body_texture, eyes_texture, map, pacman), ghost: Ghost::new(GhostType::Blinky, starting_position, body_texture, eyes_texture, map, pacman),
} }
} }
/// Gets Blinky's chase target - directly targets Pac-Man's current position /// Gets Blinky's chase target - directly targets Pac-Man's current position
fn get_chase_target(&self) -> IVec2 { pub fn get_chase_target(&self) -> IVec2 {
let pacman = self.ghost.pacman.borrow(); let pacman = self.ghost.pacman.borrow();
let cell = pacman.base().cell_position; let cell = pacman.base().cell_position;
IVec2::new(cell.x as i32, cell.y as i32) IVec2::new(cell.x as i32, cell.y as i32)
@@ -44,19 +44,19 @@ impl<'a> Blinky<'a> {
} }
} }
impl<'a> Entity for Blinky<'a> { impl Entity for Blinky {
fn base(&self) -> &StaticEntity { fn base(&self) -> &StaticEntity {
self.ghost.base.base() self.ghost.base.base()
} }
} }
impl<'a> Renderable for Blinky<'a> { impl Renderable for Blinky {
fn render(&self, canvas: &mut Canvas<Window>) { fn render(&self, canvas: &mut Canvas<Window>) {
self.ghost.render(canvas); self.ghost.render(canvas);
} }
} }
impl<'a> Moving for Blinky<'a> { impl Moving for Blinky {
fn move_forward(&mut self) { fn move_forward(&mut self) {
self.ghost.move_forward(); self.ghost.move_forward();
} }
@@ -81,15 +81,15 @@ impl<'a> Moving for Blinky<'a> {
} }
// Allow direct access to ghost fields // Allow direct access to ghost fields
impl<'a> std::ops::Deref for Blinky<'a> { impl std::ops::Deref for Blinky {
type Target = Ghost<'a>; type Target = Ghost;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
&self.ghost &self.ghost
} }
} }
impl<'a> std::ops::DerefMut for Blinky<'a> { impl std::ops::DerefMut for Blinky {
fn deref_mut(&mut self) -> &mut Self::Target { fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.ghost &mut self.ghost
} }

View File

@@ -1,5 +1,6 @@
//! This module defines the `Direction` enum, which is used to represent the //! This module defines the `Direction` enum, which is used to represent the
//! direction of an entity. //! direction of an entity.
use glam::IVec2;
use sdl2::keyboard::Keycode; use sdl2::keyboard::Keycode;
/// An enum representing the direction of an entity. /// An enum representing the direction of an entity.
@@ -23,12 +24,12 @@ impl Direction {
} }
/// Returns the offset of the direction as a tuple of (x, y). /// Returns the offset of the direction as a tuple of (x, y).
pub fn offset(&self) -> (i32, i32) { pub fn offset(&self) -> IVec2 {
match self { match self {
Direction::Right => (1, 0), Direction::Right => IVec2::new(1, 0),
Direction::Down => (0, 1), Direction::Down => IVec2::new(0, 1),
Direction::Left => (-1, 0), Direction::Left => IVec2::new(-1, 0),
Direction::Up => (0, -1), Direction::Up => IVec2::new(0, -1),
} }
} }

96
src/entity/edible.rs Normal file
View File

@@ -0,0 +1,96 @@
//! Edible entity for Pac-Man: pellets, power pellets, and fruits.
use crate::constants::{FruitType, MapTile, BOARD_HEIGHT, BOARD_WIDTH};
use crate::entity::direction::Direction;
use crate::entity::{Entity, Renderable, StaticEntity};
use crate::map::Map;
use crate::texture::atlas::AtlasTexture;
use crate::texture::blinking::BlinkingTexture;
use crate::texture::FrameDrawn;
use glam::{IVec2, UVec2};
use sdl2::{render::Canvas, video::Window};
use std::cell::RefCell;
use std::rc::Rc;
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum EdibleKind {
Pellet,
PowerPellet,
Fruit(FruitType),
}
pub enum EdibleSprite {
Pellet(Rc<Box<dyn FrameDrawn>>),
PowerPellet(Rc<RefCell<BlinkingTexture>>),
}
pub struct Edible {
pub base: StaticEntity,
pub kind: EdibleKind,
pub sprite: EdibleSprite,
}
impl Edible {
pub fn new_pellet(cell_position: UVec2, sprite: Rc<Box<dyn FrameDrawn>>) -> Self {
let pixel_position = Map::cell_to_pixel(cell_position);
Edible {
base: StaticEntity::new(pixel_position, cell_position),
kind: EdibleKind::Pellet,
sprite: EdibleSprite::Pellet(sprite),
}
}
pub fn new_power_pellet(cell_position: UVec2, sprite: Rc<RefCell<BlinkingTexture>>) -> Self {
let pixel_position = Map::cell_to_pixel(cell_position);
Edible {
base: StaticEntity::new(pixel_position, cell_position),
kind: EdibleKind::PowerPellet,
sprite: EdibleSprite::PowerPellet(sprite),
}
}
/// Checks collision with Pac-Man (or any entity)
pub fn collide(&self, pacman: &dyn Entity) -> bool {
self.base.is_colliding(pacman)
}
}
impl Entity for Edible {
fn base(&self) -> &StaticEntity {
&self.base
}
}
impl Renderable for Edible {
fn render(&self, canvas: &mut Canvas<Window>) {
let pos = self.base.pixel_position;
match &self.sprite {
EdibleSprite::Pellet(sprite) => sprite.render(canvas, pos, Direction::Right, Some(0)),
EdibleSprite::PowerPellet(sprite) => sprite.borrow().render(canvas, pos, Direction::Right, Some(0)),
}
}
}
/// Reconstruct all edibles from the original map layout
pub fn reconstruct_edibles(
map: Rc<RefCell<Map>>,
pellet_sprite: Rc<Box<dyn FrameDrawn>>,
power_pellet_sprite: Rc<RefCell<BlinkingTexture>>,
_fruit_sprite: Rc<Box<dyn FrameDrawn>>,
) -> Vec<Edible> {
let mut edibles = Vec::new();
for x in 0..BOARD_WIDTH {
for y in 0..BOARD_HEIGHT {
let tile = map.borrow().get_tile(IVec2::new(x as i32, y as i32));
match tile {
Some(MapTile::Pellet) => {
edibles.push(Edible::new_pellet(UVec2::new(x, y), Rc::clone(&pellet_sprite)));
}
Some(MapTile::PowerPellet) => {
edibles.push(Edible::new_power_pellet(UVec2::new(x, y), Rc::clone(&power_pellet_sprite)));
}
// Fruits can be added here if you have fruit positions
_ => {}
}
}
}
edibles
}

View File

@@ -1,12 +1,16 @@
use rand::rngs::SmallRng;
use rand::Rng; use rand::Rng;
use rand::SeedableRng;
use crate::animation::{AnimatedAtlasTexture, FrameDrawn};
use crate::constants::{MapTile, BOARD_WIDTH}; use crate::constants::{MapTile, BOARD_WIDTH};
use crate::direction::Direction; use crate::entity::direction::Direction;
use crate::entity::pacman::Pacman;
use crate::entity::{Entity, MovableEntity, Moving, Renderable}; use crate::entity::{Entity, MovableEntity, Moving, Renderable};
use crate::map::Map; use crate::map::Map;
use crate::modulation::{SimpleTickModulator, TickModulator}; use crate::modulation::{SimpleTickModulator, TickModulator};
use crate::pacman::Pacman; use crate::texture::animated::AnimatedAtlasTexture;
use crate::texture::atlas::{texture_to_static, AtlasTexture};
use crate::texture::FrameDrawn;
use glam::{IVec2, UVec2}; use glam::{IVec2, UVec2};
use sdl2::pixels::Color; use sdl2::pixels::Color;
use sdl2::render::Texture; use sdl2::render::Texture;
@@ -50,7 +54,7 @@ impl GhostType {
} }
/// Base ghost struct that contains common functionality /// Base ghost struct that contains common functionality
pub struct Ghost<'a> { pub struct Ghost {
/// Shared movement and position fields. /// Shared movement and position fields.
pub base: MovableEntity, pub base: MovableEntity,
/// The current mode of the ghost /// The current mode of the ghost
@@ -58,23 +62,30 @@ pub struct Ghost<'a> {
/// The type/personality of this ghost /// The type/personality of this ghost
pub ghost_type: GhostType, pub ghost_type: GhostType,
/// Reference to Pac-Man for targeting /// Reference to Pac-Man for targeting
pub pacman: Rc<RefCell<Pacman<'a>>>, pub pacman: Rc<RefCell<Pacman>>,
pub body_sprite: AnimatedAtlasTexture<'a>, pub body_sprite: AnimatedAtlasTexture,
pub eyes_sprite: AnimatedAtlasTexture<'a>, pub eyes_sprite: AnimatedAtlasTexture,
} }
impl Ghost<'_> { impl Ghost {
/// Creates a new ghost instance /// Creates a new ghost instance
pub fn new<'a>( pub fn new(
ghost_type: GhostType, ghost_type: GhostType,
starting_position: UVec2, starting_position: UVec2,
body_texture: Texture<'a>, body_texture: Texture<'_>,
eyes_texture: Texture<'a>, eyes_texture: Texture<'_>,
map: Rc<RefCell<Map>>, map: Rc<RefCell<Map>>,
pacman: Rc<RefCell<Pacman<'a>>>, pacman: Rc<RefCell<Pacman>>,
) -> Ghost<'a> { ) -> Ghost {
let color = ghost_type.color(); let color = ghost_type.color();
let mut body_sprite = AnimatedAtlasTexture::new(body_texture, 8, 2, 32, 32, Some((-4, -4))); let mut body_sprite = AnimatedAtlasTexture::new(
unsafe { texture_to_static(body_texture) },
8,
2,
32,
32,
Some(IVec2::new(-4, -4)),
);
body_sprite.set_color_modulation(color.r, color.g, color.b); body_sprite.set_color_modulation(color.r, color.g, color.b);
let pixel_position = Map::cell_to_pixel(starting_position); let pixel_position = Map::cell_to_pixel(starting_position);
Ghost { Ghost {
@@ -90,7 +101,14 @@ impl Ghost<'_> {
ghost_type, ghost_type,
pacman, pacman,
body_sprite, body_sprite,
eyes_sprite: AnimatedAtlasTexture::new(eyes_texture, 1, 4, 32, 32, Some((-4, -4))), eyes_sprite: AnimatedAtlasTexture::new(
unsafe { texture_to_static(eyes_texture) },
1,
4,
32,
32,
Some((-4, -4).into()),
),
} }
} }
@@ -117,7 +135,7 @@ impl Ghost<'_> {
/// Gets a random adjacent tile for frightened mode /// Gets a random adjacent tile for frightened mode
fn get_random_target(&self) -> IVec2 { fn get_random_target(&self) -> IVec2 {
let mut rng = rand::rng(); let mut rng = SmallRng::from_os_rng();
let mut possible_moves = Vec::new(); let mut possible_moves = Vec::new();
// Check all four directions // Check all four directions
@@ -178,8 +196,8 @@ impl Ghost<'_> {
} }
} }
for dir in &[Direction::Up, Direction::Down, Direction::Left, Direction::Right] { for dir in &[Direction::Up, Direction::Down, Direction::Left, Direction::Right] {
let (dx, dy) = dir.offset(); let offset = dir.offset();
let next_p = IVec2::new(p.x as i32 + dx, p.y as i32 + dy); let next_p = IVec2::new(p.x as i32 + offset.x, p.y as i32 + offset.y);
if let Some(tile) = map.get_tile(next_p) { if let Some(tile) = map.get_tile(next_p) {
if tile == MapTile::Wall { if tile == MapTile::Wall {
continue; continue;
@@ -264,7 +282,7 @@ impl Ghost<'_> {
} }
} }
impl<'a> Moving for Ghost<'a> { impl Moving for Ghost {
fn move_forward(&mut self) { fn move_forward(&mut self) {
self.base.move_forward(); self.base.move_forward();
} }
@@ -288,10 +306,10 @@ impl<'a> Moving for Ghost<'a> {
} }
} }
impl<'a> Renderable for Ghost<'a> { impl Renderable for Ghost {
fn render(&self, canvas: &mut sdl2::render::Canvas<sdl2::video::Window>) { fn render(&self, canvas: &mut sdl2::render::Canvas<sdl2::video::Window>) {
let pos = self.base.base.pixel_position; let pos = self.base.base.pixel_position;
self.body_sprite.render(canvas, (pos.x, pos.y), Direction::Right, None); self.body_sprite.render(canvas, pos, Direction::Right, None);
// Inline the eye_frame logic here // Inline the eye_frame logic here
let eye_frame = if self.mode == GhostMode::Frightened { let eye_frame = if self.mode == GhostMode::Frightened {
4 // Frightened frame 4 // Frightened frame
@@ -303,7 +321,6 @@ impl<'a> Renderable for Ghost<'a> {
Direction::Down => 3, Direction::Down => 3,
} }
}; };
self.eyes_sprite self.eyes_sprite.render(canvas, pos, Direction::Right, Some(eye_frame));
.render(canvas, (pos.x, pos.y), Direction::Right, Some(eye_frame));
} }
} }

View File

@@ -1,6 +1,12 @@
pub mod blinky;
pub mod direction;
pub mod edible;
pub mod ghost;
pub mod pacman;
use crate::{ use crate::{
constants::{MapTile, BOARD_OFFSET, BOARD_WIDTH, CELL_SIZE}, constants::{MapTile, BOARD_OFFSET, BOARD_WIDTH, CELL_SIZE},
direction::Direction, entity::direction::Direction,
map::Map, map::Map,
modulation::SimpleTickModulator, modulation::SimpleTickModulator,
}; };
@@ -108,7 +114,7 @@ impl Moving for MovableEntity {
); );
} }
fn next_cell(&self, direction: Option<Direction>) -> IVec2 { fn next_cell(&self, direction: Option<Direction>) -> IVec2 {
let (x, y) = direction.unwrap_or(self.direction).offset(); let IVec2 { x, y } = direction.unwrap_or(self.direction).offset();
IVec2::new(self.base.cell_position.x as i32 + x, self.base.cell_position.y as i32 + y) IVec2::new(self.base.cell_position.x as i32 + x, self.base.cell_position.y as i32 + y)
} }
fn is_wall_ahead(&self, direction: Option<Direction>) -> bool { fn is_wall_ahead(&self, direction: Option<Direction>) -> bool {

View File

@@ -8,33 +8,33 @@ use sdl2::{
}; };
use crate::{ use crate::{
animation::{AnimatedAtlasTexture, FrameDrawn}, entity::{direction::Direction, Entity, MovableEntity, Moving, Renderable, StaticEntity},
direction::Direction,
entity::{Entity, MovableEntity, Moving, Renderable, StaticEntity},
map::Map, map::Map,
modulation::{SimpleTickModulator, TickModulator}, modulation::{SimpleTickModulator, TickModulator},
texture::animated::AnimatedAtlasTexture,
texture::FrameDrawn,
}; };
use glam::{IVec2, UVec2}; use glam::{IVec2, UVec2};
/// The Pac-Man entity. /// The Pac-Man entity.
pub struct Pacman<'a> { pub struct Pacman {
/// Shared movement and position fields. /// Shared movement and position fields.
pub base: MovableEntity, pub base: MovableEntity,
/// The next direction of Pac-Man, which will be applied when Pac-Man is next aligned with the grid. /// The next direction of Pac-Man, which will be applied when Pac-Man is next aligned with the grid.
pub next_direction: Option<Direction>, pub next_direction: Option<Direction>,
/// Whether Pac-Man is currently stopped. /// Whether Pac-Man is currently stopped.
pub stopped: bool, pub stopped: bool,
pub sprite: AnimatedAtlasTexture<'a>, pub sprite: AnimatedAtlasTexture,
} }
impl<'a> Entity for Pacman<'a> { impl Entity for Pacman {
fn base(&self) -> &StaticEntity { fn base(&self) -> &StaticEntity {
&self.base.base &self.base.base
} }
} }
impl<'a> Moving for Pacman<'a> { impl Moving for Pacman {
fn move_forward(&mut self) { fn move_forward(&mut self) {
self.base.move_forward(); self.base.move_forward();
} }
@@ -58,9 +58,9 @@ impl<'a> Moving for Pacman<'a> {
} }
} }
impl Pacman<'_> { impl Pacman {
/// Creates a new `Pacman` instance. /// Creates a new `Pacman` instance.
pub fn new<'a>(starting_position: UVec2, atlas: Texture<'a>, map: Rc<RefCell<Map>>) -> Pacman<'a> { pub fn new(starting_position: UVec2, atlas: Texture<'_>, map: Rc<RefCell<Map>>) -> Pacman {
let pixel_position = Map::cell_to_pixel(starting_position); let pixel_position = Map::cell_to_pixel(starting_position);
Pacman { Pacman {
base: MovableEntity::new( base: MovableEntity::new(
@@ -73,7 +73,14 @@ impl Pacman<'_> {
), ),
next_direction: None, next_direction: None,
stopped: false, stopped: false,
sprite: AnimatedAtlasTexture::new(atlas, 2, 3, 32, 32, Some((-4, -4))), sprite: AnimatedAtlasTexture::new(
unsafe { crate::texture::atlas::texture_to_static(atlas) },
2,
3,
32,
32,
Some(IVec2::new(-4, -4)),
),
} }
} }
@@ -119,14 +126,14 @@ impl Pacman<'_> {
} }
} }
impl Renderable for Pacman<'_> { impl Renderable for Pacman {
fn render(&self, canvas: &mut Canvas<Window>) { fn render(&self, canvas: &mut Canvas<Window>) {
let pos = self.base.base.pixel_position; let pos = self.base.base.pixel_position;
let dir = self.base.direction; let dir = self.base.direction;
if self.stopped { if self.stopped {
self.sprite.render(canvas, (pos.x, pos.y), dir, Some(2)); self.sprite.render(canvas, pos, dir, Some(2));
} else { } else {
self.sprite.render(canvas, (pos.x, pos.y), dir, None); self.sprite.render(canvas, pos, dir, None);
} }
} }
} }

View File

@@ -3,8 +3,10 @@ use std::cell::RefCell;
use std::ops::Not; use std::ops::Not;
use std::rc::Rc; use std::rc::Rc;
use glam::UVec2; use glam::{IVec2, UVec2};
use rand::rngs::SmallRng;
use rand::seq::IteratorRandom; use rand::seq::IteratorRandom;
use rand::SeedableRng;
use sdl2::image::LoadTexture; use sdl2::image::LoadTexture;
use sdl2::keyboard::Keycode; use sdl2::keyboard::Keycode;
use sdl2::render::{Texture, TextureCreator}; use sdl2::render::{Texture, TextureCreator};
@@ -13,38 +15,40 @@ use sdl2::ttf::Font;
use sdl2::video::WindowContext; use sdl2::video::WindowContext;
use sdl2::{pixels::Color, render::Canvas, video::Window}; use sdl2::{pixels::Color, render::Canvas, video::Window};
use crate::animation::AtlasTexture;
use crate::asset::{get_asset_bytes, Asset}; use crate::asset::{get_asset_bytes, Asset};
use crate::audio::Audio; use crate::audio::Audio;
use crate::constants::RAW_BOARD; use crate::constants::RAW_BOARD;
use crate::debug::{DebugMode, DebugRenderer}; use crate::debug::{DebugMode, DebugRenderer};
use crate::direction::Direction; use crate::entity::blinky::Blinky;
use crate::edible::{reconstruct_edibles, Edible, EdibleKind}; use crate::entity::direction::Direction;
use crate::entity::edible::{reconstruct_edibles, Edible, EdibleKind};
use crate::entity::pacman::Pacman;
use crate::entity::Renderable; use crate::entity::Renderable;
use crate::ghosts::blinky::Blinky;
use crate::map::Map; use crate::map::Map;
use crate::pacman::Pacman; use crate::texture::atlas::{texture_to_static, AtlasTexture};
use crate::texture::blinking::BlinkingTexture;
use crate::texture::FrameDrawn;
/// The main game state. /// The main game state.
/// ///
/// This struct contains all the information necessary to run the game, including /// This struct contains all the information necessary to run the game, including
/// the canvas, textures, fonts, game objects, and the current score. /// the canvas, textures, fonts, game objects, and the current score.
pub struct Game<'a> { pub struct Game {
canvas: &'a mut Canvas<Window>, canvas: &'static mut Canvas<Window>,
map_texture: Texture<'a>, map_texture: Texture<'static>,
pellet_texture: Rc<AtlasTexture<'a>>, pellet_texture: Rc<Box<dyn FrameDrawn>>,
power_pellet_texture: Rc<AtlasTexture<'a>>, power_pellet_texture: Rc<RefCell<BlinkingTexture>>,
font: Font<'a, 'static>, font: Font<'static, 'static>,
pacman: Rc<RefCell<Pacman<'a>>>, pacman: Rc<RefCell<Pacman>>,
map: Rc<RefCell<Map>>, map: Rc<RefCell<Map>>,
debug_mode: DebugMode, debug_mode: DebugMode,
score: u32, score: u32,
pub audio: Audio, pub audio: Audio,
blinky: Blinky<'a>, blinky: Blinky,
edibles: Vec<Edible<'a>>, edibles: Vec<Edible>,
} }
impl<'a> Game<'a> { impl Game {
/// Creates a new `Game` instance. /// Creates a new `Game` instance.
/// ///
/// # Arguments /// # Arguments
@@ -54,11 +58,11 @@ impl<'a> Game<'a> {
/// * `ttf_context` - The SDL TTF context. /// * `ttf_context` - The SDL TTF context.
/// * `_audio_subsystem` - The SDL audio subsystem (currently unused). /// * `_audio_subsystem` - The SDL audio subsystem (currently unused).
pub fn new( pub fn new(
canvas: &'a mut Canvas<Window>, canvas: &'static mut Canvas<Window>,
texture_creator: &'a TextureCreator<WindowContext>, texture_creator: &TextureCreator<WindowContext>,
ttf_context: &'a sdl2::ttf::Sdl2TtfContext, ttf_context: &sdl2::ttf::Sdl2TtfContext,
_audio_subsystem: &'a sdl2::AudioSubsystem, _audio_subsystem: &sdl2::AudioSubsystem,
) -> Game<'a> { ) -> Game {
let map = Rc::new(RefCell::new(Map::new(RAW_BOARD))); let map = Rc::new(RefCell::new(Map::new(RAW_BOARD)));
// Load Pacman texture from asset API // Load Pacman texture from asset API
@@ -89,17 +93,21 @@ impl<'a> Game<'a> {
// Load pellet texture from asset API // Load pellet texture from asset API
let pellet_bytes = get_asset_bytes(Asset::Pellet).expect("Failed to load asset"); let pellet_bytes = get_asset_bytes(Asset::Pellet).expect("Failed to load asset");
let pellet_texture = Rc::new(AtlasTexture::new( let power_pellet_bytes = get_asset_bytes(Asset::Energizer).expect("Failed to load asset");
texture_creator let pellet_texture: Rc<Box<dyn FrameDrawn>> = Rc::new(Box::new(AtlasTexture::new(
.load_texture_bytes(&pellet_bytes) unsafe {
.expect("Could not load pellet texture from asset API"), texture_to_static(
texture_creator
.load_texture_bytes(&pellet_bytes)
.expect("Could not load pellet texture from asset API"),
)
},
1, 1,
24, 24,
24, 24,
None, None,
)); )));
let power_pellet_bytes = get_asset_bytes(Asset::Energizer).expect("Failed to load asset"); let power_pellet_texture = Rc::new(RefCell::new(BlinkingTexture::new(
let power_pellet_texture = Rc::new(AtlasTexture::new(
texture_creator texture_creator
.load_texture_bytes(&power_pellet_bytes) .load_texture_bytes(&power_pellet_bytes)
.expect("Could not load power pellet texture from asset API"), .expect("Could not load power pellet texture from asset API"),
@@ -107,7 +115,9 @@ impl<'a> Game<'a> {
24, 24,
24, 24,
None, None,
)); 30, // on_ticks
9, // off_ticks
)));
// Load map texture from asset API // Load map texture from asset API
let map_bytes = get_asset_bytes(Asset::Map).expect("Failed to load asset"); let map_bytes = get_asset_bytes(Asset::Map).expect("Failed to load asset");
@@ -115,6 +125,7 @@ impl<'a> Game<'a> {
.load_texture_bytes(&map_bytes) .load_texture_bytes(&map_bytes)
.expect("Could not load map texture from asset API"); .expect("Could not load map texture from asset API");
map_texture.set_color_mod(0, 0, 255); map_texture.set_color_mod(0, 0, 255);
let map_texture = unsafe { texture_to_static(map_texture) };
let edibles = reconstruct_edibles( let edibles = reconstruct_edibles(
Rc::clone(&map), Rc::clone(&map),
@@ -128,7 +139,9 @@ impl<'a> Game<'a> {
let font_bytes = get_asset_bytes(Asset::FontKonami).expect("Failed to load asset").into_owned(); let font_bytes = get_asset_bytes(Asset::FontKonami).expect("Failed to load asset").into_owned();
let font_bytes_static: &'static [u8] = Box::leak(font_bytes.into_boxed_slice()); let font_bytes_static: &'static [u8] = Box::leak(font_bytes.into_boxed_slice());
let font_rwops = RWops::from_bytes(font_bytes_static).expect("Failed to create RWops for font"); let font_rwops = RWops::from_bytes(font_bytes_static).expect("Failed to create RWops for font");
ttf_context // Leak the ttf_context to get a 'static lifetime
let ttf_context_static: &'static sdl2::ttf::Sdl2TtfContext = unsafe { std::mem::transmute(ttf_context) };
ttf_context_static
.load_font_from_rwops(font_rwops, 24) .load_font_from_rwops(font_rwops, 24)
.expect("Could not load font from asset API") .expect("Could not load font from asset API")
}; };
@@ -211,7 +224,7 @@ impl<'a> Game<'a> {
{ {
let mut map = self.map.borrow_mut(); let mut map = self.map.borrow_mut();
let valid_positions = map.get_valid_playable_positions(); let valid_positions = map.get_valid_playable_positions();
let mut rng = rand::rng(); let mut rng = SmallRng::from_os_rng();
// Randomize Pac-Man position // Randomize Pac-Man position
if let Some(pos) = valid_positions.iter().choose(&mut rng) { if let Some(pos) = valid_positions.iter().choose(&mut rng) {
@@ -230,7 +243,7 @@ impl<'a> Game<'a> {
self.blinky.base.base.cell_position = *pos; self.blinky.base.base.cell_position = *pos;
self.blinky.base.in_tunnel = false; self.blinky.base.in_tunnel = false;
self.blinky.base.direction = Direction::Left; self.blinky.base.direction = Direction::Left;
self.blinky.mode = crate::ghost::GhostMode::Chase; self.blinky.mode = crate::entity::ghost::GhostMode::Chase;
} }
} }
@@ -249,6 +262,9 @@ impl<'a> Game<'a> {
self.blinky.body_sprite.tick(); self.blinky.body_sprite.tick();
self.blinky.eyes_sprite.tick(); self.blinky.eyes_sprite.tick();
// Advance blinking for power pellets
self.power_pellet_texture.borrow_mut().tick();
let pacman = self.pacman.borrow(); let pacman = self.pacman.borrow();
let mut eaten_indices = vec![]; let mut eaten_indices = vec![];
for (i, edible) in self.edibles.iter().enumerate() { for (i, edible) in self.edibles.iter().enumerate() {
@@ -338,18 +354,18 @@ impl<'a> Game<'a> {
// Render the score and high score // Render the score and high score
self.render_text( self.render_text(
&format!("{lives}UP HIGH SCORE "), &format!("{lives}UP HIGH SCORE "),
(24 * lives_offset + x_offset, y_offset), IVec2::new(24 * lives_offset + x_offset, y_offset),
Color::WHITE, Color::WHITE,
); );
self.render_text( self.render_text(
&score_text, &score_text,
(24 * score_offset + x_offset, 24 + y_offset + gap_offset), IVec2::new(24 * score_offset + x_offset, 24 + y_offset + gap_offset),
Color::WHITE, Color::WHITE,
); );
} }
/// Renders text to the screen at the given position. /// Renders text to the screen at the given position.
fn render_text(&mut self, text: &str, position: (i32, i32), color: Color) { fn render_text(&mut self, text: &str, position: IVec2, color: Color) {
let surface = self.font.render(text).blended(color).expect("Could not render text surface"); let surface = self.font.render(text).blended(color).expect("Could not render text surface");
let texture_creator = self.canvas.texture_creator(); let texture_creator = self.canvas.texture_creator();
@@ -358,7 +374,7 @@ impl<'a> Game<'a> {
.expect("Could not create texture from surface"); .expect("Could not create texture from surface");
let query = texture.query(); let query = texture.query();
let dst_rect = sdl2::rect::Rect::new(position.0, position.1, query.width, query.height); let dst_rect = sdl2::rect::Rect::new(position.x, position.y, query.width, query.height);
self.canvas self.canvas
.copy(&texture, None, Some(dst_rect)) .copy(&texture, None, Some(dst_rect))

View File

@@ -1 +0,0 @@
pub mod blinky;

View File

@@ -52,21 +52,38 @@ unsafe fn attach_console() {
// Do NOT call AllocConsole here - we don't want a console when launched from Explorer // Do NOT call AllocConsole here - we don't want a console when launched from Explorer
} }
mod animation;
mod asset; mod asset;
mod audio; mod audio;
mod constants; mod constants;
mod debug; mod debug;
mod direction; #[cfg(target_os = "emscripten")]
mod edible; mod emscripten;
mod entity; mod entity;
mod game; mod game;
mod ghost;
mod ghosts;
mod helper; mod helper;
mod map; mod map;
mod modulation; mod modulation;
mod pacman; mod texture;
#[cfg(not(target_os = "emscripten"))]
fn sleep(value: Duration) {
spin_sleep::sleep(value);
}
#[cfg(target_os = "emscripten")]
fn sleep(value: Duration) {
emscripten::emscripten::sleep(value.as_millis() as u32);
}
#[cfg(target_os = "emscripten")]
fn now() -> std::time::Instant {
std::time::Instant::now() + std::time::Duration::from_millis(emscripten::emscripten::now() as u64)
}
#[cfg(not(target_os = "emscripten"))]
fn now() -> std::time::Instant {
std::time::Instant::now()
}
/// The main entry point of the application. /// The main entry point of the application.
/// ///
@@ -106,7 +123,8 @@ pub fn main() {
.expect("Could not set logical size"); .expect("Could not set logical size");
let texture_creator = canvas.texture_creator(); let texture_creator = canvas.texture_creator();
let mut game = Game::new(&mut canvas, &texture_creator, &ttf_context, &audio_subsystem); let canvas_static: &'static mut sdl2::render::Canvas<sdl2::video::Window> = Box::leak(Box::new(canvas));
let mut game = Game::new(canvas_static, &texture_creator, &ttf_context, &audio_subsystem);
game.audio.set_mute(cfg!(debug_assertions)); game.audio.set_mute(cfg!(debug_assertions));
let mut event_pump = sdl_context.event_pump().expect("Could not get SDL EventPump"); let mut event_pump = sdl_context.event_pump().expect("Could not get SDL EventPump");
@@ -179,14 +197,7 @@ pub fn main() {
if start.elapsed() < loop_time { if start.elapsed() < loop_time {
let time = loop_time.saturating_sub(start.elapsed()); let time = loop_time.saturating_sub(start.elapsed());
if time != Duration::ZERO { if time != Duration::ZERO {
#[cfg(not(target_os = "emscripten"))] sleep(time);
{
spin_sleep::sleep(time);
}
#[cfg(target_os = "emscripten")]
{
std::thread::sleep(time);
}
} }
} else { } else {
event!( event!(

View File

@@ -1,5 +1,7 @@
//! This module defines the game map and provides functions for interacting with it. //! This module defines the game map and provides functions for interacting with it.
use rand::rngs::SmallRng;
use rand::seq::IteratorRandom; use rand::seq::IteratorRandom;
use rand::SeedableRng;
use crate::constants::{MapTile, BOARD_OFFSET, CELL_SIZE}; use crate::constants::{MapTile, BOARD_OFFSET, CELL_SIZE};
use crate::constants::{BOARD_HEIGHT, BOARD_WIDTH}; use crate::constants::{BOARD_HEIGHT, BOARD_WIDTH};
@@ -120,7 +122,7 @@ impl Map {
} }
} }
} }
let mut rng = rand::rng(); let mut rng = SmallRng::from_os_rng();
let &start = pellet_positions let &start = pellet_positions
.iter() .iter()
.choose(&mut rng) .choose(&mut rng)

73
src/texture/animated.rs Normal file
View File

@@ -0,0 +1,73 @@
//! This module provides a simple animation and atlas system for textures.
use glam::IVec2;
use sdl2::{
render::{Canvas, Texture},
video::Window,
};
use crate::entity::direction::Direction;
use crate::texture::atlas::AtlasTexture;
use crate::texture::FrameDrawn;
/// An animated texture using a texture atlas.
pub struct AnimatedAtlasTexture {
pub atlas: AtlasTexture,
pub ticks_per_frame: u32,
pub ticker: u32,
pub reversed: bool,
pub paused: bool,
}
impl AnimatedAtlasTexture {
pub fn new(
texture: Texture<'static>,
ticks_per_frame: u32,
frame_count: u32,
width: u32,
height: u32,
offset: Option<IVec2>,
) -> Self {
AnimatedAtlasTexture {
atlas: AtlasTexture::new(texture, frame_count, width, height, offset),
ticks_per_frame,
ticker: 0,
reversed: false,
paused: false,
}
}
fn current_frame(&self) -> u32 {
self.ticker / self.ticks_per_frame
}
/// Advances the animation by one tick, unless paused.
pub fn tick(&mut self) {
if self.paused {
return;
}
if self.reversed {
if self.ticker > 0 {
self.ticker -= 1;
}
if self.ticker == 0 {
self.reversed = !self.reversed;
}
} else {
self.ticker += 1;
if self.ticker + 1 == self.ticks_per_frame * self.atlas.frame_count {
self.reversed = !self.reversed;
}
}
}
pub fn set_color_modulation(&mut self, r: u8, g: u8, b: u8) {
self.atlas.set_color_modulation(r, g, b);
}
}
impl FrameDrawn for AnimatedAtlasTexture {
fn render(&self, canvas: &mut Canvas<Window>, position: IVec2, direction: Direction, frame: Option<u32>) {
let frame = frame.unwrap_or_else(|| self.current_frame());
self.atlas.render(canvas, position, direction, Some(frame));
}
}

74
src/texture/atlas.rs Normal file
View File

@@ -0,0 +1,74 @@
use glam::IVec2;
use sdl2::{
rect::Rect,
render::{Canvas, Texture},
video::Window,
};
use crate::{entity::direction::Direction, texture::FrameDrawn};
/// Unsafely converts a Texture with any lifetime to a 'static lifetime.
/// Only use this if you guarantee the renderer/context will never be dropped!
pub unsafe fn texture_to_static<'a>(texture: Texture<'a>) -> Texture<'static> {
std::mem::transmute::<Texture<'a>, Texture<'static>>(texture)
}
/// A texture atlas abstraction for static (non-animated) rendering.
pub struct AtlasTexture {
pub raw_texture: Texture<'static>,
pub offset: IVec2,
pub frame_count: u32,
pub frame_width: u32,
pub frame_height: u32,
}
impl AtlasTexture {
pub fn new(texture: Texture<'static>, frame_count: u32, frame_width: u32, frame_height: u32, offset: Option<IVec2>) -> Self {
AtlasTexture {
raw_texture: texture,
frame_count,
frame_width,
frame_height,
offset: offset.unwrap_or(IVec2::new(0, 0)).into(),
}
}
pub fn get_frame_rect(&self, frame: u32) -> Option<Rect> {
if frame >= self.frame_count {
return None;
}
Some(Rect::new(
frame as i32 * self.frame_width as i32,
0,
self.frame_width,
self.frame_height,
))
}
pub fn set_color_modulation(&mut self, r: u8, g: u8, b: u8) {
self.raw_texture.set_color_mod(r, g, b);
}
}
impl FrameDrawn for AtlasTexture {
fn render(&self, canvas: &mut Canvas<Window>, position: IVec2, direction: Direction, frame: Option<u32>) {
let texture_source_frame_rect = self.get_frame_rect(frame.unwrap_or(0));
let canvas_destination_rect = Rect::new(
position.x + self.offset.x,
position.y + self.offset.y,
self.frame_width,
self.frame_height,
);
canvas
.copy_ex(
&self.raw_texture,
texture_source_frame_rect,
Some(canvas_destination_rect),
direction.angle(),
None,
false,
false,
)
.expect("Could not render texture on canvas");
}
}

62
src/texture/blinking.rs Normal file
View File

@@ -0,0 +1,62 @@
//! A texture that blinks on/off for a specified number of ticks.
use glam::IVec2;
use sdl2::{
render::{Canvas, Texture},
video::Window,
};
use crate::texture::atlas::AtlasTexture;
use crate::texture::FrameDrawn;
use crate::{entity::direction::Direction, texture::atlas::texture_to_static};
pub struct BlinkingTexture {
pub atlas: AtlasTexture,
pub on_ticks: u32,
pub off_ticks: u32,
pub ticker: u32,
pub visible: bool,
}
impl BlinkingTexture {
pub fn new(
texture: Texture<'_>,
frame_count: u32,
width: u32,
height: u32,
offset: Option<IVec2>,
on_ticks: u32,
off_ticks: u32,
) -> Self {
BlinkingTexture {
atlas: AtlasTexture::new(unsafe { texture_to_static(texture) }, frame_count, width, height, offset),
on_ticks,
off_ticks,
ticker: 0,
visible: true,
}
}
/// Advances the blinking state by one tick.
pub fn tick(&mut self) {
self.ticker += 1;
if self.visible && self.ticker >= self.on_ticks {
self.visible = false;
self.ticker = 0;
} else if !self.visible && self.ticker >= self.off_ticks {
self.visible = true;
self.ticker = 0;
}
}
pub fn set_color_modulation(&mut self, r: u8, g: u8, b: u8) {
self.atlas.set_color_modulation(r, g, b);
}
}
impl FrameDrawn for BlinkingTexture {
fn render(&self, canvas: &mut Canvas<Window>, position: IVec2, direction: Direction, frame: Option<u32>) {
if self.visible {
self.atlas.render(canvas, position, direction, frame);
}
}
}

13
src/texture/mod.rs Normal file
View File

@@ -0,0 +1,13 @@
use glam::IVec2;
use sdl2::{render::Canvas, video::Window};
use crate::entity::direction::Direction;
/// Trait for drawable atlas-based textures
pub trait FrameDrawn {
fn render(&self, canvas: &mut Canvas<Window>, position: IVec2, direction: Direction, frame: Option<u32>);
}
pub mod animated;
pub mod atlas;
pub mod blinking;