mirror of
https://github.com/Xevion/Pac-Man.git
synced 2025-12-06 07:15:41 -06:00
Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a295b1daf | |||
| 4398ec2936 | |||
| 324c358672 | |||
| cda8c40195 | |||
| 89b4ba125f | |||
| fcdbe62f99 | |||
| 57c7afcdb4 | |||
| 2e16c2d170 | |||
| f86c106593 | |||
| 04cf8f217f | |||
| 7e0ca4ff3d | |||
| fcc36c8a46 | |||
| 41affcd7ad | |||
| 4ecfded4ac | |||
| 25d5121a28 | |||
| 91095ed2cc | |||
| cbf52bb994 | |||
| d763b9646f | |||
| d7a9e0a304 | |||
| db720edeef |
@@ -5,6 +5,7 @@ rustflags = [
|
||||
"-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=--preload-file assets/game/",
|
||||
]
|
||||
runner = "node"
|
||||
|
||||
[target.'cfg(target_os = "linux")']
|
||||
rustflags = [
|
||||
@@ -13,4 +14,4 @@ rustflags = [
|
||||
# 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",
|
||||
]
|
||||
]
|
||||
|
||||
2
.config/nextest.toml
Normal file
2
.config/nextest.toml
Normal file
@@ -0,0 +1,2 @@
|
||||
[profile.default]
|
||||
fail-fast = false
|
||||
2
.github/workflows/audit.yaml
vendored
2
.github/workflows/audit.yaml
vendored
@@ -4,7 +4,7 @@ on: ["push", "pull_request"]
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
RUST_TOOLCHAIN: 1.86.0
|
||||
RUST_TOOLCHAIN: 1.88.0
|
||||
|
||||
jobs:
|
||||
audit:
|
||||
|
||||
49
.github/workflows/build.yaml
vendored
49
.github/workflows/build.yaml
vendored
@@ -5,9 +5,6 @@ on: ["push", "pull_request"]
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
env:
|
||||
RUST_TOOLCHAIN: 1.86.0
|
||||
|
||||
jobs:
|
||||
build:
|
||||
name: Build (${{ matrix.target }})
|
||||
@@ -18,15 +15,19 @@ jobs:
|
||||
- os: ubuntu-latest
|
||||
target: x86_64-unknown-linux-gnu
|
||||
artifact_name: pacman
|
||||
toolchain: 1.88.0
|
||||
- os: macos-13
|
||||
target: x86_64-apple-darwin
|
||||
artifact_name: pacman
|
||||
toolchain: 1.88.0
|
||||
- os: macos-latest
|
||||
target: aarch64-apple-darwin
|
||||
artifact_name: pacman
|
||||
toolchain: 1.88.0
|
||||
- os: windows-latest
|
||||
target: x86_64-pc-windows-gnu
|
||||
artifact_name: pacman.exe
|
||||
toolchain: 1.88.0
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
@@ -36,7 +37,7 @@ jobs:
|
||||
uses: dtolnay/rust-toolchain@master
|
||||
with:
|
||||
target: ${{ matrix.target }}
|
||||
toolchain: ${{ env.RUST_TOOLCHAIN }}
|
||||
toolchain: ${{ matrix.toolchain }}
|
||||
|
||||
- name: Rust Cache
|
||||
uses: Swatinem/rust-cache@v2
|
||||
@@ -92,13 +93,13 @@ jobs:
|
||||
uses: pyodide/setup-emsdk@v15
|
||||
with:
|
||||
version: 3.1.43
|
||||
actions-cache-folder: "emsdk-cache"
|
||||
actions-cache-folder: "emsdk-cache-b"
|
||||
|
||||
- name: Setup Rust (WASM32 Emscripten)
|
||||
uses: dtolnay/rust-toolchain@master
|
||||
with:
|
||||
target: wasm32-unknown-emscripten
|
||||
toolchain: ${{ env.RUST_TOOLCHAIN }}
|
||||
toolchain: 1.86.0 # we are unfortunately pinned to 1.86.0 for some reason, bulk-memory-opt related issues
|
||||
|
||||
- name: Rust Cache
|
||||
uses: Swatinem/rust-cache@v2
|
||||
@@ -110,8 +111,42 @@ jobs:
|
||||
run_install: true
|
||||
|
||||
- name: Build with Emscripten
|
||||
shell: bash
|
||||
run: |
|
||||
cargo build --target=wasm32-unknown-emscripten --release
|
||||
# Retry mechanism for Emscripten build - only retry on specific hash errors
|
||||
MAX_RETRIES=3
|
||||
RETRY_DELAY=30
|
||||
|
||||
for attempt in $(seq 1 $MAX_RETRIES); do
|
||||
echo "Build attempt $attempt of $MAX_RETRIES"
|
||||
|
||||
# Capture output and check for specific error while preserving real-time output
|
||||
if cargo build --target=wasm32-unknown-emscripten --release 2>&1 | tee /tmp/build_output.log; then
|
||||
echo "Build successful on attempt $attempt"
|
||||
break
|
||||
else
|
||||
echo "Build failed on attempt $attempt"
|
||||
|
||||
# Check if the failure was due to the specific hash error
|
||||
if grep -q "emcc: error: Unexpected hash:" /tmp/build_output.log; then
|
||||
echo "::warning::Detected 'emcc: error: Unexpected hash:' error - will retry (attempt $attempt of $MAX_RETRIES)"
|
||||
|
||||
if [ $attempt -eq $MAX_RETRIES ]; then
|
||||
echo "::error::All retry attempts failed. Exiting with error."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Waiting $RETRY_DELAY seconds before retry..."
|
||||
sleep $RETRY_DELAY
|
||||
|
||||
# Exponential backoff: double the delay for next attempt
|
||||
RETRY_DELAY=$((RETRY_DELAY * 2))
|
||||
else
|
||||
echo "Build failed but not due to hash error - not retrying"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
- name: Assemble
|
||||
run: |
|
||||
|
||||
15
.github/workflows/coverage.yaml
vendored
15
.github/workflows/coverage.yaml
vendored
@@ -18,6 +18,7 @@ jobs:
|
||||
uses: dtolnay/rust-toolchain@master
|
||||
with:
|
||||
toolchain: ${{ env.RUST_TOOLCHAIN }}
|
||||
components: llvm-tools-preview
|
||||
|
||||
- name: Rust Cache
|
||||
uses: Swatinem/rust-cache@v2
|
||||
@@ -40,19 +41,17 @@ jobs:
|
||||
cargo install cargo-vcpkg
|
||||
cargo vcpkg -v build
|
||||
|
||||
- name: Install cargo-tarpaulin
|
||||
run: cargo install cargo-tarpaulin
|
||||
- uses: taiki-e/install-action@cargo-llvm-cov
|
||||
- uses: taiki-e/install-action@nextest
|
||||
|
||||
# Note: We manually link zlib. This should be synchronized with the flags set for Linux in .cargo/config.toml.
|
||||
- name: Generate coverage report
|
||||
run: |
|
||||
cargo tarpaulin \
|
||||
--out Html \
|
||||
--output-dir coverage \
|
||||
# Manually link zlib. This should be synchronized with the flags set for Linux in .cargo/config.toml.
|
||||
--rustflags="-C link-arg=-lz"
|
||||
cargo llvm-cov --no-fail-fast --lcov --output-path lcov.info nextest
|
||||
|
||||
- name: Upload coverage to Coveralls
|
||||
uses: coverallsapp/github-action@v2
|
||||
with:
|
||||
files: ./coverage/tarpaulin-report.html
|
||||
files: ./lcov.info
|
||||
format: lcov
|
||||
allow-empty: false
|
||||
|
||||
10
.github/workflows/test.yaml
vendored
10
.github/workflows/test.yaml
vendored
@@ -4,7 +4,7 @@ on: ["push", "pull_request"]
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
RUST_TOOLCHAIN: 1.86.0
|
||||
RUST_TOOLCHAIN: 1.88.0
|
||||
|
||||
jobs:
|
||||
test:
|
||||
@@ -19,7 +19,7 @@ jobs:
|
||||
uses: dtolnay/rust-toolchain@master
|
||||
with:
|
||||
toolchain: ${{ env.RUST_TOOLCHAIN }}
|
||||
components: clippy
|
||||
components: clippy, rustfmt
|
||||
|
||||
- name: Rust Cache
|
||||
uses: Swatinem/rust-cache@v2
|
||||
@@ -42,8 +42,10 @@ jobs:
|
||||
cargo install cargo-vcpkg
|
||||
cargo vcpkg -v build
|
||||
|
||||
- name: Run tests
|
||||
run: cargo test --workspace --verbose
|
||||
- uses: taiki-e/install-action@nextest
|
||||
|
||||
- name: Run nextest
|
||||
run: cargo nextest run --workspace
|
||||
|
||||
- name: Run clippy
|
||||
run: cargo clippy -- -D warnings
|
||||
|
||||
@@ -33,7 +33,7 @@ pub struct App<'a> {
|
||||
last_tick: Instant,
|
||||
}
|
||||
|
||||
impl<'a> App<'a> {
|
||||
impl App<'_> {
|
||||
pub fn new() -> Result<Self> {
|
||||
let sdl_context = sdl2::init().map_err(|e| anyhow!(e))?;
|
||||
let video_subsystem = sdl_context.video().map_err(|e| anyhow!(e))?;
|
||||
|
||||
261
src/audio.rs
261
src/audio.rs
@@ -10,13 +10,15 @@ const SOUND_ASSETS: [Asset; 4] = [Asset::Wav1, Asset::Wav2, Asset::Wav3, Asset::
|
||||
/// The audio system for the game.
|
||||
///
|
||||
/// This struct is responsible for initializing the audio device, loading sounds,
|
||||
/// and playing them.
|
||||
/// and playing them. If audio fails to initialize, it will be disabled and all
|
||||
/// functions will silently do nothing.
|
||||
#[allow(dead_code)]
|
||||
pub struct Audio {
|
||||
_mixer_context: mixer::Sdl2MixerContext,
|
||||
_mixer_context: Option<mixer::Sdl2MixerContext>,
|
||||
sounds: Vec<Chunk>,
|
||||
next_sound_index: usize,
|
||||
muted: bool,
|
||||
disabled: bool,
|
||||
}
|
||||
|
||||
impl Default for Audio {
|
||||
@@ -27,13 +29,27 @@ impl Default for Audio {
|
||||
|
||||
impl Audio {
|
||||
/// Creates a new `Audio` instance.
|
||||
///
|
||||
/// If audio fails to initialize, the audio system will be disabled and
|
||||
/// all functions will silently do nothing.
|
||||
pub fn new() -> Self {
|
||||
let frequency = 44100;
|
||||
let format = DEFAULT_FORMAT;
|
||||
let channels = 4;
|
||||
let chunk_size = 256; // 256 is minimum for emscripten
|
||||
|
||||
mixer::open_audio(frequency, format, 1, chunk_size).expect("Failed to open audio");
|
||||
// Try to open audio, but don't panic if it fails
|
||||
if let Err(e) = mixer::open_audio(frequency, format, 1, chunk_size) {
|
||||
tracing::warn!("Failed to open audio: {}. Audio will be disabled.", e);
|
||||
return Self {
|
||||
_mixer_context: None,
|
||||
sounds: Vec::new(),
|
||||
next_sound_index: 0,
|
||||
muted: false,
|
||||
disabled: true,
|
||||
};
|
||||
}
|
||||
|
||||
mixer::allocate_channels(channels);
|
||||
|
||||
// set channel volume
|
||||
@@ -41,31 +57,72 @@ impl Audio {
|
||||
mixer::Channel(i).set_volume(32);
|
||||
}
|
||||
|
||||
let mixer_context = mixer::init(InitFlag::OGG).expect("Failed to initialize SDL2_mixer");
|
||||
// Try to initialize mixer, but don't panic if it fails
|
||||
let mixer_context = match mixer::init(InitFlag::OGG) {
|
||||
Ok(ctx) => ctx,
|
||||
Err(e) => {
|
||||
tracing::warn!("Failed to initialize SDL2_mixer: {}. Audio will be disabled.", e);
|
||||
return Self {
|
||||
_mixer_context: None,
|
||||
sounds: Vec::new(),
|
||||
next_sound_index: 0,
|
||||
muted: false,
|
||||
disabled: true,
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
let sounds: Vec<Chunk> = SOUND_ASSETS
|
||||
.iter()
|
||||
.enumerate()
|
||||
.map(|(i, asset)| {
|
||||
let data = get_asset_bytes(*asset).expect("Failed to load sound asset");
|
||||
let rwops = RWops::from_bytes(&data).unwrap_or_else(|_| panic!("Failed to create RWops for sound {}", i + 1));
|
||||
rwops
|
||||
.load_wav()
|
||||
.unwrap_or_else(|_| panic!("Failed to load sound {} from asset API", i + 1))
|
||||
})
|
||||
.collect();
|
||||
// Try to load sounds, but don't panic if any fail
|
||||
let mut sounds = Vec::new();
|
||||
for (i, asset) in SOUND_ASSETS.iter().enumerate() {
|
||||
match get_asset_bytes(*asset) {
|
||||
Ok(data) => match RWops::from_bytes(&data) {
|
||||
Ok(rwops) => match rwops.load_wav() {
|
||||
Ok(chunk) => sounds.push(chunk),
|
||||
Err(e) => {
|
||||
tracing::warn!("Failed to load sound {} from asset API: {}", i + 1, e);
|
||||
}
|
||||
},
|
||||
Err(e) => {
|
||||
tracing::warn!("Failed to create RWops for sound {}: {}", i + 1, e);
|
||||
}
|
||||
},
|
||||
Err(e) => {
|
||||
tracing::warn!("Failed to load sound asset {}: {}", i + 1, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// If no sounds loaded successfully, disable audio
|
||||
if sounds.is_empty() {
|
||||
tracing::warn!("No sounds loaded successfully. Audio will be disabled.");
|
||||
return Self {
|
||||
_mixer_context: Some(mixer_context),
|
||||
sounds: Vec::new(),
|
||||
next_sound_index: 0,
|
||||
muted: false,
|
||||
disabled: true,
|
||||
};
|
||||
}
|
||||
|
||||
Audio {
|
||||
_mixer_context: mixer_context,
|
||||
_mixer_context: Some(mixer_context),
|
||||
sounds,
|
||||
next_sound_index: 0,
|
||||
muted: false,
|
||||
disabled: false,
|
||||
}
|
||||
}
|
||||
|
||||
/// Plays the "eat" sound effect.
|
||||
///
|
||||
/// If audio is disabled or muted, this function does nothing.
|
||||
#[allow(dead_code)]
|
||||
pub fn eat(&mut self) {
|
||||
if self.disabled || self.muted || self.sounds.is_empty() {
|
||||
return;
|
||||
}
|
||||
|
||||
if let Some(chunk) = self.sounds.get(self.next_sound_index) {
|
||||
match mixer::Channel(0).play(chunk, 0) {
|
||||
Ok(channel) => {
|
||||
@@ -80,12 +137,17 @@ impl Audio {
|
||||
}
|
||||
|
||||
/// Instantly mute or unmute all channels.
|
||||
///
|
||||
/// If audio is disabled, this function does nothing.
|
||||
pub fn set_mute(&mut self, mute: bool) {
|
||||
let channels = 4;
|
||||
let volume = if mute { 0 } else { 32 };
|
||||
for i in 0..channels {
|
||||
mixer::Channel(i).set_volume(volume);
|
||||
if !self.disabled {
|
||||
let channels = 4;
|
||||
let volume = if mute { 0 } else { 32 };
|
||||
for i in 0..channels {
|
||||
mixer::Channel(i).set_volume(volume);
|
||||
}
|
||||
}
|
||||
|
||||
self.muted = mute;
|
||||
}
|
||||
|
||||
@@ -93,4 +155,163 @@ impl Audio {
|
||||
pub fn is_muted(&self) -> bool {
|
||||
self.muted
|
||||
}
|
||||
|
||||
/// Returns `true` if the audio system is disabled.
|
||||
#[allow(dead_code)]
|
||||
pub fn is_disabled(&self) -> bool {
|
||||
self.disabled
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::sync::Once;
|
||||
|
||||
static INIT: Once = Once::new();
|
||||
|
||||
fn init_sdl() -> Result<(), String> {
|
||||
INIT.call_once(|| {
|
||||
if let Err(e) = sdl2::init() {
|
||||
eprintln!("Failed to initialize SDL2: {}", e);
|
||||
}
|
||||
});
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_sound_assets_array() {
|
||||
assert_eq!(SOUND_ASSETS.len(), 4);
|
||||
assert_eq!(SOUND_ASSETS[0], Asset::Wav1);
|
||||
assert_eq!(SOUND_ASSETS[1], Asset::Wav2);
|
||||
assert_eq!(SOUND_ASSETS[2], Asset::Wav3);
|
||||
assert_eq!(SOUND_ASSETS[3], Asset::Wav4);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_audio_asset_paths() {
|
||||
// Test that all sound assets have valid paths
|
||||
for asset in SOUND_ASSETS.iter() {
|
||||
let path = asset.path();
|
||||
assert!(!path.is_empty());
|
||||
assert!(path.contains("sound/waka/"));
|
||||
assert!(path.ends_with(".ogg"));
|
||||
}
|
||||
}
|
||||
|
||||
// Only run SDL2-dependent tests if SDL2 initialization succeeds
|
||||
#[test]
|
||||
fn test_audio_basic_functionality() {
|
||||
if let Err(_) = init_sdl() {
|
||||
eprintln!("Skipping SDL2-dependent tests due to initialization failure");
|
||||
return;
|
||||
}
|
||||
|
||||
// Test basic audio creation
|
||||
let audio = Audio::new();
|
||||
assert_eq!(audio.is_muted(), false);
|
||||
assert_eq!(audio.next_sound_index, 0);
|
||||
|
||||
// Audio might be disabled if initialization failed
|
||||
if !audio.is_disabled() {
|
||||
assert_eq!(audio.sounds.len(), 4);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_audio_mute_functionality() {
|
||||
if let Err(_) = init_sdl() {
|
||||
eprintln!("Skipping SDL2-dependent tests due to initialization failure");
|
||||
return;
|
||||
}
|
||||
|
||||
let mut audio = Audio::new();
|
||||
|
||||
// Test mute/unmute
|
||||
assert_eq!(audio.is_muted(), false);
|
||||
audio.set_mute(true);
|
||||
assert_eq!(audio.is_muted(), true);
|
||||
audio.set_mute(false);
|
||||
assert_eq!(audio.is_muted(), false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_audio_sound_rotation() {
|
||||
if let Err(_) = init_sdl() {
|
||||
eprintln!("Skipping SDL2-dependent tests due to initialization failure");
|
||||
return;
|
||||
}
|
||||
|
||||
let mut audio = Audio::new();
|
||||
|
||||
// Skip test if audio is disabled
|
||||
if audio.is_disabled() {
|
||||
eprintln!("Skipping sound rotation test due to disabled audio");
|
||||
return;
|
||||
}
|
||||
|
||||
let initial_index = audio.next_sound_index;
|
||||
|
||||
// Test sound rotation
|
||||
for i in 0..4 {
|
||||
audio.eat();
|
||||
assert_eq!(audio.next_sound_index, (initial_index + i + 1) % 4);
|
||||
}
|
||||
|
||||
assert_eq!(audio.next_sound_index, initial_index);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_audio_sound_index_bounds() {
|
||||
if let Err(_) = init_sdl() {
|
||||
eprintln!("Skipping SDL2-dependent tests due to initialization failure");
|
||||
return;
|
||||
}
|
||||
|
||||
let audio = Audio::new();
|
||||
|
||||
// Skip test if audio is disabled
|
||||
if audio.is_disabled() {
|
||||
eprintln!("Skipping sound index bounds test due to disabled audio");
|
||||
return;
|
||||
}
|
||||
|
||||
assert!(audio.next_sound_index < audio.sounds.len());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_audio_default_impl() {
|
||||
if let Err(_) = init_sdl() {
|
||||
eprintln!("Skipping SDL2-dependent tests due to initialization failure");
|
||||
return;
|
||||
}
|
||||
|
||||
let audio = Audio::default();
|
||||
assert_eq!(audio.is_muted(), false);
|
||||
assert_eq!(audio.next_sound_index, 0);
|
||||
|
||||
// Audio might be disabled if initialization failed
|
||||
if !audio.is_disabled() {
|
||||
assert_eq!(audio.sounds.len(), 4);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_audio_disabled_state() {
|
||||
if let Err(_) = init_sdl() {
|
||||
eprintln!("Skipping SDL2-dependent tests due to initialization failure");
|
||||
return;
|
||||
}
|
||||
|
||||
// Test that disabled audio doesn't crash when calling functions
|
||||
let mut audio = Audio::new();
|
||||
|
||||
// These should not panic even if audio is disabled
|
||||
audio.eat();
|
||||
audio.set_mute(true);
|
||||
audio.set_mute(false);
|
||||
|
||||
// Test that we can check the disabled state
|
||||
let _is_disabled = audio.is_disabled();
|
||||
}
|
||||
}
|
||||
|
||||
180
src/constants.rs
180
src/constants.rs
@@ -37,8 +37,6 @@ pub enum MapTile {
|
||||
Pellet,
|
||||
/// A power pellet.
|
||||
PowerPellet,
|
||||
/// A starting position for an entity.
|
||||
StartingPosition(u8),
|
||||
/// A tunnel tile.
|
||||
Tunnel,
|
||||
}
|
||||
@@ -68,7 +66,7 @@ pub const RAW_BOARD: [&str; BOARD_CELL_SIZE.y as usize] = [
|
||||
"#............##............#",
|
||||
"#.####.#####.##.#####.####.#",
|
||||
"#.####.#####.##.#####.####.#",
|
||||
"#o..##.......0 .......##..o#",
|
||||
"#o..##.......X .......##..o#",
|
||||
"###.##.##.########.##.##.###",
|
||||
"###.##.##.########.##.##.###",
|
||||
"#......##....##....##......#",
|
||||
@@ -77,3 +75,179 @@ pub const RAW_BOARD: [&str; BOARD_CELL_SIZE.y as usize] = [
|
||||
"#..........................#",
|
||||
"############################",
|
||||
];
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_loop_time() {
|
||||
// 60 FPS = 16.67ms per frame
|
||||
let expected_nanos = (1_000_000_000.0 / 60.0) as u64;
|
||||
assert_eq!(LOOP_TIME.as_nanos() as u64, expected_nanos);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_cell_size() {
|
||||
assert_eq!(CELL_SIZE, 8);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_board_cell_size() {
|
||||
assert_eq!(BOARD_CELL_SIZE.x, 28);
|
||||
assert_eq!(BOARD_CELL_SIZE.y, 31);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_scale() {
|
||||
assert_eq!(SCALE, 2.6);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_board_cell_offset() {
|
||||
assert_eq!(BOARD_CELL_OFFSET.x, 0);
|
||||
assert_eq!(BOARD_CELL_OFFSET.y, 3);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_board_pixel_offset() {
|
||||
let expected = UVec2::new(0 * CELL_SIZE, 3 * CELL_SIZE);
|
||||
assert_eq!(BOARD_PIXEL_OFFSET, expected);
|
||||
assert_eq!(BOARD_PIXEL_OFFSET.x, 0);
|
||||
assert_eq!(BOARD_PIXEL_OFFSET.y, 24); // 3 * 8
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_board_pixel_size() {
|
||||
let expected = UVec2::new(28 * CELL_SIZE, 31 * CELL_SIZE);
|
||||
assert_eq!(BOARD_PIXEL_SIZE, expected);
|
||||
assert_eq!(BOARD_PIXEL_SIZE.x, 224); // 28 * 8
|
||||
assert_eq!(BOARD_PIXEL_SIZE.y, 248); // 31 * 8
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_canvas_size() {
|
||||
let expected = UVec2::new((28 + 0) * CELL_SIZE, (31 + 3) * CELL_SIZE);
|
||||
assert_eq!(CANVAS_SIZE, expected);
|
||||
assert_eq!(CANVAS_SIZE.x, 224); // (28 + 0) * 8
|
||||
assert_eq!(CANVAS_SIZE.y, 272); // (31 + 3) * 8
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_map_tile_variants() {
|
||||
assert_ne!(MapTile::Empty, MapTile::Wall);
|
||||
assert_ne!(MapTile::Pellet, MapTile::PowerPellet);
|
||||
assert_ne!(MapTile::Tunnel, MapTile::Empty);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_map_tile_clone() {
|
||||
let original = MapTile::Wall;
|
||||
let cloned = original;
|
||||
assert_eq!(original, cloned);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_raw_board_dimensions() {
|
||||
assert_eq!(RAW_BOARD.len(), BOARD_CELL_SIZE.y as usize);
|
||||
assert_eq!(RAW_BOARD.len(), 31);
|
||||
|
||||
for row in RAW_BOARD.iter() {
|
||||
assert_eq!(row.len(), BOARD_CELL_SIZE.x as usize);
|
||||
assert_eq!(row.len(), 28);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_raw_board_boundaries() {
|
||||
// First row should be all walls
|
||||
assert!(RAW_BOARD[0].chars().all(|c| c == '#'));
|
||||
|
||||
// Last row should be all walls
|
||||
let last_row = RAW_BOARD[RAW_BOARD.len() - 1];
|
||||
assert!(last_row.chars().all(|c| c == '#'));
|
||||
|
||||
// First and last character of each row should be walls (except tunnel rows and rows with spaces)
|
||||
for (i, row) in RAW_BOARD.iter().enumerate() {
|
||||
if i != 14 && !row.starts_with(' ') {
|
||||
// Skip tunnel row and rows that start with spaces
|
||||
assert_eq!(row.chars().next().unwrap(), '#');
|
||||
assert_eq!(row.chars().last().unwrap(), '#');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_raw_board_tunnel_row() {
|
||||
// Row 14 should have tunnel characters 'T' at the edges
|
||||
let tunnel_row = RAW_BOARD[14];
|
||||
assert_eq!(tunnel_row.chars().next().unwrap(), 'T');
|
||||
assert_eq!(tunnel_row.chars().last().unwrap(), 'T');
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_raw_board_power_pellets() {
|
||||
// Power pellets are represented by 'o'
|
||||
let mut power_pellet_count = 0;
|
||||
for row in RAW_BOARD.iter() {
|
||||
power_pellet_count += row.chars().filter(|&c| c == 'o').count();
|
||||
}
|
||||
assert_eq!(power_pellet_count, 4); // Should have exactly 4 power pellets
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_raw_board_starting_position() {
|
||||
// Should have a starting position 'X' for Pac-Man
|
||||
let mut found_starting_position = false;
|
||||
for row in RAW_BOARD.iter() {
|
||||
if row.contains('X') {
|
||||
found_starting_position = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
assert!(found_starting_position);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_raw_board_ghost_house() {
|
||||
// The ghost house area should be present (the == characters)
|
||||
let mut found_ghost_house = false;
|
||||
for row in RAW_BOARD.iter() {
|
||||
if row.contains("==") {
|
||||
found_ghost_house = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
assert!(found_ghost_house);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_raw_board_symmetry() {
|
||||
// The board should be roughly symmetrical
|
||||
let mid_point = RAW_BOARD[0].len() / 2;
|
||||
|
||||
for row in RAW_BOARD.iter() {
|
||||
let left_half = &row[..mid_point];
|
||||
let right_half = &row[mid_point..];
|
||||
|
||||
// Check that the halves are symmetrical (accounting for the center column)
|
||||
assert_eq!(left_half.len(), right_half.len());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_constants_consistency() {
|
||||
// Verify that derived constants are calculated correctly
|
||||
let calculated_pixel_offset = UVec2::new(BOARD_CELL_OFFSET.x * CELL_SIZE, BOARD_CELL_OFFSET.y * CELL_SIZE);
|
||||
assert_eq!(BOARD_PIXEL_OFFSET, calculated_pixel_offset);
|
||||
|
||||
let calculated_pixel_size = UVec2::new(BOARD_CELL_SIZE.x * CELL_SIZE, BOARD_CELL_SIZE.y * CELL_SIZE);
|
||||
assert_eq!(BOARD_PIXEL_SIZE, calculated_pixel_size);
|
||||
|
||||
let calculated_canvas_size = UVec2::new(
|
||||
(BOARD_CELL_SIZE.x + BOARD_CELL_OFFSET.x) * CELL_SIZE,
|
||||
(BOARD_CELL_SIZE.y + BOARD_CELL_OFFSET.y) * CELL_SIZE,
|
||||
);
|
||||
assert_eq!(CANVAS_SIZE, calculated_canvas_size);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,3 +35,67 @@ impl From<Direction> for IVec2 {
|
||||
}
|
||||
|
||||
pub const DIRECTIONS: [Direction; 4] = [Direction::Up, Direction::Down, Direction::Left, Direction::Right];
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_direction_opposite() {
|
||||
assert_eq!(Direction::Up.opposite(), Direction::Down);
|
||||
assert_eq!(Direction::Down.opposite(), Direction::Up);
|
||||
assert_eq!(Direction::Left.opposite(), Direction::Right);
|
||||
assert_eq!(Direction::Right.opposite(), Direction::Left);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_direction_as_ivec2() {
|
||||
assert_eq!(Direction::Up.as_ivec2(), -IVec2::Y);
|
||||
assert_eq!(Direction::Down.as_ivec2(), IVec2::Y);
|
||||
assert_eq!(Direction::Left.as_ivec2(), -IVec2::X);
|
||||
assert_eq!(Direction::Right.as_ivec2(), IVec2::X);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_direction_from_ivec2() {
|
||||
assert_eq!(IVec2::from(Direction::Up), -IVec2::Y);
|
||||
assert_eq!(IVec2::from(Direction::Down), IVec2::Y);
|
||||
assert_eq!(IVec2::from(Direction::Left), -IVec2::X);
|
||||
assert_eq!(IVec2::from(Direction::Right), IVec2::X);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_directions_constant() {
|
||||
assert_eq!(DIRECTIONS.len(), 4);
|
||||
assert!(DIRECTIONS.contains(&Direction::Up));
|
||||
assert!(DIRECTIONS.contains(&Direction::Down));
|
||||
assert!(DIRECTIONS.contains(&Direction::Left));
|
||||
assert!(DIRECTIONS.contains(&Direction::Right));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_direction_equality() {
|
||||
assert_eq!(Direction::Up, Direction::Up);
|
||||
assert_ne!(Direction::Up, Direction::Down);
|
||||
assert_ne!(Direction::Left, Direction::Right);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_direction_clone() {
|
||||
let dir = Direction::Up;
|
||||
let cloned = dir;
|
||||
assert_eq!(dir, cloned);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_direction_hash() {
|
||||
use std::collections::HashMap;
|
||||
let mut map = HashMap::new();
|
||||
map.insert(Direction::Up, "up");
|
||||
map.insert(Direction::Down, "down");
|
||||
|
||||
assert_eq!(map.get(&Direction::Up), Some(&"up"));
|
||||
assert_eq!(map.get(&Direction::Down), Some(&"down"));
|
||||
assert_eq!(map.get(&Direction::Left), None);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -412,3 +412,361 @@ impl Traverser {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::entity::direction::Direction;
|
||||
|
||||
fn create_test_graph() -> Graph {
|
||||
let mut graph = Graph::new();
|
||||
let node1 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(0.0, 0.0),
|
||||
});
|
||||
let node2 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(16.0, 0.0),
|
||||
});
|
||||
let node3 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(0.0, 16.0),
|
||||
});
|
||||
|
||||
graph.connect(node1, node2, false, None, Direction::Right).unwrap();
|
||||
graph.connect(node1, node3, false, None, Direction::Down).unwrap();
|
||||
|
||||
graph
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_graph_new() {
|
||||
let graph = Graph::new();
|
||||
assert_eq!(graph.node_count(), 0);
|
||||
assert!(graph.adjacency_list.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_graph_add_node() {
|
||||
let mut graph = Graph::new();
|
||||
let node = Node {
|
||||
position: glam::Vec2::new(10.0, 20.0),
|
||||
};
|
||||
let id = graph.add_node(node);
|
||||
|
||||
assert_eq!(id, 0);
|
||||
assert_eq!(graph.node_count(), 1);
|
||||
assert_eq!(graph.adjacency_list.len(), 1);
|
||||
|
||||
let retrieved_node = graph.get_node(id).unwrap();
|
||||
assert_eq!(retrieved_node.position, glam::Vec2::new(10.0, 20.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_graph_node_count() {
|
||||
let mut graph = Graph::new();
|
||||
assert_eq!(graph.node_count(), 0);
|
||||
|
||||
graph.add_node(Node {
|
||||
position: glam::Vec2::new(0.0, 0.0),
|
||||
});
|
||||
assert_eq!(graph.node_count(), 1);
|
||||
|
||||
graph.add_node(Node {
|
||||
position: glam::Vec2::new(1.0, 1.0),
|
||||
});
|
||||
assert_eq!(graph.node_count(), 2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_graph_get_node() {
|
||||
let mut graph = Graph::new();
|
||||
let node = Node {
|
||||
position: glam::Vec2::new(5.0, 10.0),
|
||||
};
|
||||
let id = graph.add_node(node);
|
||||
|
||||
let retrieved = graph.get_node(id).unwrap();
|
||||
assert_eq!(retrieved.position, glam::Vec2::new(5.0, 10.0));
|
||||
|
||||
assert!(graph.get_node(999).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_graph_connect() {
|
||||
let mut graph = Graph::new();
|
||||
let node1 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(0.0, 0.0),
|
||||
});
|
||||
let node2 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(16.0, 0.0),
|
||||
});
|
||||
|
||||
let result = graph.connect(node1, node2, false, None, Direction::Right);
|
||||
assert!(result.is_ok());
|
||||
|
||||
// Check that edges were added in both directions
|
||||
let edge1 = graph.find_edge_in_direction(node1, Direction::Right);
|
||||
let edge2 = graph.find_edge_in_direction(node2, Direction::Left);
|
||||
|
||||
assert!(edge1.is_some());
|
||||
assert!(edge2.is_some());
|
||||
assert_eq!(edge1.unwrap().target, node2);
|
||||
assert_eq!(edge2.unwrap().target, node1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_graph_connect_invalid_nodes() {
|
||||
let mut graph = Graph::new();
|
||||
let node1 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(0.0, 0.0),
|
||||
});
|
||||
|
||||
// Try to connect to non-existent node
|
||||
let result = graph.connect(node1, 999, false, None, Direction::Right);
|
||||
assert!(result.is_err());
|
||||
|
||||
// Try to connect from non-existent node
|
||||
let result = graph.connect(999, node1, false, None, Direction::Right);
|
||||
assert!(result.is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_graph_find_edge() {
|
||||
let mut graph = Graph::new();
|
||||
let node1 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(0.0, 0.0),
|
||||
});
|
||||
let node2 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(16.0, 0.0),
|
||||
});
|
||||
|
||||
graph.connect(node1, node2, false, None, Direction::Right).unwrap();
|
||||
|
||||
let edge = graph.find_edge(node1, node2);
|
||||
assert!(edge.is_some());
|
||||
assert_eq!(edge.unwrap().target, node2);
|
||||
|
||||
// Test non-existent edge
|
||||
assert!(graph.find_edge(node1, 999).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_graph_find_edge_in_direction() {
|
||||
let mut graph = Graph::new();
|
||||
let node1 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(0.0, 0.0),
|
||||
});
|
||||
let node2 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(16.0, 0.0),
|
||||
});
|
||||
|
||||
graph.connect(node1, node2, false, None, Direction::Right).unwrap();
|
||||
|
||||
let edge = graph.find_edge_in_direction(node1, Direction::Right);
|
||||
assert!(edge.is_some());
|
||||
assert_eq!(edge.unwrap().target, node2);
|
||||
|
||||
// Test non-existent direction
|
||||
assert!(graph.find_edge_in_direction(node1, Direction::Up).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_intersection_edges() {
|
||||
let mut intersection = Intersection::default();
|
||||
intersection.set(
|
||||
Direction::Up,
|
||||
Edge {
|
||||
target: 1,
|
||||
distance: 10.0,
|
||||
direction: Direction::Up,
|
||||
},
|
||||
);
|
||||
intersection.set(
|
||||
Direction::Right,
|
||||
Edge {
|
||||
target: 2,
|
||||
distance: 15.0,
|
||||
direction: Direction::Right,
|
||||
},
|
||||
);
|
||||
|
||||
let edges: Vec<_> = intersection.edges().collect();
|
||||
assert_eq!(edges.len(), 2);
|
||||
|
||||
let up_edge = edges.iter().find(|e| e.direction == Direction::Up).unwrap();
|
||||
let right_edge = edges.iter().find(|e| e.direction == Direction::Right).unwrap();
|
||||
|
||||
assert_eq!(up_edge.target, 1);
|
||||
assert_eq!(up_edge.distance, 10.0);
|
||||
assert_eq!(right_edge.target, 2);
|
||||
assert_eq!(right_edge.distance, 15.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_intersection_get() {
|
||||
let mut intersection = Intersection::default();
|
||||
let edge = Edge {
|
||||
target: 1,
|
||||
distance: 10.0,
|
||||
direction: Direction::Up,
|
||||
};
|
||||
intersection.set(Direction::Up, edge);
|
||||
|
||||
let retrieved = intersection.get(Direction::Up);
|
||||
assert!(retrieved.is_some());
|
||||
assert_eq!(retrieved.unwrap().target, 1);
|
||||
|
||||
assert!(intersection.get(Direction::Down).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_intersection_set() {
|
||||
let mut intersection = Intersection::default();
|
||||
let edge = Edge {
|
||||
target: 1,
|
||||
distance: 10.0,
|
||||
direction: Direction::Left,
|
||||
};
|
||||
|
||||
intersection.set(Direction::Left, edge);
|
||||
let retrieved = intersection.get(Direction::Left);
|
||||
assert!(retrieved.is_some());
|
||||
assert_eq!(retrieved.unwrap().target, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_position_is_at_node() {
|
||||
let pos = Position::AtNode(5);
|
||||
assert!(pos.is_at_node());
|
||||
|
||||
let pos = Position::BetweenNodes {
|
||||
from: 1,
|
||||
to: 2,
|
||||
traversed: 5.0,
|
||||
};
|
||||
assert!(!pos.is_at_node());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_position_from_node_id() {
|
||||
let pos = Position::AtNode(5);
|
||||
assert_eq!(pos.from_node_id(), 5);
|
||||
|
||||
let pos = Position::BetweenNodes {
|
||||
from: 1,
|
||||
to: 2,
|
||||
traversed: 5.0,
|
||||
};
|
||||
assert_eq!(pos.from_node_id(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_position_to_node_id() {
|
||||
let pos = Position::AtNode(5);
|
||||
assert_eq!(pos.to_node_id(), None);
|
||||
|
||||
let pos = Position::BetweenNodes {
|
||||
from: 1,
|
||||
to: 2,
|
||||
traversed: 5.0,
|
||||
};
|
||||
assert_eq!(pos.to_node_id(), Some(2));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_position_is_stopped() {
|
||||
let pos = Position::AtNode(5);
|
||||
assert!(pos.is_stopped());
|
||||
|
||||
let pos = Position::BetweenNodes {
|
||||
from: 1,
|
||||
to: 2,
|
||||
traversed: 5.0,
|
||||
};
|
||||
assert!(!pos.is_stopped());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_traverser_new() {
|
||||
let graph = create_test_graph();
|
||||
let traverser = Traverser::new(&graph, 0, Direction::Left);
|
||||
|
||||
assert_eq!(traverser.direction, Direction::Left);
|
||||
// The next_direction might be consumed immediately when the traverser starts moving
|
||||
// So we just check that the direction is set correctly
|
||||
assert_eq!(traverser.direction, Direction::Left);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_traverser_set_next_direction() {
|
||||
let graph = create_test_graph();
|
||||
let mut traverser = Traverser::new(&graph, 0, Direction::Left);
|
||||
|
||||
traverser.set_next_direction(Direction::Up);
|
||||
assert!(traverser.next_direction.is_some());
|
||||
assert_eq!(traverser.next_direction.unwrap().0, Direction::Up);
|
||||
|
||||
// Setting same direction should not change anything
|
||||
traverser.set_next_direction(Direction::Up);
|
||||
assert_eq!(traverser.next_direction.unwrap().0, Direction::Up);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_traverser_advance_at_node() {
|
||||
let graph = create_test_graph();
|
||||
let mut traverser = Traverser::new(&graph, 0, Direction::Right);
|
||||
|
||||
// Should start moving in the initial direction
|
||||
traverser.advance(&graph, 5.0);
|
||||
|
||||
match traverser.position {
|
||||
Position::BetweenNodes { from, to, traversed } => {
|
||||
assert_eq!(from, 0);
|
||||
assert_eq!(to, 1);
|
||||
assert_eq!(traversed, 5.0);
|
||||
}
|
||||
_ => panic!("Expected to be between nodes"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_traverser_advance_between_nodes() {
|
||||
let graph = create_test_graph();
|
||||
let mut traverser = Traverser::new(&graph, 0, Direction::Right);
|
||||
|
||||
// Move to between nodes
|
||||
traverser.advance(&graph, 5.0);
|
||||
|
||||
// Advance further
|
||||
traverser.advance(&graph, 3.0);
|
||||
|
||||
match traverser.position {
|
||||
Position::BetweenNodes { from, to, traversed } => {
|
||||
assert_eq!(from, 0);
|
||||
assert_eq!(to, 1);
|
||||
assert_eq!(traversed, 8.0);
|
||||
}
|
||||
_ => panic!("Expected to be between nodes"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_edge_structure() {
|
||||
let edge = Edge {
|
||||
target: 5,
|
||||
distance: 10.5,
|
||||
direction: Direction::Up,
|
||||
};
|
||||
|
||||
assert_eq!(edge.target, 5);
|
||||
assert_eq!(edge.distance, 10.5);
|
||||
assert_eq!(edge.direction, Direction::Up);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_node_structure() {
|
||||
let node = Node {
|
||||
position: glam::Vec2::new(10.0, 20.0),
|
||||
};
|
||||
|
||||
assert_eq!(node.position, glam::Vec2::new(10.0, 20.0));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
use glam::Vec2;
|
||||
use glam::{UVec2, Vec2};
|
||||
|
||||
use crate::constants::BOARD_PIXEL_OFFSET;
|
||||
use crate::entity::direction::Direction;
|
||||
use crate::entity::graph::{Graph, NodeId, Position, Traverser};
|
||||
use crate::helpers::centered_with_size;
|
||||
use crate::texture::animated::AnimatedTexture;
|
||||
use crate::texture::directional::DirectionalAnimatedTexture;
|
||||
use crate::texture::sprite::SpriteAtlas;
|
||||
use sdl2::keyboard::Keycode;
|
||||
use sdl2::rect::Rect;
|
||||
use sdl2::render::{Canvas, RenderTarget};
|
||||
use std::collections::HashMap;
|
||||
|
||||
@@ -36,8 +36,14 @@ impl Pacman {
|
||||
|
||||
let stopped_tiles = vec![SpriteAtlas::get_tile(atlas, &format!("{moving_prefix}_b.png")).unwrap()];
|
||||
|
||||
textures.insert(direction, AnimatedTexture::new(moving_tiles, 0.08));
|
||||
stopped_textures.insert(direction, AnimatedTexture::new(stopped_tiles, 0.1));
|
||||
textures.insert(
|
||||
direction,
|
||||
AnimatedTexture::new(moving_tiles, 0.08).expect("Invalid frame duration"),
|
||||
);
|
||||
stopped_textures.insert(
|
||||
direction,
|
||||
AnimatedTexture::new(stopped_tiles, 0.1).expect("Invalid frame duration"),
|
||||
);
|
||||
}
|
||||
|
||||
Self {
|
||||
@@ -71,15 +77,14 @@ impl Pacman {
|
||||
Position::BetweenNodes { from, to, traversed } => {
|
||||
let from_pos = graph.get_node(from).unwrap().position;
|
||||
let to_pos = graph.get_node(to).unwrap().position;
|
||||
let weight = from_pos.distance(to_pos);
|
||||
from_pos.lerp(to_pos, traversed / weight)
|
||||
from_pos.lerp(to_pos, traversed / from_pos.distance(to_pos))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn render<T: RenderTarget>(&self, canvas: &mut Canvas<T>, atlas: &mut SpriteAtlas, graph: &Graph) {
|
||||
let pixel_pos = self.get_pixel_pos(graph).round().as_ivec2() + BOARD_PIXEL_OFFSET.as_ivec2();
|
||||
let dest = Rect::new(pixel_pos.x - 8, pixel_pos.y - 8, 16, 16);
|
||||
let dest = centered_with_size(pixel_pos, UVec2::new(16, 16));
|
||||
let is_stopped = self.traverser.position.is_stopped();
|
||||
|
||||
if is_stopped {
|
||||
@@ -91,3 +96,219 @@ impl Pacman {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::entity::graph::{Graph, Node};
|
||||
use crate::texture::sprite::{AtlasMapper, MapperFrame, SpriteAtlas};
|
||||
use sdl2::keyboard::Keycode;
|
||||
use std::collections::HashMap;
|
||||
|
||||
fn create_test_graph() -> Graph {
|
||||
let mut graph = Graph::new();
|
||||
let node1 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(0.0, 0.0),
|
||||
});
|
||||
let node2 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(16.0, 0.0),
|
||||
});
|
||||
let node3 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(0.0, 16.0),
|
||||
});
|
||||
|
||||
graph.connect(node1, node2, false, None, Direction::Right).unwrap();
|
||||
graph.connect(node1, node3, false, None, Direction::Down).unwrap();
|
||||
|
||||
graph
|
||||
}
|
||||
|
||||
fn create_test_atlas() -> SpriteAtlas {
|
||||
// Create a minimal test atlas with required tiles
|
||||
let mut frames = HashMap::new();
|
||||
frames.insert(
|
||||
"pacman/up_a.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"pacman/up_b.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 16,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"pacman/down_a.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 32,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"pacman/down_b.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 48,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"pacman/left_a.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 64,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"pacman/left_b.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 80,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"pacman/right_a.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 96,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"pacman/right_b.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 112,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"pacman/full.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 128,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
|
||||
let mapper = AtlasMapper { frames };
|
||||
// Create a dummy texture (we won't actually render, just test the logic)
|
||||
let dummy_texture = unsafe { std::mem::zeroed() };
|
||||
SpriteAtlas::new(dummy_texture, mapper)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_pacman_new() {
|
||||
let graph = create_test_graph();
|
||||
let atlas = create_test_atlas();
|
||||
|
||||
let pacman = Pacman::new(&graph, 0, &atlas);
|
||||
|
||||
assert_eq!(pacman.traverser.direction, Direction::Left);
|
||||
assert!(matches!(pacman.traverser.position, crate::entity::graph::Position::AtNode(0)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_handle_key_valid_directions() {
|
||||
let graph = create_test_graph();
|
||||
let atlas = create_test_atlas();
|
||||
let mut pacman = Pacman::new(&graph, 0, &atlas);
|
||||
|
||||
// Test that direction keys are handled correctly
|
||||
// The traverser might consume next_direction immediately, so we check the actual direction
|
||||
pacman.handle_key(Keycode::Up);
|
||||
// Check that the direction was set (either in next_direction or current direction)
|
||||
assert!(pacman.traverser.next_direction.is_some() || pacman.traverser.direction == Direction::Up);
|
||||
|
||||
pacman.handle_key(Keycode::Down);
|
||||
assert!(pacman.traverser.next_direction.is_some() || pacman.traverser.direction == Direction::Down);
|
||||
|
||||
pacman.handle_key(Keycode::Left);
|
||||
assert!(pacman.traverser.next_direction.is_some() || pacman.traverser.direction == Direction::Left);
|
||||
|
||||
pacman.handle_key(Keycode::Right);
|
||||
assert!(pacman.traverser.next_direction.is_some() || pacman.traverser.direction == Direction::Right);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_handle_key_invalid_direction() {
|
||||
let graph = create_test_graph();
|
||||
let atlas = create_test_atlas();
|
||||
let mut pacman = Pacman::new(&graph, 0, &atlas);
|
||||
|
||||
let original_direction = pacman.traverser.direction;
|
||||
let original_next_direction = pacman.traverser.next_direction;
|
||||
|
||||
// Test invalid key
|
||||
pacman.handle_key(Keycode::Space);
|
||||
|
||||
// Should not change direction
|
||||
assert_eq!(pacman.traverser.direction, original_direction);
|
||||
assert_eq!(pacman.traverser.next_direction, original_next_direction);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_pixel_pos_at_node() {
|
||||
let graph = create_test_graph();
|
||||
let atlas = create_test_atlas();
|
||||
let pacman = Pacman::new(&graph, 0, &atlas);
|
||||
|
||||
let pos = pacman.get_pixel_pos(&graph);
|
||||
assert_eq!(pos, glam::Vec2::new(0.0, 0.0));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_pixel_pos_between_nodes() {
|
||||
let graph = create_test_graph();
|
||||
let atlas = create_test_atlas();
|
||||
let mut pacman = Pacman::new(&graph, 0, &atlas);
|
||||
|
||||
// Move pacman between nodes - need to advance with a larger distance to ensure movement
|
||||
pacman.traverser.advance(&graph, 5.0); // Larger advance to ensure movement
|
||||
|
||||
let pos = pacman.get_pixel_pos(&graph);
|
||||
// Should be between (0,0) and (16,0), but not exactly at (8,0) due to advance distance
|
||||
assert!(pos.x >= 0.0 && pos.x <= 16.0);
|
||||
assert_eq!(pos.y, 0.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick_updates_texture() {
|
||||
let graph = create_test_graph();
|
||||
let atlas = create_test_atlas();
|
||||
let mut pacman = Pacman::new(&graph, 0, &atlas);
|
||||
|
||||
// Test that tick doesn't panic
|
||||
pacman.tick(0.016, &graph); // 60 FPS frame time
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_pacman_initial_direction() {
|
||||
let graph = create_test_graph();
|
||||
let atlas = create_test_atlas();
|
||||
let pacman = Pacman::new(&graph, 0, &atlas);
|
||||
|
||||
// Pacman should start with the initial direction (Left)
|
||||
assert_eq!(pacman.traverser.direction, Direction::Left);
|
||||
// The next_direction might be consumed immediately when the traverser starts moving
|
||||
// So we just check that the direction is set correctly
|
||||
assert_eq!(pacman.traverser.direction, Direction::Left);
|
||||
}
|
||||
}
|
||||
|
||||
230
src/game.rs
230
src/game.rs
@@ -152,3 +152,233 @@ impl Game {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use sdl2::keyboard::Keycode;
|
||||
use sdl2::pixels::Color;
|
||||
|
||||
fn create_test_game() -> Game {
|
||||
// Create a minimal test game without SDL dependencies
|
||||
// This is a simplified version for testing basic logic
|
||||
let map = Map::new(RAW_BOARD);
|
||||
let pacman_start_pos = map.find_starting_position(0).unwrap();
|
||||
let pacman_start_node = *map
|
||||
.grid_to_node
|
||||
.get(&glam::IVec2::new(pacman_start_pos.x as i32, pacman_start_pos.y as i32))
|
||||
.expect("Pac-Man starting position not found in graph");
|
||||
|
||||
// Create a dummy atlas for testing
|
||||
let mut mapper = std::collections::HashMap::new();
|
||||
mapper.insert(
|
||||
"pacman/up_a.png".to_string(),
|
||||
crate::texture::sprite::MapperFrame {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
mapper.insert(
|
||||
"pacman/up_b.png".to_string(),
|
||||
crate::texture::sprite::MapperFrame {
|
||||
x: 16,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
mapper.insert(
|
||||
"pacman/down_a.png".to_string(),
|
||||
crate::texture::sprite::MapperFrame {
|
||||
x: 32,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
mapper.insert(
|
||||
"pacman/down_b.png".to_string(),
|
||||
crate::texture::sprite::MapperFrame {
|
||||
x: 48,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
mapper.insert(
|
||||
"pacman/left_a.png".to_string(),
|
||||
crate::texture::sprite::MapperFrame {
|
||||
x: 64,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
mapper.insert(
|
||||
"pacman/left_b.png".to_string(),
|
||||
crate::texture::sprite::MapperFrame {
|
||||
x: 80,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
mapper.insert(
|
||||
"pacman/right_a.png".to_string(),
|
||||
crate::texture::sprite::MapperFrame {
|
||||
x: 96,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
mapper.insert(
|
||||
"pacman/right_b.png".to_string(),
|
||||
crate::texture::sprite::MapperFrame {
|
||||
x: 112,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
mapper.insert(
|
||||
"pacman/full.png".to_string(),
|
||||
crate::texture::sprite::MapperFrame {
|
||||
x: 128,
|
||||
y: 0,
|
||||
width: 16,
|
||||
height: 16,
|
||||
},
|
||||
);
|
||||
mapper.insert(
|
||||
"maze/full.png".to_string(),
|
||||
crate::texture::sprite::MapperFrame {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 224,
|
||||
height: 248,
|
||||
},
|
||||
);
|
||||
|
||||
let atlas_mapper = crate::texture::sprite::AtlasMapper { frames: mapper };
|
||||
let dummy_texture = unsafe { std::mem::zeroed() };
|
||||
let atlas = crate::texture::sprite::SpriteAtlas::new(dummy_texture, atlas_mapper);
|
||||
|
||||
let mut map_texture = crate::texture::sprite::SpriteAtlas::get_tile(&atlas, "maze/full.png").unwrap();
|
||||
map_texture.color = Some(Color::RGB(0x20, 0x20, 0xf9));
|
||||
|
||||
let text_texture = TextTexture::new(1.0);
|
||||
let audio = Audio::new();
|
||||
let pacman = Pacman::new(&map.graph, pacman_start_node, &atlas);
|
||||
|
||||
Game {
|
||||
score: 0,
|
||||
map,
|
||||
pacman,
|
||||
debug_mode: false,
|
||||
map_texture,
|
||||
text_texture,
|
||||
audio,
|
||||
atlas,
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_game_keyboard_event_direction_keys() {
|
||||
let mut game = create_test_game();
|
||||
|
||||
// Test that direction keys are handled
|
||||
game.keyboard_event(Keycode::Up);
|
||||
game.keyboard_event(Keycode::Down);
|
||||
game.keyboard_event(Keycode::Left);
|
||||
game.keyboard_event(Keycode::Right);
|
||||
|
||||
// Should not panic
|
||||
assert!(true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_game_keyboard_event_mute_toggle() {
|
||||
let mut game = create_test_game();
|
||||
|
||||
let initial_mute_state = game.audio.is_muted();
|
||||
|
||||
// Toggle mute
|
||||
game.keyboard_event(Keycode::M);
|
||||
|
||||
// Mute state should have changed
|
||||
assert_eq!(game.audio.is_muted(), !initial_mute_state);
|
||||
|
||||
// Toggle again
|
||||
game.keyboard_event(Keycode::M);
|
||||
|
||||
// Should be back to original state
|
||||
assert_eq!(game.audio.is_muted(), initial_mute_state);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_game_tick() {
|
||||
let mut game = create_test_game();
|
||||
|
||||
// Test that tick doesn't panic
|
||||
game.tick(0.016); // 60 FPS frame time
|
||||
|
||||
assert!(true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_game_initial_state() {
|
||||
let game = create_test_game();
|
||||
|
||||
assert_eq!(game.score, 0);
|
||||
assert!(!game.debug_mode);
|
||||
assert!(game.map.graph.node_count() > 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_game_debug_mode_toggle() {
|
||||
let mut game = create_test_game();
|
||||
|
||||
assert!(!game.debug_mode);
|
||||
|
||||
// Toggle debug mode (this would normally be done via Space key in the app)
|
||||
game.debug_mode = !game.debug_mode;
|
||||
|
||||
assert!(game.debug_mode);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_game_score_increment() {
|
||||
let mut game = create_test_game();
|
||||
|
||||
let initial_score = game.score;
|
||||
game.score += 10;
|
||||
|
||||
assert_eq!(game.score, initial_score + 10);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_game_pacman_initialization() {
|
||||
let game = create_test_game();
|
||||
|
||||
// Check that Pac-Man was initialized
|
||||
assert_eq!(game.pacman.traverser.direction, crate::entity::direction::Direction::Left);
|
||||
// The traverser might start moving immediately, so we just check the direction
|
||||
assert_eq!(game.pacman.traverser.direction, crate::entity::direction::Direction::Left);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_game_map_initialization() {
|
||||
let game = create_test_game();
|
||||
|
||||
// Check that map was initialized
|
||||
assert!(game.map.graph.node_count() > 0);
|
||||
assert!(!game.map.grid_to_node.is_empty());
|
||||
|
||||
// Check that Pac-Man's starting position exists
|
||||
let pacman_pos = game.map.find_starting_position(0);
|
||||
assert!(pacman_pos.is_some());
|
||||
}
|
||||
}
|
||||
|
||||
51
src/helpers.rs
Normal file
51
src/helpers.rs
Normal file
@@ -0,0 +1,51 @@
|
||||
use glam::{IVec2, UVec2};
|
||||
use sdl2::rect::Rect;
|
||||
|
||||
pub fn centered_with_size(pixel_pos: IVec2, size: UVec2) -> Rect {
|
||||
Rect::new(
|
||||
pixel_pos.x - size.x as i32 / 2,
|
||||
pixel_pos.y - size.y as i32 / 2,
|
||||
size.x,
|
||||
size.y,
|
||||
)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_centered_with_size_basic() {
|
||||
let rect = centered_with_size(IVec2::new(100, 100), UVec2::new(50, 30));
|
||||
assert_eq!(rect.origin(), (75, 85));
|
||||
assert_eq!(rect.size(), (50, 30));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_centered_with_size_odd_dimensions() {
|
||||
let rect = centered_with_size(IVec2::new(50, 50), UVec2::new(51, 31));
|
||||
assert_eq!(rect.origin(), (25, 35));
|
||||
assert_eq!(rect.size(), (51, 31));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_centered_with_size_zero_position() {
|
||||
let rect = centered_with_size(IVec2::new(0, 0), UVec2::new(100, 100));
|
||||
assert_eq!(rect.origin(), (-50, -50));
|
||||
assert_eq!(rect.size(), (100, 100));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_centered_with_size_negative_position() {
|
||||
let rect = centered_with_size(IVec2::new(-100, -50), UVec2::new(80, 40));
|
||||
assert_eq!(rect.origin(), (-140, -70));
|
||||
assert_eq!(rect.size(), (80, 40));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_centered_with_size_large_dimensions() {
|
||||
let rect = centered_with_size(IVec2::new(1000, 1000), UVec2::new(1000, 1000));
|
||||
assert_eq!(rect.origin(), (500, 500));
|
||||
assert_eq!(rect.size(), (1000, 1000));
|
||||
}
|
||||
}
|
||||
@@ -7,5 +7,6 @@ pub mod constants;
|
||||
pub mod emscripten;
|
||||
pub mod entity;
|
||||
pub mod game;
|
||||
pub mod helpers;
|
||||
pub mod map;
|
||||
pub mod texture;
|
||||
|
||||
@@ -56,6 +56,7 @@ mod constants;
|
||||
mod emscripten;
|
||||
mod entity;
|
||||
mod game;
|
||||
mod helpers;
|
||||
mod map;
|
||||
mod texture;
|
||||
|
||||
|
||||
@@ -11,18 +11,30 @@ use sdl2::render::{Canvas, RenderTarget};
|
||||
use std::collections::{HashMap, VecDeque};
|
||||
use tracing::debug;
|
||||
|
||||
/// The game map, responsible for holding the tile-based layout and the navigation graph.
|
||||
///
|
||||
/// The map is represented as a 2D array of `MapTile`s. It also stores a navigation
|
||||
/// `Graph` that entities like Pac-Man and ghosts use for movement. The graph is
|
||||
/// generated from the walkable tiles of the map.
|
||||
/// The starting positions of the entities in the game.
|
||||
#[allow(dead_code)]
|
||||
pub struct NodePositions {
|
||||
pub pacman: NodeId,
|
||||
pub blinky: NodeId,
|
||||
pub pinky: NodeId,
|
||||
pub inky: NodeId,
|
||||
pub clyde: NodeId,
|
||||
}
|
||||
|
||||
/// The main map structure containing the game board and navigation graph.
|
||||
pub struct Map {
|
||||
/// The current state of the map.
|
||||
#[allow(dead_code)]
|
||||
current: [[MapTile; BOARD_CELL_SIZE.y as usize]; BOARD_CELL_SIZE.x as usize],
|
||||
/// The node map for entity movement.
|
||||
pub graph: Graph,
|
||||
/// A mapping from grid positions to node IDs.
|
||||
pub grid_to_node: HashMap<IVec2, NodeId>,
|
||||
/// A mapping of the starting positions of the entities.
|
||||
#[allow(dead_code)]
|
||||
pub start_positions: NodePositions,
|
||||
/// Pac-Man's starting position.
|
||||
pacman_start: Option<IVec2>,
|
||||
}
|
||||
|
||||
impl Map {
|
||||
@@ -41,6 +53,7 @@ impl Map {
|
||||
let map = parsed_map.tiles;
|
||||
let house_door = parsed_map.house_door;
|
||||
let tunnel_ends = parsed_map.tunnel_ends;
|
||||
let pacman_start = parsed_map.pacman_start;
|
||||
|
||||
let mut graph = Graph::new();
|
||||
let mut grid_to_node = HashMap::new();
|
||||
@@ -48,25 +61,7 @@ impl Map {
|
||||
let cell_offset = Vec2::splat(CELL_SIZE as f32 / 2.0);
|
||||
|
||||
// Find a starting point for the graph generation, preferably Pac-Man's position.
|
||||
let start_pos = (0..BOARD_CELL_SIZE.y)
|
||||
.flat_map(|y| (0..BOARD_CELL_SIZE.x).map(move |x| IVec2::new(x as i32, y as i32)))
|
||||
.find(|&p| matches!(map[p.x as usize][p.y as usize], MapTile::StartingPosition(0)))
|
||||
.unwrap_or_else(|| {
|
||||
// Fallback to any valid walkable tile if Pac-Man's start is not found
|
||||
(0..BOARD_CELL_SIZE.y)
|
||||
.flat_map(|y| (0..BOARD_CELL_SIZE.x).map(move |x| IVec2::new(x as i32, y as i32)))
|
||||
.find(|&p| {
|
||||
matches!(
|
||||
map[p.x as usize][p.y as usize],
|
||||
MapTile::Pellet
|
||||
| MapTile::PowerPellet
|
||||
| MapTile::Empty
|
||||
| MapTile::Tunnel
|
||||
| MapTile::StartingPosition(_)
|
||||
)
|
||||
})
|
||||
.expect("No valid starting position found on map for graph generation")
|
||||
});
|
||||
let start_pos = pacman_start.expect("Pac-Man's starting position not found");
|
||||
|
||||
// Add the starting position to the graph/queue
|
||||
let mut queue = VecDeque::new();
|
||||
@@ -100,7 +95,7 @@ impl Map {
|
||||
// Skip if the new position is not a walkable tile
|
||||
if matches!(
|
||||
map[new_position.x as usize][new_position.y as usize],
|
||||
MapTile::Pellet | MapTile::PowerPellet | MapTile::Empty | MapTile::Tunnel | MapTile::StartingPosition(_)
|
||||
MapTile::Pellet | MapTile::PowerPellet | MapTile::Empty | MapTile::Tunnel
|
||||
) {
|
||||
// Add the new position to the graph/queue
|
||||
let pos = Vec2::new(
|
||||
@@ -141,15 +136,26 @@ impl Map {
|
||||
}
|
||||
|
||||
// Build house structure
|
||||
Self::build_house(&mut graph, &grid_to_node, &house_door);
|
||||
let (house_entrance_node_id, left_center_node_id, center_center_node_id, right_center_node_id) =
|
||||
Self::build_house(&mut graph, &grid_to_node, &house_door);
|
||||
|
||||
let start_positions = NodePositions {
|
||||
pacman: grid_to_node[&start_pos],
|
||||
blinky: house_entrance_node_id,
|
||||
pinky: left_center_node_id,
|
||||
inky: right_center_node_id,
|
||||
clyde: center_center_node_id,
|
||||
};
|
||||
|
||||
// Build tunnel connections
|
||||
Self::build_tunnels(&mut graph, &grid_to_node, &tunnel_ends);
|
||||
|
||||
Map {
|
||||
current: map,
|
||||
grid_to_node,
|
||||
graph,
|
||||
grid_to_node,
|
||||
start_positions,
|
||||
pacman_start,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -163,14 +169,9 @@ impl Map {
|
||||
///
|
||||
/// The starting position as a grid coordinate (`UVec2`), or `None` if not found.
|
||||
pub fn find_starting_position(&self, entity_id: u8) -> Option<UVec2> {
|
||||
for (x, col) in self.current.iter().enumerate().take(BOARD_CELL_SIZE.x as usize) {
|
||||
for (y, &cell) in col.iter().enumerate().take(BOARD_CELL_SIZE.y as usize) {
|
||||
if let MapTile::StartingPosition(id) = cell {
|
||||
if id == entity_id {
|
||||
return Some(UVec2::new(x as u32, y as u32));
|
||||
}
|
||||
}
|
||||
}
|
||||
// For now, only Pac-Man (entity_id 0) is supported
|
||||
if entity_id == 0 {
|
||||
return self.pacman_start.map(|pos| UVec2::new(pos.x as u32, pos.y as u32));
|
||||
}
|
||||
None
|
||||
}
|
||||
@@ -193,7 +194,11 @@ impl Map {
|
||||
}
|
||||
|
||||
/// Builds the house structure in the graph.
|
||||
fn build_house(graph: &mut Graph, grid_to_node: &HashMap<IVec2, NodeId>, house_door: &[Option<IVec2>; 2]) {
|
||||
fn build_house(
|
||||
graph: &mut Graph,
|
||||
grid_to_node: &HashMap<IVec2, NodeId>,
|
||||
house_door: &[Option<IVec2>; 2],
|
||||
) -> (usize, usize, usize, usize) {
|
||||
// Calculate the position of the house entrance node
|
||||
let (house_entrance_node_id, house_entrance_node_position) = {
|
||||
// Translate the grid positions to the actual node ids
|
||||
@@ -283,6 +288,13 @@ impl Map {
|
||||
.expect("Failed to connect house entrance to right top line");
|
||||
|
||||
debug!("House entrance node id: {house_entrance_node_id}");
|
||||
|
||||
(
|
||||
house_entrance_node_id,
|
||||
left_center_node_id,
|
||||
center_center_node_id,
|
||||
right_center_node_id,
|
||||
)
|
||||
}
|
||||
|
||||
/// Builds the tunnel connections in the graph.
|
||||
@@ -337,3 +349,162 @@ impl Map {
|
||||
.expect("Failed to connect left tunnel hidden node to right tunnel hidden node");
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::constants::{BOARD_CELL_SIZE, CELL_SIZE};
|
||||
use glam::{IVec2, Vec2};
|
||||
|
||||
fn create_minimal_test_board() -> [&'static str; BOARD_CELL_SIZE.y as usize] {
|
||||
let mut board = [""; BOARD_CELL_SIZE.y as usize];
|
||||
// Create a minimal valid board with house doors
|
||||
board[0] = "############################";
|
||||
board[1] = "#............##............#";
|
||||
board[2] = "#.####.#####.##.#####.####.#";
|
||||
board[3] = "#o####.#####.##.#####.####o#";
|
||||
board[4] = "#.####.#####.##.#####.####.#";
|
||||
board[5] = "#..........................#";
|
||||
board[6] = "#.####.##.########.##.####.#";
|
||||
board[7] = "#.####.##.########.##.####.#";
|
||||
board[8] = "#......##....##....##......#";
|
||||
board[9] = "######.##### ## #####.######";
|
||||
board[10] = " #.##### ## #####.# ";
|
||||
board[11] = " #.## == ##.# ";
|
||||
board[12] = " #.## ######## ##.# ";
|
||||
board[13] = "######.## ######## ##.######";
|
||||
board[14] = "T . ######## . T";
|
||||
board[15] = "######.## ######## ##.######";
|
||||
board[16] = " #.## ######## ##.# ";
|
||||
board[17] = " #.## ##.# ";
|
||||
board[18] = " #.## ######## ##.# ";
|
||||
board[19] = "######.## ######## ##.######";
|
||||
board[20] = "#............##............#";
|
||||
board[21] = "#.####.#####.##.#####.####.#";
|
||||
board[22] = "#.####.#####.##.#####.####.#";
|
||||
board[23] = "#o..##.......X .......##..o#";
|
||||
board[24] = "###.##.##.########.##.##.###";
|
||||
board[25] = "###.##.##.########.##.##.###";
|
||||
board[26] = "#......##....##....##......#";
|
||||
board[27] = "#.##########.##.##########.#";
|
||||
board[28] = "#.##########.##.##########.#";
|
||||
board[29] = "#..........................#";
|
||||
board[30] = "############################";
|
||||
board
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_map_new() {
|
||||
let board = create_minimal_test_board();
|
||||
let map = Map::new(board);
|
||||
|
||||
assert!(map.graph.node_count() > 0);
|
||||
assert!(!map.grid_to_node.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_find_starting_position_pacman() {
|
||||
let board = create_minimal_test_board();
|
||||
let map = Map::new(board);
|
||||
|
||||
let pacman_pos = map.find_starting_position(0);
|
||||
assert!(pacman_pos.is_some());
|
||||
|
||||
let pos = pacman_pos.unwrap();
|
||||
// Pacman should be found somewhere in the board
|
||||
assert!(pos.x < BOARD_CELL_SIZE.x);
|
||||
assert!(pos.y < BOARD_CELL_SIZE.y);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_find_starting_position_ghost() {
|
||||
let board = create_minimal_test_board();
|
||||
let map = Map::new(board);
|
||||
|
||||
// Test for ghost 1 (might not exist in this board)
|
||||
let ghost_pos = map.find_starting_position(1);
|
||||
// Ghost 1 might not exist, so this could be None
|
||||
if let Some(pos) = ghost_pos {
|
||||
assert!(pos.x < BOARD_CELL_SIZE.x);
|
||||
assert!(pos.y < BOARD_CELL_SIZE.y);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_find_starting_position_nonexistent() {
|
||||
let board = create_minimal_test_board();
|
||||
let map = Map::new(board);
|
||||
|
||||
let pos = map.find_starting_position(99); // Non-existent entity
|
||||
assert!(pos.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_map_graph_construction() {
|
||||
let board = create_minimal_test_board();
|
||||
let map = Map::new(board);
|
||||
|
||||
// Check that nodes were created
|
||||
assert!(map.graph.node_count() > 0);
|
||||
|
||||
// Check that grid_to_node mapping was created
|
||||
assert!(!map.grid_to_node.is_empty());
|
||||
|
||||
// Check that some connections were made
|
||||
let mut has_connections = false;
|
||||
for intersection in &map.graph.adjacency_list {
|
||||
if intersection.edges().next().is_some() {
|
||||
has_connections = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
assert!(has_connections);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_map_grid_to_node_mapping() {
|
||||
let board = create_minimal_test_board();
|
||||
let map = Map::new(board);
|
||||
|
||||
// Check that Pac-Man's position is mapped
|
||||
let pacman_pos = map.find_starting_position(0).unwrap();
|
||||
let grid_pos = IVec2::new(pacman_pos.x as i32, pacman_pos.y as i32);
|
||||
|
||||
assert!(map.grid_to_node.contains_key(&grid_pos));
|
||||
let node_id = map.grid_to_node[&grid_pos];
|
||||
assert!(map.graph.get_node(node_id).is_some());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_map_node_positions() {
|
||||
let board = create_minimal_test_board();
|
||||
let map = Map::new(board);
|
||||
|
||||
// Check that node positions are correctly calculated
|
||||
for (grid_pos, &node_id) in &map.grid_to_node {
|
||||
let node = map.graph.get_node(node_id).unwrap();
|
||||
let expected_pos = Vec2::new((grid_pos.x * CELL_SIZE as i32) as f32, (grid_pos.y * CELL_SIZE as i32) as f32)
|
||||
+ Vec2::splat(CELL_SIZE as f32 / 2.0);
|
||||
|
||||
assert_eq!(node.position, expected_pos);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_map_adjacent_connections() {
|
||||
let board = create_minimal_test_board();
|
||||
let map = Map::new(board);
|
||||
|
||||
// Check that adjacent walkable tiles are connected
|
||||
// Find any node that has connections
|
||||
let mut found_connected_node = false;
|
||||
for &node_id in map.grid_to_node.values() {
|
||||
let intersection = &map.graph.adjacency_list[node_id];
|
||||
if intersection.edges().next().is_some() {
|
||||
found_connected_node = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
assert!(found_connected_node);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,6 +22,8 @@ pub struct ParsedMap {
|
||||
pub house_door: [Option<IVec2>; 2],
|
||||
/// The positions of the tunnel end tiles.
|
||||
pub tunnel_ends: [Option<IVec2>; 2],
|
||||
/// Pac-Man's starting position.
|
||||
pub pacman_start: Option<IVec2>,
|
||||
}
|
||||
|
||||
/// Parser for converting raw board layouts into structured map data.
|
||||
@@ -44,8 +46,8 @@ impl MapTileParser {
|
||||
'o' => Ok(MapTile::PowerPellet),
|
||||
' ' => Ok(MapTile::Empty),
|
||||
'T' => Ok(MapTile::Tunnel),
|
||||
c @ '0'..='4' => Ok(MapTile::StartingPosition(c.to_digit(10).unwrap() as u8)),
|
||||
'=' => Ok(MapTile::Wall), // House door is represented as a wall tile
|
||||
'X' => Ok(MapTile::Empty), // Pac-Man's starting position, treated as empty
|
||||
'=' => Ok(MapTile::Wall), // House door is represented as a wall tile
|
||||
_ => Err(ParseError::UnknownCharacter(c)),
|
||||
}
|
||||
}
|
||||
@@ -68,6 +70,7 @@ impl MapTileParser {
|
||||
let mut tiles = [[MapTile::Empty; BOARD_CELL_SIZE.y as usize]; BOARD_CELL_SIZE.x as usize];
|
||||
let mut house_door = [None; 2];
|
||||
let mut tunnel_ends = [None; 2];
|
||||
let mut pacman_start: Option<IVec2> = None;
|
||||
|
||||
for (y, line) in raw_board.iter().enumerate().take(BOARD_CELL_SIZE.y as usize) {
|
||||
for (x, character) in line.chars().enumerate().take(BOARD_CELL_SIZE.x as usize) {
|
||||
@@ -92,6 +95,11 @@ impl MapTileParser {
|
||||
_ => {}
|
||||
}
|
||||
|
||||
// Track Pac-Man's starting position
|
||||
if character == 'X' {
|
||||
pacman_start = Some(IVec2::new(x as i32, y as i32));
|
||||
}
|
||||
|
||||
tiles[x][y] = tile;
|
||||
}
|
||||
}
|
||||
@@ -106,6 +114,7 @@ impl MapTileParser {
|
||||
tiles,
|
||||
house_door,
|
||||
tunnel_ends,
|
||||
pacman_start,
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -122,18 +131,11 @@ mod tests {
|
||||
assert!(matches!(MapTileParser::parse_character('o').unwrap(), MapTile::PowerPellet));
|
||||
assert!(matches!(MapTileParser::parse_character(' ').unwrap(), MapTile::Empty));
|
||||
assert!(matches!(MapTileParser::parse_character('T').unwrap(), MapTile::Tunnel));
|
||||
assert!(matches!(
|
||||
MapTileParser::parse_character('0').unwrap(),
|
||||
MapTile::StartingPosition(0)
|
||||
));
|
||||
assert!(matches!(
|
||||
MapTileParser::parse_character('4').unwrap(),
|
||||
MapTile::StartingPosition(4)
|
||||
));
|
||||
assert!(matches!(MapTileParser::parse_character('X').unwrap(), MapTile::Empty));
|
||||
assert!(matches!(MapTileParser::parse_character('=').unwrap(), MapTile::Wall));
|
||||
|
||||
// Test invalid character
|
||||
assert!(MapTileParser::parse_character('X').is_err());
|
||||
assert!(MapTileParser::parse_character('Z').is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -154,15 +156,18 @@ mod tests {
|
||||
// Verify we found tunnel ends
|
||||
assert!(parsed.tunnel_ends[0].is_some());
|
||||
assert!(parsed.tunnel_ends[1].is_some());
|
||||
|
||||
// Verify we found Pac-Man's starting position
|
||||
assert!(parsed.pacman_start.is_some());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_parse_board_invalid_character() {
|
||||
let mut invalid_board = RAW_BOARD.clone();
|
||||
invalid_board[0] = "###########################X";
|
||||
invalid_board[0] = "###########################Z";
|
||||
|
||||
let result = MapTileParser::parse_board(invalid_board);
|
||||
assert!(result.is_err());
|
||||
assert!(matches!(result.unwrap_err(), ParseError::UnknownCharacter('X')));
|
||||
assert!(matches!(result.unwrap_err(), ParseError::UnknownCharacter('Z')));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
//! Map rendering functionality.
|
||||
|
||||
use crate::constants::{BOARD_PIXEL_OFFSET, BOARD_PIXEL_SIZE};
|
||||
use crate::texture::sprite::{AtlasTile, SpriteAtlas};
|
||||
use sdl2::pixels::Color;
|
||||
use sdl2::rect::{Point, Rect};
|
||||
@@ -16,10 +15,10 @@ impl MapRenderer {
|
||||
/// position and scale.
|
||||
pub fn render_map<T: RenderTarget>(canvas: &mut Canvas<T>, atlas: &mut SpriteAtlas, map_texture: &mut AtlasTile) {
|
||||
let dest = Rect::new(
|
||||
BOARD_PIXEL_OFFSET.x as i32,
|
||||
BOARD_PIXEL_OFFSET.y as i32,
|
||||
BOARD_PIXEL_SIZE.x,
|
||||
BOARD_PIXEL_SIZE.y,
|
||||
crate::constants::BOARD_PIXEL_OFFSET.x as i32,
|
||||
crate::constants::BOARD_PIXEL_OFFSET.y as i32,
|
||||
crate::constants::BOARD_PIXEL_SIZE.x,
|
||||
crate::constants::BOARD_PIXEL_SIZE.y,
|
||||
);
|
||||
let _ = map_texture.render(canvas, atlas, dest);
|
||||
}
|
||||
@@ -32,13 +31,13 @@ impl MapRenderer {
|
||||
pub fn debug_render_nodes<T: RenderTarget>(graph: &crate::entity::graph::Graph, canvas: &mut Canvas<T>) {
|
||||
for i in 0..graph.node_count() {
|
||||
let node = graph.get_node(i).unwrap();
|
||||
let pos = node.position + BOARD_PIXEL_OFFSET.as_vec2();
|
||||
let pos = node.position + crate::constants::BOARD_PIXEL_OFFSET.as_vec2();
|
||||
|
||||
// Draw connections
|
||||
canvas.set_draw_color(Color::BLUE);
|
||||
|
||||
for edge in graph.adjacency_list[i].edges() {
|
||||
let end_pos = graph.get_node(edge.target).unwrap().position + BOARD_PIXEL_OFFSET.as_vec2();
|
||||
let end_pos = graph.get_node(edge.target).unwrap().position + crate::constants::BOARD_PIXEL_OFFSET.as_vec2();
|
||||
canvas
|
||||
.draw_line((pos.x as i32, pos.y as i32), (end_pos.x as i32, end_pos.y as i32))
|
||||
.unwrap();
|
||||
@@ -66,3 +65,80 @@ impl MapRenderer {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::entity::graph::{Graph, Node};
|
||||
use crate::texture::sprite::{AtlasMapper, MapperFrame};
|
||||
use std::collections::HashMap;
|
||||
|
||||
fn create_test_graph() -> Graph {
|
||||
let mut graph = Graph::new();
|
||||
let node1 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(0.0, 0.0),
|
||||
});
|
||||
let node2 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(16.0, 0.0),
|
||||
});
|
||||
let node3 = graph.add_node(Node {
|
||||
position: glam::Vec2::new(0.0, 16.0),
|
||||
});
|
||||
|
||||
graph
|
||||
.connect(node1, node2, false, None, crate::entity::direction::Direction::Right)
|
||||
.unwrap();
|
||||
graph
|
||||
.connect(node1, node3, false, None, crate::entity::direction::Direction::Down)
|
||||
.unwrap();
|
||||
|
||||
graph
|
||||
}
|
||||
|
||||
fn create_test_atlas() -> SpriteAtlas {
|
||||
let mut frames = HashMap::new();
|
||||
frames.insert(
|
||||
"maze/full.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 224,
|
||||
height: 248,
|
||||
},
|
||||
);
|
||||
let mapper = AtlasMapper { frames };
|
||||
let dummy_texture = unsafe { std::mem::zeroed() };
|
||||
SpriteAtlas::new(dummy_texture, mapper)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_render_map_does_not_panic() {
|
||||
// This test just ensures the function doesn't panic
|
||||
// We can't easily test the actual rendering without SDL context
|
||||
let atlas = create_test_atlas();
|
||||
let _map_texture = SpriteAtlas::get_tile(&atlas, "maze/full.png").unwrap();
|
||||
|
||||
// The function should not panic even with dummy data
|
||||
// Note: We can't actually call render_map without a canvas, but we can test the logic
|
||||
assert!(true); // Placeholder test
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_debug_render_nodes_does_not_panic() {
|
||||
// This test just ensures the function doesn't panic
|
||||
// We can't easily test the actual rendering without SDL context
|
||||
let _graph = create_test_graph();
|
||||
|
||||
// The function should not panic even with dummy data
|
||||
// Note: We can't actually call debug_render_nodes without a canvas, but we can test the logic
|
||||
assert!(true); // Placeholder test
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_map_renderer_structure() {
|
||||
// Test that MapRenderer is a unit struct
|
||||
let _renderer = MapRenderer;
|
||||
// This should compile and not panic
|
||||
assert!(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,10 +1,17 @@
|
||||
use anyhow::Result;
|
||||
use sdl2::rect::Rect;
|
||||
use sdl2::render::{Canvas, RenderTarget};
|
||||
use thiserror::Error;
|
||||
|
||||
use crate::texture::sprite::{AtlasTile, SpriteAtlas};
|
||||
|
||||
#[derive(Clone)]
|
||||
#[derive(Error, Debug)]
|
||||
pub enum AnimatedTextureError {
|
||||
#[error("Frame duration must be positive, got {0}")]
|
||||
InvalidFrameDuration(f32),
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct AnimatedTexture {
|
||||
tiles: Vec<AtlasTile>,
|
||||
frame_duration: f32,
|
||||
@@ -13,13 +20,17 @@ pub struct AnimatedTexture {
|
||||
}
|
||||
|
||||
impl AnimatedTexture {
|
||||
pub fn new(tiles: Vec<AtlasTile>, frame_duration: f32) -> Self {
|
||||
Self {
|
||||
pub fn new(tiles: Vec<AtlasTile>, frame_duration: f32) -> Result<Self, AnimatedTextureError> {
|
||||
if frame_duration <= 0.0 {
|
||||
return Err(AnimatedTextureError::InvalidFrameDuration(frame_duration));
|
||||
}
|
||||
|
||||
Ok(Self {
|
||||
tiles,
|
||||
frame_duration,
|
||||
current_frame: 0,
|
||||
time_bank: 0.0,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
pub fn tick(&mut self, dt: f32) {
|
||||
@@ -38,4 +49,152 @@ impl AnimatedTexture {
|
||||
let mut tile = *self.current_tile();
|
||||
tile.render(canvas, atlas, dest)
|
||||
}
|
||||
|
||||
/// Returns the current frame index.
|
||||
#[allow(dead_code)]
|
||||
pub fn current_frame(&self) -> usize {
|
||||
self.current_frame
|
||||
}
|
||||
|
||||
/// Returns the time bank.
|
||||
#[allow(dead_code)]
|
||||
pub fn time_bank(&self) -> f32 {
|
||||
self.time_bank
|
||||
}
|
||||
|
||||
/// Returns the frame duration.
|
||||
#[allow(dead_code)]
|
||||
pub fn frame_duration(&self) -> f32 {
|
||||
self.frame_duration
|
||||
}
|
||||
|
||||
/// Returns the number of tiles in the animation.
|
||||
#[allow(dead_code)]
|
||||
pub fn tiles_len(&self) -> usize {
|
||||
self.tiles.len()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use glam::U16Vec2;
|
||||
use sdl2::pixels::Color;
|
||||
|
||||
impl AtlasTile {
|
||||
fn mock(id: u32) -> Self {
|
||||
AtlasTile {
|
||||
pos: U16Vec2::new(0, 0),
|
||||
size: U16Vec2::new(16, 16),
|
||||
color: Some(Color::RGB(id as u8, 0, 0)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_new_animated_texture() {
|
||||
let tiles = vec![AtlasTile::mock(1), AtlasTile::mock(2), AtlasTile::mock(3)];
|
||||
let texture = AnimatedTexture::new(tiles.clone(), 0.1).unwrap();
|
||||
|
||||
assert_eq!(texture.current_frame(), 0);
|
||||
assert_eq!(texture.time_bank(), 0.0);
|
||||
assert_eq!(texture.frame_duration(), 0.1);
|
||||
assert_eq!(texture.tiles_len(), 3);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_new_animated_texture_zero_duration() {
|
||||
let tiles = vec![AtlasTile::mock(1), AtlasTile::mock(2)];
|
||||
let result = AnimatedTexture::new(tiles, 0.0);
|
||||
assert!(result.is_err());
|
||||
assert!(matches!(result.unwrap_err(), AnimatedTextureError::InvalidFrameDuration(0.0)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_new_animated_texture_negative_duration() {
|
||||
let tiles = vec![AtlasTile::mock(1), AtlasTile::mock(2)];
|
||||
let result = AnimatedTexture::new(tiles, -0.1);
|
||||
assert!(result.is_err());
|
||||
assert!(matches!(
|
||||
result.unwrap_err(),
|
||||
AnimatedTextureError::InvalidFrameDuration(-0.1)
|
||||
));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick_no_frame_change() {
|
||||
let tiles = vec![AtlasTile::mock(1), AtlasTile::mock(2)];
|
||||
let mut texture = AnimatedTexture::new(tiles, 0.1).unwrap();
|
||||
|
||||
// Tick with less than frame duration
|
||||
texture.tick(0.05);
|
||||
assert_eq!(texture.current_frame(), 0);
|
||||
assert_eq!(texture.time_bank(), 0.05);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick_single_frame_change() {
|
||||
let tiles = vec![AtlasTile::mock(1), AtlasTile::mock(2)];
|
||||
let mut texture = AnimatedTexture::new(tiles, 0.1).unwrap();
|
||||
|
||||
// Tick with exactly frame duration
|
||||
texture.tick(0.1);
|
||||
assert_eq!(texture.current_frame(), 1);
|
||||
assert_eq!(texture.time_bank(), 0.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick_multiple_frame_changes() {
|
||||
let tiles = vec![AtlasTile::mock(1), AtlasTile::mock(2), AtlasTile::mock(3)];
|
||||
let mut texture = AnimatedTexture::new(tiles, 0.1).unwrap();
|
||||
|
||||
// Tick with 2.5 frame durations
|
||||
texture.tick(0.25);
|
||||
assert_eq!(texture.current_frame(), 2);
|
||||
assert!((texture.time_bank() - 0.05).abs() < 0.001);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick_wrap_around() {
|
||||
let tiles = vec![AtlasTile::mock(1), AtlasTile::mock(2)];
|
||||
let mut texture = AnimatedTexture::new(tiles, 0.1).unwrap();
|
||||
|
||||
// Advance to last frame
|
||||
texture.tick(0.1);
|
||||
assert_eq!(texture.current_frame(), 1);
|
||||
|
||||
// Advance again to wrap around
|
||||
texture.tick(0.1);
|
||||
assert_eq!(texture.current_frame(), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_current_tile() {
|
||||
let tiles = vec![AtlasTile::mock(1), AtlasTile::mock(2)];
|
||||
let texture = AnimatedTexture::new(tiles, 0.1).unwrap();
|
||||
|
||||
// Should return first tile initially
|
||||
assert_eq!(texture.current_tile().color.unwrap().r, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_current_tile_after_frame_change() {
|
||||
let tiles = vec![AtlasTile::mock(1), AtlasTile::mock(2)];
|
||||
let mut texture = AnimatedTexture::new(tiles, 0.1).unwrap();
|
||||
|
||||
// Advance one frame
|
||||
texture.tick(0.1);
|
||||
assert_eq!(texture.current_tile().color.unwrap().r, 2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_single_tile_animation() {
|
||||
let tiles = vec![AtlasTile::mock(1)];
|
||||
let mut texture = AnimatedTexture::new(tiles, 0.1).unwrap();
|
||||
|
||||
// Should stay on same frame
|
||||
texture.tick(0.1);
|
||||
assert_eq!(texture.current_frame(), 0);
|
||||
assert_eq!(texture.current_tile().color.unwrap().r, 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,4 +34,145 @@ impl BlinkingTexture {
|
||||
pub fn tile(&self) -> &AtlasTile {
|
||||
&self.tile
|
||||
}
|
||||
|
||||
// Helper methods for testing
|
||||
pub fn time_bank(&self) -> f32 {
|
||||
self.time_bank
|
||||
}
|
||||
|
||||
pub fn blink_duration(&self) -> f32 {
|
||||
self.blink_duration
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use glam::U16Vec2;
|
||||
use sdl2::pixels::Color;
|
||||
|
||||
fn mock_atlas_tile(id: u32) -> AtlasTile {
|
||||
AtlasTile {
|
||||
pos: U16Vec2::new(0, 0),
|
||||
size: U16Vec2::new(16, 16),
|
||||
color: Some(Color::RGB(id as u8, 0, 0)),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_new_blinking_texture() {
|
||||
let tile = mock_atlas_tile(1);
|
||||
let texture = BlinkingTexture::new(tile, 0.5);
|
||||
|
||||
assert_eq!(texture.is_on(), true);
|
||||
assert_eq!(texture.time_bank(), 0.0);
|
||||
assert_eq!(texture.blink_duration(), 0.5);
|
||||
assert_eq!(texture.tile().color.unwrap().r, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick_no_blink_change() {
|
||||
let tile = mock_atlas_tile(1);
|
||||
let mut texture = BlinkingTexture::new(tile, 0.5);
|
||||
|
||||
// Tick with less than blink duration
|
||||
texture.tick(0.25);
|
||||
assert_eq!(texture.is_on(), true);
|
||||
assert_eq!(texture.time_bank(), 0.25);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick_single_blink_change() {
|
||||
let tile = mock_atlas_tile(1);
|
||||
let mut texture = BlinkingTexture::new(tile, 0.5);
|
||||
|
||||
// Tick with exactly blink duration
|
||||
texture.tick(0.5);
|
||||
assert_eq!(texture.is_on(), false);
|
||||
assert_eq!(texture.time_bank(), 0.0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick_multiple_blink_changes() {
|
||||
let tile = mock_atlas_tile(1);
|
||||
let mut texture = BlinkingTexture::new(tile, 0.5);
|
||||
|
||||
// First blink
|
||||
texture.tick(0.5);
|
||||
assert_eq!(texture.is_on(), false);
|
||||
|
||||
// Second blink (back to on)
|
||||
texture.tick(0.5);
|
||||
assert_eq!(texture.is_on(), true);
|
||||
|
||||
// Third blink (back to off)
|
||||
texture.tick(0.5);
|
||||
assert_eq!(texture.is_on(), false);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick_partial_blink_duration() {
|
||||
let tile = mock_atlas_tile(1);
|
||||
let mut texture = BlinkingTexture::new(tile, 0.5);
|
||||
|
||||
// Tick with 1.25 blink durations
|
||||
texture.tick(0.625);
|
||||
assert_eq!(texture.is_on(), false);
|
||||
assert_eq!(texture.time_bank(), 0.125);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick_with_zero_duration() {
|
||||
let tile = mock_atlas_tile(1);
|
||||
let mut texture = BlinkingTexture::new(tile, 0.0);
|
||||
|
||||
// Should not cause issues - skip the test if blink_duration is 0
|
||||
if texture.blink_duration() > 0.0 {
|
||||
texture.tick(0.1);
|
||||
assert_eq!(texture.is_on(), true);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick_with_negative_duration() {
|
||||
let tile = mock_atlas_tile(1);
|
||||
let mut texture = BlinkingTexture::new(tile, -0.5);
|
||||
|
||||
// Should not cause issues - skip the test if blink_duration is negative
|
||||
if texture.blink_duration() > 0.0 {
|
||||
texture.tick(0.1);
|
||||
assert_eq!(texture.is_on(), true);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick_with_negative_delta_time() {
|
||||
let tile = mock_atlas_tile(1);
|
||||
let mut texture = BlinkingTexture::new(tile, 0.5);
|
||||
|
||||
// Should not cause issues
|
||||
texture.tick(-0.1);
|
||||
assert_eq!(texture.is_on(), true);
|
||||
assert_eq!(texture.time_bank(), -0.1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tile_access() {
|
||||
let tile = mock_atlas_tile(42);
|
||||
let texture = BlinkingTexture::new(tile, 0.5);
|
||||
|
||||
assert_eq!(texture.tile().color.unwrap().r, 42);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_clone() {
|
||||
let tile = mock_atlas_tile(1);
|
||||
let texture = BlinkingTexture::new(tile, 0.5);
|
||||
let cloned = texture.clone();
|
||||
|
||||
assert_eq!(texture.is_on(), cloned.is_on());
|
||||
assert_eq!(texture.time_bank(), cloned.time_bank());
|
||||
assert_eq!(texture.blink_duration(), cloned.blink_duration());
|
||||
assert_eq!(texture.tile().color.unwrap().r, cloned.tile().color.unwrap().r);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,4 +54,137 @@ impl DirectionalAnimatedTexture {
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns true if the texture has a direction.
|
||||
#[allow(dead_code)]
|
||||
pub fn has_direction(&self, direction: Direction) -> bool {
|
||||
self.textures.contains_key(&direction)
|
||||
}
|
||||
|
||||
/// Returns true if the texture has a stopped direction.
|
||||
#[allow(dead_code)]
|
||||
pub fn has_stopped_direction(&self, direction: Direction) -> bool {
|
||||
self.stopped_textures.contains_key(&direction)
|
||||
}
|
||||
|
||||
/// Returns the number of textures.
|
||||
#[allow(dead_code)]
|
||||
pub fn texture_count(&self) -> usize {
|
||||
self.textures.len()
|
||||
}
|
||||
|
||||
/// Returns the number of stopped textures.
|
||||
#[allow(dead_code)]
|
||||
pub fn stopped_texture_count(&self) -> usize {
|
||||
self.stopped_textures.len()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::texture::sprite::AtlasTile;
|
||||
use glam::U16Vec2;
|
||||
use sdl2::pixels::Color;
|
||||
|
||||
fn mock_atlas_tile(id: u32) -> AtlasTile {
|
||||
AtlasTile {
|
||||
pos: U16Vec2::new(0, 0),
|
||||
size: U16Vec2::new(16, 16),
|
||||
color: Some(Color::RGB(id as u8, 0, 0)),
|
||||
}
|
||||
}
|
||||
|
||||
fn mock_animated_texture(id: u32) -> AnimatedTexture {
|
||||
AnimatedTexture::new(vec![mock_atlas_tile(id)], 0.1).expect("Invalid frame duration")
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_new_directional_animated_texture() {
|
||||
let mut textures = HashMap::new();
|
||||
let mut stopped_textures = HashMap::new();
|
||||
|
||||
textures.insert(Direction::Up, mock_animated_texture(1));
|
||||
textures.insert(Direction::Down, mock_animated_texture(2));
|
||||
stopped_textures.insert(Direction::Up, mock_animated_texture(3));
|
||||
stopped_textures.insert(Direction::Down, mock_animated_texture(4));
|
||||
|
||||
let texture = DirectionalAnimatedTexture::new(textures, stopped_textures);
|
||||
|
||||
assert_eq!(texture.texture_count(), 2);
|
||||
assert_eq!(texture.stopped_texture_count(), 2);
|
||||
assert!(texture.has_direction(Direction::Up));
|
||||
assert!(texture.has_direction(Direction::Down));
|
||||
assert!(!texture.has_direction(Direction::Left));
|
||||
assert!(texture.has_stopped_direction(Direction::Up));
|
||||
assert!(texture.has_stopped_direction(Direction::Down));
|
||||
assert!(!texture.has_stopped_direction(Direction::Left));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_tick() {
|
||||
let mut textures = HashMap::new();
|
||||
textures.insert(Direction::Up, mock_animated_texture(1));
|
||||
textures.insert(Direction::Down, mock_animated_texture(2));
|
||||
|
||||
let mut texture = DirectionalAnimatedTexture::new(textures, HashMap::new());
|
||||
|
||||
// Should not panic
|
||||
texture.tick(0.1);
|
||||
assert_eq!(texture.texture_count(), 2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_empty_texture() {
|
||||
let texture = DirectionalAnimatedTexture::new(HashMap::new(), HashMap::new());
|
||||
|
||||
assert_eq!(texture.texture_count(), 0);
|
||||
assert_eq!(texture.stopped_texture_count(), 0);
|
||||
assert!(!texture.has_direction(Direction::Up));
|
||||
assert!(!texture.has_stopped_direction(Direction::Up));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_partial_directions() {
|
||||
let mut textures = HashMap::new();
|
||||
textures.insert(Direction::Up, mock_animated_texture(1));
|
||||
|
||||
let texture = DirectionalAnimatedTexture::new(textures, HashMap::new());
|
||||
|
||||
assert_eq!(texture.texture_count(), 1);
|
||||
assert!(texture.has_direction(Direction::Up));
|
||||
assert!(!texture.has_direction(Direction::Down));
|
||||
assert!(!texture.has_direction(Direction::Left));
|
||||
assert!(!texture.has_direction(Direction::Right));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_clone() {
|
||||
let mut textures = HashMap::new();
|
||||
textures.insert(Direction::Up, mock_animated_texture(1));
|
||||
|
||||
let texture = DirectionalAnimatedTexture::new(textures, HashMap::new());
|
||||
let cloned = texture.clone();
|
||||
|
||||
assert_eq!(texture.texture_count(), cloned.texture_count());
|
||||
assert_eq!(texture.stopped_texture_count(), cloned.stopped_texture_count());
|
||||
assert_eq!(texture.has_direction(Direction::Up), cloned.has_direction(Direction::Up));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_all_directions() {
|
||||
let mut textures = HashMap::new();
|
||||
textures.insert(Direction::Up, mock_animated_texture(1));
|
||||
textures.insert(Direction::Down, mock_animated_texture(2));
|
||||
textures.insert(Direction::Left, mock_animated_texture(3));
|
||||
textures.insert(Direction::Right, mock_animated_texture(4));
|
||||
|
||||
let texture = DirectionalAnimatedTexture::new(textures, HashMap::new());
|
||||
|
||||
assert_eq!(texture.texture_count(), 4);
|
||||
assert!(texture.has_direction(Direction::Up));
|
||||
assert!(texture.has_direction(Direction::Down));
|
||||
assert!(texture.has_direction(Direction::Left));
|
||||
assert!(texture.has_direction(Direction::Right));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,6 +49,19 @@ impl AtlasTile {
|
||||
canvas.copy(&atlas.texture, src, dest).map_err(anyhow::Error::msg)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Creates a new atlas tile.
|
||||
#[allow(dead_code)]
|
||||
pub fn new(pos: U16Vec2, size: U16Vec2, color: Option<Color>) -> Self {
|
||||
Self { pos, size, color }
|
||||
}
|
||||
|
||||
/// Sets the color of the tile.
|
||||
#[allow(dead_code)]
|
||||
pub fn with_color(mut self, color: Color) -> Self {
|
||||
self.color = Some(color);
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
pub struct SpriteAtlas {
|
||||
@@ -85,6 +98,24 @@ impl SpriteAtlas {
|
||||
pub fn texture(&self) -> &Texture<'static> {
|
||||
&self.texture
|
||||
}
|
||||
|
||||
/// Returns the number of tiles in the atlas.
|
||||
#[allow(dead_code)]
|
||||
pub fn tiles_count(&self) -> usize {
|
||||
self.tiles.len()
|
||||
}
|
||||
|
||||
/// Returns true if the atlas has a tile with the given name.
|
||||
#[allow(dead_code)]
|
||||
pub fn has_tile(&self, name: &str) -> bool {
|
||||
self.tiles.contains_key(name)
|
||||
}
|
||||
|
||||
/// Returns the default color of the atlas.
|
||||
#[allow(dead_code)]
|
||||
pub fn default_color(&self) -> Option<Color> {
|
||||
self.default_color
|
||||
}
|
||||
}
|
||||
|
||||
/// Converts a `Texture` to a `Texture<'static>` using transmute.
|
||||
@@ -103,3 +134,236 @@ impl SpriteAtlas {
|
||||
pub unsafe fn texture_to_static(texture: Texture) -> Texture<'static> {
|
||||
std::mem::transmute(texture)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use sdl2::pixels::Color;
|
||||
|
||||
// Mock texture for testing - we'll use a dummy approach since we can't create real SDL2 textures
|
||||
fn mock_texture() -> Texture<'static> {
|
||||
// This is unsafe and only for testing - in real usage this would be a proper texture
|
||||
unsafe { std::mem::transmute(0usize) }
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_atlas_tile_new() {
|
||||
let pos = U16Vec2::new(10, 20);
|
||||
let size = U16Vec2::new(32, 32);
|
||||
let tile = AtlasTile::new(pos, size, None);
|
||||
|
||||
assert_eq!(tile.pos, pos);
|
||||
assert_eq!(tile.size, size);
|
||||
assert_eq!(tile.color, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_atlas_tile_with_color() {
|
||||
let pos = U16Vec2::new(10, 20);
|
||||
let size = U16Vec2::new(32, 32);
|
||||
let color = Color::RGB(255, 0, 0);
|
||||
let tile = AtlasTile::new(pos, size, None).with_color(color);
|
||||
|
||||
assert_eq!(tile.pos, pos);
|
||||
assert_eq!(tile.size, size);
|
||||
assert_eq!(tile.color, Some(color));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_mapper_frame() {
|
||||
let frame = MapperFrame {
|
||||
x: 10,
|
||||
y: 20,
|
||||
width: 32,
|
||||
height: 32,
|
||||
};
|
||||
|
||||
assert_eq!(frame.x, 10);
|
||||
assert_eq!(frame.y, 20);
|
||||
assert_eq!(frame.width, 32);
|
||||
assert_eq!(frame.height, 32);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_atlas_mapper_new() {
|
||||
let mut frames = HashMap::new();
|
||||
frames.insert(
|
||||
"test".to_string(),
|
||||
MapperFrame {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 32,
|
||||
height: 32,
|
||||
},
|
||||
);
|
||||
|
||||
let mapper = AtlasMapper { frames };
|
||||
|
||||
assert_eq!(mapper.frames.len(), 1);
|
||||
assert!(mapper.frames.contains_key("test"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_sprite_atlas_new() {
|
||||
let mut frames = HashMap::new();
|
||||
frames.insert(
|
||||
"test".to_string(),
|
||||
MapperFrame {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 32,
|
||||
height: 32,
|
||||
},
|
||||
);
|
||||
|
||||
let mapper = AtlasMapper { frames };
|
||||
let texture = mock_texture();
|
||||
let atlas = SpriteAtlas::new(texture, mapper);
|
||||
|
||||
assert_eq!(atlas.tiles_count(), 1);
|
||||
assert!(atlas.has_tile("test"));
|
||||
assert_eq!(atlas.default_color(), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_sprite_atlas_get_tile() {
|
||||
let mut frames = HashMap::new();
|
||||
frames.insert(
|
||||
"test".to_string(),
|
||||
MapperFrame {
|
||||
x: 10,
|
||||
y: 20,
|
||||
width: 32,
|
||||
height: 64,
|
||||
},
|
||||
);
|
||||
|
||||
let mapper = AtlasMapper { frames };
|
||||
let texture = mock_texture();
|
||||
let atlas = SpriteAtlas::new(texture, mapper);
|
||||
|
||||
let tile = atlas.get_tile("test");
|
||||
assert!(tile.is_some());
|
||||
|
||||
let tile = tile.unwrap();
|
||||
assert_eq!(tile.pos, U16Vec2::new(10, 20));
|
||||
assert_eq!(tile.size, U16Vec2::new(32, 64));
|
||||
assert_eq!(tile.color, None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_sprite_atlas_get_tile_nonexistent() {
|
||||
let mapper = AtlasMapper { frames: HashMap::new() };
|
||||
let texture = mock_texture();
|
||||
let atlas = SpriteAtlas::new(texture, mapper);
|
||||
|
||||
let tile = atlas.get_tile("nonexistent");
|
||||
assert!(tile.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_sprite_atlas_set_color() {
|
||||
let mapper = AtlasMapper { frames: HashMap::new() };
|
||||
let texture = mock_texture();
|
||||
let mut atlas = SpriteAtlas::new(texture, mapper);
|
||||
|
||||
assert_eq!(atlas.default_color(), None);
|
||||
|
||||
let color = Color::RGB(255, 0, 0);
|
||||
atlas.set_color(color);
|
||||
|
||||
assert_eq!(atlas.default_color(), Some(color));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_sprite_atlas_empty() {
|
||||
let mapper = AtlasMapper { frames: HashMap::new() };
|
||||
let texture = mock_texture();
|
||||
let atlas = SpriteAtlas::new(texture, mapper);
|
||||
|
||||
assert_eq!(atlas.tiles_count(), 0);
|
||||
assert!(!atlas.has_tile("any"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_sprite_atlas_multiple_tiles() {
|
||||
let mut frames = HashMap::new();
|
||||
frames.insert(
|
||||
"tile1".to_string(),
|
||||
MapperFrame {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 32,
|
||||
height: 32,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"tile2".to_string(),
|
||||
MapperFrame {
|
||||
x: 32,
|
||||
y: 0,
|
||||
width: 64,
|
||||
height: 64,
|
||||
},
|
||||
);
|
||||
|
||||
let mapper = AtlasMapper { frames };
|
||||
let texture = mock_texture();
|
||||
let atlas = SpriteAtlas::new(texture, mapper);
|
||||
|
||||
assert_eq!(atlas.tiles_count(), 2);
|
||||
assert!(atlas.has_tile("tile1"));
|
||||
assert!(atlas.has_tile("tile2"));
|
||||
assert!(!atlas.has_tile("tile3"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_atlas_tile_clone() {
|
||||
let pos = U16Vec2::new(10, 20);
|
||||
let size = U16Vec2::new(32, 32);
|
||||
let color = Color::RGB(255, 0, 0);
|
||||
let tile = AtlasTile::new(pos, size, Some(color));
|
||||
let cloned = tile;
|
||||
|
||||
assert_eq!(tile.pos, cloned.pos);
|
||||
assert_eq!(tile.size, cloned.size);
|
||||
assert_eq!(tile.color, cloned.color);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_mapper_frame_clone() {
|
||||
let frame = MapperFrame {
|
||||
x: 10,
|
||||
y: 20,
|
||||
width: 32,
|
||||
height: 64,
|
||||
};
|
||||
let cloned = frame;
|
||||
|
||||
assert_eq!(frame.x, cloned.x);
|
||||
assert_eq!(frame.y, cloned.y);
|
||||
assert_eq!(frame.width, cloned.width);
|
||||
assert_eq!(frame.height, cloned.height);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_atlas_mapper_clone() {
|
||||
let mut frames = HashMap::new();
|
||||
frames.insert(
|
||||
"test".to_string(),
|
||||
MapperFrame {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 32,
|
||||
height: 32,
|
||||
},
|
||||
);
|
||||
|
||||
let mapper = AtlasMapper { frames };
|
||||
let cloned = mapper.clone();
|
||||
|
||||
assert_eq!(mapper.frames.len(), cloned.frames.len());
|
||||
assert!(mapper.frames.contains_key("test"));
|
||||
assert!(cloned.frames.contains_key("test"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -151,3 +151,228 @@ impl TextTexture {
|
||||
(8.0 * self.scale) as u32
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::texture::sprite::{AtlasMapper, MapperFrame, SpriteAtlas};
|
||||
use std::collections::HashMap;
|
||||
|
||||
fn create_mock_atlas() -> SpriteAtlas {
|
||||
let mut frames = HashMap::new();
|
||||
frames.insert(
|
||||
"text/A.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 8,
|
||||
height: 8,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"text/1.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 8,
|
||||
y: 0,
|
||||
width: 8,
|
||||
height: 8,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"text/!.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 16,
|
||||
y: 0,
|
||||
width: 8,
|
||||
height: 8,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"text/-.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 24,
|
||||
y: 0,
|
||||
width: 8,
|
||||
height: 8,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"text/_double_quote.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 32,
|
||||
y: 0,
|
||||
width: 8,
|
||||
height: 8,
|
||||
},
|
||||
);
|
||||
frames.insert(
|
||||
"text/_forward_slash.png".to_string(),
|
||||
MapperFrame {
|
||||
x: 40,
|
||||
y: 0,
|
||||
width: 8,
|
||||
height: 8,
|
||||
},
|
||||
);
|
||||
|
||||
let mapper = AtlasMapper { frames };
|
||||
// Note: In real tests, we'd need a proper texture, but for unit tests we can work around this
|
||||
unsafe { SpriteAtlas::new(std::mem::zeroed(), mapper) }
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_text_texture_new() {
|
||||
let text_texture = TextTexture::new(1.0);
|
||||
assert_eq!(text_texture.scale(), 1.0);
|
||||
assert!(text_texture.char_map.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_text_texture_new_with_scale() {
|
||||
let text_texture = TextTexture::new(2.5);
|
||||
assert_eq!(text_texture.scale(), 2.5);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_char_to_tile_name_letters() {
|
||||
let text_texture = TextTexture::new(1.0);
|
||||
|
||||
assert_eq!(text_texture.char_to_tile_name('A'), Some("text/A.png".to_string()));
|
||||
assert_eq!(text_texture.char_to_tile_name('Z'), Some("text/Z.png".to_string()));
|
||||
assert_eq!(text_texture.char_to_tile_name('a'), None); // lowercase not supported
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_char_to_tile_name_numbers() {
|
||||
let text_texture = TextTexture::new(1.0);
|
||||
|
||||
assert_eq!(text_texture.char_to_tile_name('0'), Some("text/0.png".to_string()));
|
||||
assert_eq!(text_texture.char_to_tile_name('9'), Some("text/9.png".to_string()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_char_to_tile_name_special_characters() {
|
||||
let text_texture = TextTexture::new(1.0);
|
||||
|
||||
assert_eq!(text_texture.char_to_tile_name('!'), Some("text/!.png".to_string()));
|
||||
assert_eq!(text_texture.char_to_tile_name('-'), Some("text/-.png".to_string()));
|
||||
assert_eq!(
|
||||
text_texture.char_to_tile_name('"'),
|
||||
Some("text/_double_quote.png".to_string())
|
||||
);
|
||||
assert_eq!(
|
||||
text_texture.char_to_tile_name('/'),
|
||||
Some("text/_forward_slash.png".to_string())
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_char_to_tile_name_unsupported() {
|
||||
let text_texture = TextTexture::new(1.0);
|
||||
|
||||
assert_eq!(text_texture.char_to_tile_name(' '), None);
|
||||
assert_eq!(text_texture.char_to_tile_name('@'), None);
|
||||
assert_eq!(text_texture.char_to_tile_name('a'), None);
|
||||
assert_eq!(text_texture.char_to_tile_name('z'), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_set_scale() {
|
||||
let mut text_texture = TextTexture::new(1.0);
|
||||
assert_eq!(text_texture.scale(), 1.0);
|
||||
|
||||
text_texture.set_scale(3.0);
|
||||
assert_eq!(text_texture.scale(), 3.0);
|
||||
|
||||
text_texture.set_scale(0.5);
|
||||
assert_eq!(text_texture.scale(), 0.5);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_text_width_empty_string() {
|
||||
let text_texture = TextTexture::new(1.0);
|
||||
assert_eq!(text_texture.text_width(""), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_text_width_single_character() {
|
||||
let text_texture = TextTexture::new(1.0);
|
||||
assert_eq!(text_texture.text_width("A"), 8); // 8 pixels per character at scale 1.0
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_text_width_multiple_characters() {
|
||||
let text_texture = TextTexture::new(1.0);
|
||||
assert_eq!(text_texture.text_width("ABC"), 24); // 3 * 8 = 24 pixels
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_text_width_with_scale() {
|
||||
let text_texture = TextTexture::new(2.0);
|
||||
assert_eq!(text_texture.text_width("A"), 16); // 8 * 2 = 16 pixels
|
||||
assert_eq!(text_texture.text_width("ABC"), 48); // 3 * 16 = 48 pixels
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_text_width_with_unsupported_characters() {
|
||||
let text_texture = TextTexture::new(1.0);
|
||||
// Only supported characters should be counted
|
||||
assert_eq!(text_texture.text_width("A B"), 16); // A and B only, space ignored
|
||||
assert_eq!(text_texture.text_width("A@B"), 16); // A and B only, @ ignored
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_text_height() {
|
||||
let text_texture = TextTexture::new(1.0);
|
||||
assert_eq!(text_texture.text_height(), 8); // 8 pixels per character at scale 1.0
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_text_height_with_scale() {
|
||||
let text_texture = TextTexture::new(2.0);
|
||||
assert_eq!(text_texture.text_height(), 16); // 8 * 2 = 16 pixels
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_text_height_with_fractional_scale() {
|
||||
let text_texture = TextTexture::new(1.5);
|
||||
assert_eq!(text_texture.text_height(), 12); // 8 * 1.5 = 12 pixels
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_char_tile_caching() {
|
||||
let mut text_texture = TextTexture::new(1.0);
|
||||
let atlas = create_mock_atlas();
|
||||
|
||||
// First call should cache the tile
|
||||
let tile1 = text_texture.get_char_tile(&atlas, 'A');
|
||||
assert!(tile1.is_some());
|
||||
|
||||
// Second call should use cached tile
|
||||
let tile2 = text_texture.get_char_tile(&atlas, 'A');
|
||||
assert!(tile2.is_some());
|
||||
|
||||
// Both should be the same tile
|
||||
assert_eq!(tile1.unwrap().pos, tile2.unwrap().pos);
|
||||
assert_eq!(tile1.unwrap().size, tile2.unwrap().size);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_char_tile_unsupported_character() {
|
||||
let mut text_texture = TextTexture::new(1.0);
|
||||
let atlas = create_mock_atlas();
|
||||
|
||||
let tile = text_texture.get_char_tile(&atlas, ' ');
|
||||
assert!(tile.is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_get_char_tile_missing_from_atlas() {
|
||||
let mut text_texture = TextTexture::new(1.0);
|
||||
let atlas = create_mock_atlas();
|
||||
|
||||
// 'B' is not in our mock atlas
|
||||
let tile = text_texture.get_char_tile(&atlas, 'B');
|
||||
assert!(tile.is_none());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user