robert/another-asteroids
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Format project

Browse Source
This commit is contained in:
Robert Garrett
2024-11-28 08:56:52 -06:00
parent 4b4e259317
commit d2acc332b7
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib.rs
View File

@@ -1,6 +1,6 @@
mod config; mod config;
use crate::config::{BACKGROUND_COLOR, PLAYER_SHIP_COLOR, SHIP_THRUST, SHIP_ROTATION}; use crate::config::{BACKGROUND_COLOR, PLAYER_SHIP_COLOR, SHIP_ROTATION, SHIP_THRUST};
use bevy::{prelude::*, sprite::MaterialMesh2dBundle}; use bevy::{prelude::*, sprite::MaterialMesh2dBundle};
use config::{SHIP_THRUSTER_COLOR_ACTIVE, SHIP_THRUSTER_COLOR_INACTIVE}; use config::{SHIP_THRUSTER_COLOR_ACTIVE, SHIP_THRUSTER_COLOR_INACTIVE};
@@ -12,11 +12,10 @@ impl Plugin for AsteroidPlugin {
app.add_systems(Startup, (spawn_camera, spawn_player)) app.add_systems(Startup, (spawn_camera, spawn_player))
.insert_resource(ClearColor(BACKGROUND_COLOR)) .insert_resource(ClearColor(BACKGROUND_COLOR))
.add_systems(FixedUpdate, (input_ship_thruster, input_ship_rotation)) .add_systems(FixedUpdate, (input_ship_thruster, input_ship_rotation))
.add_systems(FixedPostUpdate, ( .add_systems(
integrate_velocity, FixedPostUpdate,
update_positions, (integrate_velocity, update_positions, apply_rotation_to_mesh),
apply_rotation_to_mesh, );
));
} }
} }
@@ -50,7 +49,7 @@ fn spawn_player(
let triangle = Triangle2d::new( let triangle = Triangle2d::new(
Vec2::new(0.5, 0.0), Vec2::new(0.5, 0.0),
Vec2::new(-0.5, 0.45), Vec2::new(-0.5, 0.45),
Vec2::new(-0.5, -0.45) Vec2::new(-0.5, -0.45),
); );
let thruster_firing_id = materials.add(SHIP_THRUSTER_COLOR_ACTIVE); let thruster_firing_id = materials.add(SHIP_THRUSTER_COLOR_ACTIVE);
let thruster_stopped_id = materials.add(SHIP_THRUSTER_COLOR_INACTIVE); let thruster_stopped_id = materials.add(SHIP_THRUSTER_COLOR_INACTIVE);
@@ -79,10 +78,7 @@ fn spawn_player(
Velocity(Vec2::ZERO), Velocity(Vec2::ZERO),
Rotation(0.0), Rotation(0.0),
ship_mesh, ship_mesh,
ThrusterColors( ThrusterColors(thruster_firing_id, thruster_stopped_id),
thruster_firing_id,
thruster_stopped_id
)
)); ));
ship_id.add_child(thruster); ship_id.add_child(thruster);
@@ -101,7 +97,9 @@ fn input_ship_thruster(
panic!("There should be exactly one player ship! Instead, there seems to be {count}."); panic!("There should be exactly one player ship! Instead, there seems to be {count}.");
}; };
let thrusters = children.first().expect("Couldn't find first child, which should be the thruster"); let thrusters = children
.first()
.expect("Couldn't find first child, which should be the thruster");
if keyboard_input.pressed(KeyCode::KeyW) { if keyboard_input.pressed(KeyCode::KeyW) {
velocity.0 += Vec2::from_angle(rotation.0) * SHIP_THRUST; velocity.0 += Vec2::from_angle(rotation.0) * SHIP_THRUST;