xevion/Pac-Man
1
0
Fork 0
mirror of https://github.com/Xevion/Pac-Man.git synced 2025-12-16 04:12:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor: improve representation of movement system

Browse Source
This commit is contained in:
Xevion
2025-08-15 12:50:07 -05:00
parent bd811ee783
commit de86f383bf
8 changed files with 259 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/game/mod.rs
View File

@@ -12,8 +12,8 @@ use crate::systems::{
blinking::blinking_system,
collision::collision_system,
components::{
Collider, CollisionLayer, DeltaTime, DirectionalAnimated, EntityType, GlobalState, ItemBundle, ItemCollider,
PacmanCollider, PlayerBundle, PlayerControlled, Position, Renderable, Score, ScoreResource, Velocity,
Collider, CollisionLayer, DeltaTime, DirectionalAnimated, EntityType, GlobalState, ItemBundle, ItemCollider, Movable,
MovementState, PacmanCollider, PlayerBundle, PlayerControlled, Position, Renderable, Score, ScoreResource,
},
control::player_system,
input::input_system,
@@ -133,11 +133,15 @@ impl Game {
let player = PlayerBundle {
player: PlayerControlled,
position: Position::AtNode(pacman_start_node),
velocity: Velocity {
direction: Direction::Left,
next_direction: Some((Direction::Left, 90)),
position: Position {
node: pacman_start_node,
edge_progress: None,
},
movement_state: MovementState::Stopped,
movable: Movable {
speed: 1.15,
current_direction: Direction::Left,
requested_direction: Some(Direction::Left), // Start moving left immediately
},
sprite: Renderable {
sprite: SpriteAtlas::get_tile(&atlas, "pacman/full.png")
@@ -170,14 +174,14 @@ impl Game {
world.insert_resource(DeltaTime(0f32));
world.add_observer(
|event: Trigger<GameEvent>, mut state: ResMut<GlobalState>, mut score: ResMut<ScoreResource>| match *event {
|event: Trigger<GameEvent>, mut state: ResMut<GlobalState>, _score: ResMut<ScoreResource>| match *event {
GameEvent::Command(command) => match command {
GameCommand::Exit => {
state.exit = true;
}
_ => {}
},
GameEvent::Collision(a, b) => {}
GameEvent::Collision(_a, _b) => {}
},
);
@@ -218,7 +222,10 @@ impl Game {
};
let mut item = world.spawn(ItemBundle {
position: Position::AtNode(node_id),
position: Position {
node: node_id,
edge_progress: None,
},
sprite: Renderable {
sprite,
layer: 1,