Compare commits

...

11 Commits

16 changed files with 1320 additions and 117 deletions

2
.config/nextest.toml Normal file
View File

@@ -0,0 +1,2 @@
[profile.default]
fail-fast = false

View File

@@ -111,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: |

View File

@@ -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,20 +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 Lcov \
--output-dir coverage \
--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/lcov.info
files: ./lcov.info
format: lcov
allow-empty: false

View File

@@ -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

View File

@@ -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))?;

View File

@@ -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) {
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,6 +155,12 @@ 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)]
@@ -143,8 +211,12 @@ mod tests {
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() {
@@ -171,6 +243,13 @@ mod tests {
}
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
@@ -190,6 +269,13 @@ mod tests {
}
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());
}
@@ -203,6 +289,29 @@ mod tests {
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();
}
}

View File

@@ -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#",
"###.##.##.########.##.##.###",
"###.##.##.########.##.##.###",
"#......##....##....##......#",
@@ -139,30 +137,12 @@ mod tests {
fn test_map_tile_variants() {
assert_ne!(MapTile::Empty, MapTile::Wall);
assert_ne!(MapTile::Pellet, MapTile::PowerPellet);
assert_ne!(MapTile::StartingPosition(0), MapTile::StartingPosition(1));
assert_ne!(MapTile::Tunnel, MapTile::Empty);
}
#[test]
fn test_map_tile_starting_position() {
let pos0 = MapTile::StartingPosition(0);
let pos1 = MapTile::StartingPosition(1);
let pos0_clone = MapTile::StartingPosition(0);
assert_eq!(pos0, pos0_clone);
assert_ne!(pos0, pos1);
}
#[test]
fn test_map_tile_debug() {
let tile = MapTile::Wall;
let debug_str = format!("{:?}", tile);
assert!(!debug_str.is_empty());
}
#[test]
fn test_map_tile_clone() {
let original = MapTile::StartingPosition(5);
let original = MapTile::Wall;
let cloned = original;
assert_eq!(original, cloned);
}
@@ -217,10 +197,10 @@ mod tests {
#[test]
fn test_raw_board_starting_position() {
// Should have a starting position '0' for Pac-Man
// Should have a starting position 'X' for Pac-Man
let mut found_starting_position = false;
for row in RAW_BOARD.iter() {
if row.contains('0') {
if row.contains('X') {
found_starting_position = true;
break;
}

View File

@@ -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));
}
}

View File

@@ -96,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);
}
}

View File

@@ -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());
}
}

View File

@@ -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
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);
}
}

View File

@@ -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,7 +46,7 @@ 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)),
'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')));
}
}

View File

@@ -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);
}
}

View File

@@ -50,19 +50,26 @@ impl AnimatedTexture {
tile.render(canvas, atlas, dest)
}
// Helper methods for testing
/// 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()
}

View File

@@ -55,19 +55,26 @@ impl DirectionalAnimatedTexture {
}
}
// Helper methods for testing
/// 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()
}

View File

@@ -50,11 +50,14 @@ impl AtlasTile {
Ok(())
}
// Helper methods for testing
/// 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
@@ -96,15 +99,20 @@ impl SpriteAtlas {
&self.texture
}
// Helper methods for testing
/// 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
}