LAB/rust-otus
0
0
Fork 0
Code Pull Requests Activity

Проектная работа - WIP

Browse Source
This commit is contained in:
Баранов Александр Сергеевич
2026-06-06 11:11:11 +03:00
parent ca2c94a830
commit a24c1259a3
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
snake-game/src/gameplay.rs
+9 -7
View File
@@ -11,6 +11,7 @@ pub fn head_rotation(
query: Single<(&mut Transform, &Direction), With<Head>>, query: Single<(&mut Transform, &Direction), With<Head>>,
mut snake_path: ResMut<SnakePath>, mut snake_path: ResMut<SnakePath>,
) { ) {
let _span = trace_span!("head_rotation").entered();
if input.just_pressed(KeyCode::ArrowLeft) { if input.just_pressed(KeyCode::ArrowLeft) {
let (mut transform, direction) = query.into_inner(); let (mut transform, direction) = query.into_inner();
let translation = transform.translation.clone(); let translation = transform.translation.clone();
@@ -19,15 +20,15 @@ pub fn head_rotation(
let mut new_direction = direction.clone(); let mut new_direction = direction.clone();
new_direction.rotate_left(); new_direction.rotate_left();
if !snake_path.push(dst_pos, new_direction) { if !snake_path.push(dst_pos, new_direction) {
trace!("head_rotation - try 1 failed: cannot push [{dst_pos} => {new_direction}] into SnakePath"); trace!("try 1 failed: cannot push [{dst_pos} => {new_direction}] into SnakePath");
dst_pos.shift(&direction); dst_pos.shift(&direction);
if !snake_path.push(dst_pos, new_direction) { if !snake_path.push(dst_pos, new_direction) {
trace!("head_rotation - try 2 failed: cannot push [{dst_pos} => {new_direction}] into SnakePath"); trace!("try 2 failed: cannot push [{dst_pos} => {new_direction}] into SnakePath");
return; return;
} }
} }
transform.rotation = new_direction.orientation(); transform.rotation = new_direction.orientation();
trace!("head_rotation - running {direction} at {cur_pos} {translation}: go {new_direction} on {dst_pos}"); trace!("running {direction} at {cur_pos} {translation}: go {new_direction} on {dst_pos}");
} else if input.just_pressed(KeyCode::ArrowRight) { } else if input.just_pressed(KeyCode::ArrowRight) {
let (mut transform, direction) = query.into_inner(); let (mut transform, direction) = query.into_inner();
let translation = transform.translation.clone(); let translation = transform.translation.clone();
@@ -36,15 +37,15 @@ pub fn head_rotation(
let mut new_direction = direction.clone(); let mut new_direction = direction.clone();
new_direction.rotate_right(); new_direction.rotate_right();
if !snake_path.push(dst_pos, new_direction) { if !snake_path.push(dst_pos, new_direction) {
trace!("head_rotation - try 1 failed: cannot push [{dst_pos} => {new_direction}] into SnakePath"); trace!("try 1 failed: cannot push [{dst_pos} => {new_direction}] into SnakePath");
dst_pos.shift(&direction); dst_pos.shift(&direction);
if !snake_path.push(dst_pos, new_direction) { if !snake_path.push(dst_pos, new_direction) {
trace!("head_rotation - try 2 failed: cannot push [{dst_pos} => {new_direction}] into SnakePath"); trace!("try 2 failed: cannot push [{dst_pos} => {new_direction}] into SnakePath");
return; return;
} }
} }
transform.rotation = new_direction.orientation(); transform.rotation = new_direction.orientation();
trace!("head_rotation - running {direction} at {cur_pos} {translation}: go {new_direction} on {dst_pos}"); trace!("running {direction} at {cur_pos} {translation}: go {new_direction} on {dst_pos}");
} }
} }
@@ -55,6 +56,7 @@ pub fn snake_moving(
query: Query<(&mut Transform, &mut Direction, &Velocity, Entity, Has<End>), Or<(With<Head>, With<Tail>, With<End>)>>, query: Query<(&mut Transform, &mut Direction, &Velocity, Entity, Has<End>), Or<(With<Head>, With<Tail>, With<End>)>>,
mut commands: Commands, mut commands: Commands,
) { ) {
let _span = trace_span!("snake_moving").entered();
for (mut transform, mut direction, Velocity(velocity), entity, has_end) in query.into_iter() { for (mut transform, mut direction, Velocity(velocity), entity, has_end) in query.into_iter() {
// первая часть движения - до границы сетки // первая часть движения - до границы сетки
let delta = velocity * time.delta_secs(); let delta = velocity * time.delta_secs();
@@ -70,7 +72,7 @@ pub fn snake_moving(
let delta = second.1.abs(); let delta = second.1.abs();
let pos = Position::from(&*transform); let pos = Position::from(&*transform);
if let Some(dir) = snake_path.peek(&pos) { if let Some(dir) = snake_path.peek(&pos) {
trace!("snake_moving - set new direction for {entity} in {pos} --> {dir}"); trace!("set new direction for {entity} in {pos} --> {dir}");
*direction = dir.clone(); *direction = dir.clone();
} }
let src = direction.get_coord(&*transform); let src = direction.get_coord(&*transform);