xevion/Pac-Man
1
0
Fork 0
mirror of https://github.com/Xevion/Pac-Man.git synced 2026-01-31 06:25:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat: revamp with better separate directional/linear animations, direction independent ticking

Browse Source
This commit is contained in:
Ryan Walters
2025-09-01 15:28:57 -05:00
parent b53db3788d
commit a21459f337
11 changed files with 469 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/animated.rs
+46 -47
View File
@@ -1,58 +1,57 @@
use glam::U16Vec2;
use pacman::error::{AnimatedTextureError, GameError, TextureError};
use pacman::texture::animated::AnimatedTexture;
use pacman::texture::sprite::AtlasTile;
use sdl2::pixels::Color;
use smallvec::smallvec;
// use glam::U16Vec2;
// use pacman::error::{AnimatedTextureError, GameError, TextureError};
// use pacman::texture::sprite::AtlasTile;
// use sdl2::pixels::Color;
// use smallvec::smallvec;
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_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_animated_texture_creation_errors() {
let tiles = smallvec![mock_atlas_tile(1), mock_atlas_tile(2)];
// #[test]
// fn test_animated_texture_creation_errors() {
// let tiles = smallvec![mock_atlas_tile(1), mock_atlas_tile(2)];
assert!(matches!(
AnimatedTexture::new(tiles.clone(), 0).unwrap_err(),
GameError::Texture(TextureError::Animated(AnimatedTextureError::InvalidFrameDuration(0)))
));
}
// assert!(matches!(
// AnimatedTexture::new(tiles.clone(), 0).unwrap_err(),
// GameError::Texture(TextureError::Animated(AnimatedTextureError::InvalidFrameDuration(0)))
// ));
// }
#[test]
fn test_animated_texture_advancement() {
let tiles = smallvec![mock_atlas_tile(1), mock_atlas_tile(2), mock_atlas_tile(3)];
let mut texture = AnimatedTexture::new(tiles, 10).unwrap();
// #[test]
// fn test_animated_texture_advancement() {
// let tiles = smallvec![mock_atlas_tile(1), mock_atlas_tile(2), mock_atlas_tile(3)];
// let mut texture = AnimatedTexture::new(tiles, 10).unwrap();
assert_eq!(texture.current_frame(), 0);
// assert_eq!(texture.current_frame(), 0);
texture.tick(25);
assert_eq!(texture.current_frame(), 2);
assert_eq!(texture.time_bank(), 5);
}
// texture.tick(25);
// assert_eq!(texture.current_frame(), 2);
// assert_eq!(texture.time_bank(), 5);
// }
#[test]
fn test_animated_texture_wrap_around() {
let tiles = smallvec![mock_atlas_tile(1), mock_atlas_tile(2)];
let mut texture = AnimatedTexture::new(tiles, 10).unwrap();
// #[test]
// fn test_animated_texture_wrap_around() {
// let tiles = smallvec![mock_atlas_tile(1), mock_atlas_tile(2)];
// let mut texture = AnimatedTexture::new(tiles, 10).unwrap();
texture.tick(10);
assert_eq!(texture.current_frame(), 1);
// texture.tick(10);
// assert_eq!(texture.current_frame(), 1);
texture.tick(10);
assert_eq!(texture.current_frame(), 0);
}
// texture.tick(10);
// assert_eq!(texture.current_frame(), 0);
// }
#[test]
fn test_animated_texture_single_frame() {
let tiles = smallvec![mock_atlas_tile(1)];
let mut texture = AnimatedTexture::new(tiles, 10).unwrap();
// #[test]
// fn test_animated_texture_single_frame() {
// let tiles = smallvec![mock_atlas_tile(1)];
// let mut texture = AnimatedTexture::new(tiles, 10).unwrap();
texture.tick(10);
assert_eq!(texture.current_frame(), 0);
assert_eq!(texture.current_tile().color.unwrap().r, 1);
}
// texture.tick(10);
// assert_eq!(texture.current_frame(), 0);
// assert_eq!(texture.current_tile().color.unwrap().r, 1);
// }
tests/error.rs
+1 -25
View File
@@ -1,6 +1,5 @@
use pacman::error::{
AnimatedTextureError, AssetError, EntityError, GameError, GameResult, IntoGameError, MapError, OptionExt, ParseError,
ResultExt, TextureError,
AssetError, EntityError, GameError, GameResult, IntoGameError, MapError, OptionExt, ParseError, ResultExt, TextureError,
};
use std::io;
@@ -46,13 +45,6 @@ fn test_game_error_from_io_error() {
assert!(matches!(game_error, GameError::Io(_)));
}
#[test]
fn test_texture_error_from_animated_error() {
let animated_error = AnimatedTextureError::InvalidFrameDuration(0);
let texture_error: TextureError = animated_error.into();
assert!(matches!(texture_error, TextureError::Animated(_)));
}
#[test]
fn test_asset_error_from_io_error() {
let io_error = io::Error::new(io::ErrorKind::PermissionDenied, "Permission denied");
@@ -78,12 +70,6 @@ fn test_entity_error_display() {
assert_eq!(error.to_string(), "Edge not found: from 1 to 2");
}
#[test]
fn test_animated_texture_error_display() {
let error = AnimatedTextureError::InvalidFrameDuration(0);
assert_eq!(error.to_string(), "Frame duration must be positive, got 0");
}
#[test]
fn test_into_game_error_trait() {
let result: Result<i32, io::Error> = Err(io::Error::new(io::ErrorKind::Other, "test error"));
@@ -146,13 +132,3 @@ fn test_result_ext_error() {
panic!("Expected InvalidState error");
}
}
#[test]
fn test_error_chain_conversions() {
// Test that we can convert through multiple levels
let animated_error = AnimatedTextureError::InvalidFrameDuration(0);
let texture_error: TextureError = animated_error.into();
let game_error: GameError = texture_error.into();
assert!(matches!(game_error, GameError::Texture(TextureError::Animated(_))));
}