mirror of
https://github.com/Xevion/Pac-Man.git
synced 2025-12-06 23:15:42 -06:00
Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f41c550bb8 | |||
| 829462d3b6 | |||
| 002da46045 | |||
| cfa73c58a8 | |||
| 5728effcc6 | |||
| fa1a0175b0 | |||
| 85edb18380 | |||
| 3a535ee04f | |||
| 9b31b392d2 | |||
| 999fa14059 | |||
| e925376b7a | |||
| 2596034365 | |||
| 163855b6e7 | |||
| 645d48aeae |
@@ -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",
|
||||||
|
]
|
||||||
9
.github/workflows/build.yaml
vendored
9
.github/workflows/build.yaml
vendored
@@ -45,16 +45,15 @@ jobs:
|
|||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
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: |
|
||||||
@@ -90,7 +89,7 @@ jobs:
|
|||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Setup Emscripten SDK
|
- name: Setup Emscripten SDK
|
||||||
uses: mymindstorm/setup-emsdk@v14
|
uses: pyodide/setup-emsdk@v15
|
||||||
with:
|
with:
|
||||||
version: 3.1.43
|
version: 3.1.43
|
||||||
actions-cache-folder: "emsdk-cache"
|
actions-cache-folder: "emsdk-cache"
|
||||||
|
|||||||
42
Cargo.lock
generated
42
Cargo.lock
generated
@@ -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",
|
|
||||||
]
|
|
||||||
|
|||||||
10
Cargo.toml
10
Cargo.toml
@@ -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"]
|
||||||
|
|||||||
136
src/animation.rs
136
src/animation.rs
@@ -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));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -24,7 +24,7 @@ impl Audio {
|
|||||||
let frequency = 44100;
|
let frequency = 44100;
|
||||||
let format = DEFAULT_FORMAT;
|
let format = DEFAULT_FORMAT;
|
||||||
let channels = 4;
|
let channels = 4;
|
||||||
let chunk_size = 128;
|
let chunk_size = 256; // 256 is minimum for emscripten
|
||||||
|
|
||||||
mixer::open_audio(frequency, format, 1, chunk_size).expect("Failed to open audio");
|
mixer::open_audio(frequency, format, 1, chunk_size).expect("Failed to open audio");
|
||||||
mixer::allocate_channels(channels);
|
mixer::allocate_channels(channels);
|
||||||
|
|||||||
@@ -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};
|
||||||
|
|||||||
31
src/emscripten.rs
Normal file
31
src/emscripten.rs
Normal 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)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,11 +4,11 @@ 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<'a> {
|
||||||
@@ -29,7 +29,7 @@ impl<'a> Blinky<'a> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 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)
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
//! Edible entity for Pac-Man: pellets, power pellets, and fruits.
|
//! 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::constants::{FruitType, MapTile, BOARD_HEIGHT, BOARD_WIDTH};
|
||||||
use crate::direction::Direction;
|
use crate::entity::direction::Direction;
|
||||||
use crate::entity::{Entity, Renderable, StaticEntity};
|
use crate::entity::{Entity, Renderable, StaticEntity};
|
||||||
use crate::map::Map;
|
use crate::map::Map;
|
||||||
|
use crate::texture::atlas::AtlasTexture;
|
||||||
|
use crate::texture::FrameDrawn;
|
||||||
use glam::{IVec2, UVec2};
|
use glam::{IVec2, UVec2};
|
||||||
use sdl2::{render::Canvas, video::Window};
|
use sdl2::{render::Canvas, video::Window};
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
@@ -1,12 +1,15 @@
|
|||||||
|
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::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;
|
||||||
@@ -117,7 +120,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
|
||||||
@@ -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,
|
||||||
};
|
};
|
||||||
@@ -8,11 +8,11 @@ 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};
|
||||||
16
src/game.rs
16
src/game.rs
@@ -4,7 +4,9 @@ use std::ops::Not;
|
|||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
|
|
||||||
use glam::UVec2;
|
use glam::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,17 +15,17 @@ 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::AtlasTexture;
|
||||||
|
|
||||||
/// The main game state.
|
/// The main game state.
|
||||||
///
|
///
|
||||||
@@ -211,7 +213,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 +232,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
pub mod blinky;
|
|
||||||
38
src/main.rs
38
src/main.rs
@@ -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.
|
||||||
///
|
///
|
||||||
@@ -179,14 +196,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!(
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
72
src/texture/animated.rs
Normal file
72
src/texture/animated.rs
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
//! This module provides a simple animation and atlas system for textures.
|
||||||
|
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<'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));
|
||||||
|
}
|
||||||
|
}
|
||||||
67
src/texture/atlas.rs
Normal file
67
src/texture/atlas.rs
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
use sdl2::{
|
||||||
|
rect::Rect,
|
||||||
|
render::{Canvas, Texture},
|
||||||
|
video::Window,
|
||||||
|
};
|
||||||
|
|
||||||
|
use crate::{entity::direction::Direction, texture::FrameDrawn};
|
||||||
|
|
||||||
|
/// 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");
|
||||||
|
}
|
||||||
|
}
|
||||||
11
src/texture/mod.rs
Normal file
11
src/texture/mod.rs
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
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: (i32, i32), direction: Direction, frame: Option<u32>);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub mod animated;
|
||||||
|
pub mod atlas;
|
||||||
Reference in New Issue
Block a user