mirror of
https://github.com/Xevion/Pac-Man.git
synced 2025-12-11 08:08:00 -06:00
test: add player traversal flag tests, remove old disabled movement_system, public can_traverse
This commit is contained in:
@@ -146,159 +146,3 @@ impl Position {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// pub fn movement_system(
|
||||
// map: Res<Map>,
|
||||
// delta_time: Res<DeltaTime>,
|
||||
// mut entities: Query<(&mut Position, &mut Movable, &EntityType)>,
|
||||
// mut errors: EventWriter<GameError>,
|
||||
// ) {
|
||||
// for (mut position, mut movable, entity_type) in entities.iter_mut() {
|
||||
// let distance = movable.speed * 60.0 * delta_time.0;
|
||||
|
||||
// match *position {
|
||||
// Position::Stopped { .. } => {
|
||||
// // Check if we have a requested direction to start moving
|
||||
// if let Some(requested_direction) = movable.requested_direction {
|
||||
// if let Some(edge) = map.graph.find_edge_in_direction(position.current_node(), requested_direction) {
|
||||
// if can_traverse(*entity_type, edge) {
|
||||
// // Start moving in the requested direction
|
||||
// let progress = if edge.distance > 0.0 {
|
||||
// distance / edge.distance
|
||||
// } else {
|
||||
// // Zero-distance edge (tunnels) - immediately teleport
|
||||
// tracing::debug!(
|
||||
// "Entity entering tunnel from node {} to node {}",
|
||||
// position.current_node(),
|
||||
// edge.target
|
||||
// );
|
||||
// 1.0
|
||||
// };
|
||||
|
||||
// *position = Position::Moving {
|
||||
// from: position.current_node(),
|
||||
// to: edge.target,
|
||||
// remaining_distance: progress,
|
||||
// };
|
||||
// movable.current_direction = requested_direction;
|
||||
// movable.requested_direction = None;
|
||||
// }
|
||||
// } else {
|
||||
// errors.write(
|
||||
// EntityError::InvalidMovement(format!(
|
||||
// "No edge found in direction {:?} from node {}",
|
||||
// requested_direction,
|
||||
// position.current_node()
|
||||
// ))
|
||||
// .into(),
|
||||
// );
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// Position::Moving {
|
||||
// from,
|
||||
// to,
|
||||
// remaining_distance,
|
||||
// } => {
|
||||
// // Continue moving or handle node transitions
|
||||
// let current_node = *from;
|
||||
// if let Some(edge) = map.graph.find_edge(current_node, *to) {
|
||||
// // Extract target node before mutable operations
|
||||
// let target_node = *to;
|
||||
|
||||
// // Get the current edge for distance calculation
|
||||
// let edge = map.graph.find_edge(current_node, target_node);
|
||||
|
||||
// if let Some(edge) = edge {
|
||||
// // Update progress along the edge
|
||||
// if edge.distance > 0.0 {
|
||||
// *remaining_distance += distance / edge.distance;
|
||||
// } else {
|
||||
// // Zero-distance edge (tunnels) - immediately complete
|
||||
// *remaining_distance = 1.0;
|
||||
// }
|
||||
|
||||
// if *remaining_distance >= 1.0 {
|
||||
// // Reached the target node
|
||||
// let overflow = if edge.distance > 0.0 {
|
||||
// (*remaining_distance - 1.0) * edge.distance
|
||||
// } else {
|
||||
// // Zero-distance edge - use remaining distance for overflow
|
||||
// distance
|
||||
// };
|
||||
// *position = Position::Stopped { node: target_node };
|
||||
|
||||
// let mut continued_moving = false;
|
||||
|
||||
// // Try to use requested direction first
|
||||
// if let Some(requested_direction) = movable.requested_direction {
|
||||
// if let Some(next_edge) = map.graph.find_edge_in_direction(position.node, requested_direction) {
|
||||
// if can_traverse(*entity_type, next_edge) {
|
||||
// let next_progress = if next_edge.distance > 0.0 {
|
||||
// overflow / next_edge.distance
|
||||
// } else {
|
||||
// // Zero-distance edge - immediately complete
|
||||
// 1.0
|
||||
// };
|
||||
|
||||
// *position = Position::Moving {
|
||||
// from: position.current_node(),
|
||||
// to: next_edge.target,
|
||||
// remaining_distance: next_progress,
|
||||
// };
|
||||
// movable.current_direction = requested_direction;
|
||||
// movable.requested_direction = None;
|
||||
// continued_moving = true;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// // If no requested direction or it failed, try to continue in current direction
|
||||
// if !continued_moving {
|
||||
// if let Some(next_edge) = map.graph.find_edge_in_direction(position.node, direction) {
|
||||
// if can_traverse(*entity_type, next_edge) {
|
||||
// let next_progress = if next_edge.distance > 0.0 {
|
||||
// overflow / next_edge.distance
|
||||
// } else {
|
||||
// // Zero-distance edge - immediately complete
|
||||
// 1.0
|
||||
// };
|
||||
|
||||
// *position = Position::Moving {
|
||||
// from: position.current_node(),
|
||||
// to: next_edge.target,
|
||||
// remaining_distance: next_progress,
|
||||
// };
|
||||
// // Keep current direction and movement state
|
||||
// continued_moving = true;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// // If we couldn't continue moving, stop
|
||||
// if !continued_moving {
|
||||
// *movement_state = MovementState::Stopped;
|
||||
// movable.requested_direction = None;
|
||||
// }
|
||||
// }
|
||||
// } else {
|
||||
// // Edge not found - this is an inconsistent state
|
||||
// errors.write(
|
||||
// EntityError::InvalidMovement(format!(
|
||||
// "Inconsistent state: Moving on non-existent edge from {} to {}",
|
||||
// current_node, target_node
|
||||
// ))
|
||||
// .into(),
|
||||
// );
|
||||
// *movement_state = MovementState::Stopped;
|
||||
// position.edge_progress = None;
|
||||
// }
|
||||
// } else {
|
||||
// // Movement state says moving but no edge progress - this shouldn't happen
|
||||
// errors.write(EntityError::InvalidMovement("Entity in Moving state but no edge progress".to_string()).into());
|
||||
// *movement_state = MovementState::Stopped;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user