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

Update spawn_player to use new GameAssets
Some checks failed
Basic checks / Basic build-and-test supertask (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Robert Garrett
2025-07-29 11:54:39 -05:00
parent 3d4e0afc58
commit 0eac337c00
1 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib.rs
View File

@@ -198,24 +198,9 @@ fn spawn_camera(mut commands: Commands) {
commands.spawn(Camera2d); commands.spawn(Camera2d);
} }
fn spawn_player( fn spawn_player(mut commands: Commands, game_assets: Res<GameAssets>) {
mut commands: Commands, let thruster_firing_id = game_assets.thruster_mat_active();
mut meshes: ResMut<Assets<Mesh>>, let thruster_stopped_id = game_assets.thruster_mat_inactive();
mut materials: ResMut<Assets<ColorMaterial>>,
) {
let triangle = Triangle2d::new(
Vec2::new(0.5, 0.0),
Vec2::new(-0.5, 0.45),
Vec2::new(-0.5, -0.45),
);
let thruster_firing_id = materials.add(SHIP_THRUSTER_COLOR_ACTIVE);
let thruster_stopped_id = materials.add(SHIP_THRUSTER_COLOR_INACTIVE);
let ship_material = materials.add(PLAYER_SHIP_COLOR);
let ship_mesh = meshes.add(triangle);
let thruster_material = materials.add(PLAYER_SHIP_COLOR);
let thruster_mesh = meshes.add(triangle);
commands commands
.spawn(( .spawn((
@@ -224,14 +209,14 @@ fn spawn_player(
Position(Vec2::default()), Position(Vec2::default()),
Velocity(Vec2::ZERO), Velocity(Vec2::ZERO),
Rotation(0.0), Rotation(0.0),
Mesh2d(ship_mesh), Mesh2d(game_assets.ship().0),
MeshMaterial2d(ship_material), MeshMaterial2d(game_assets.ship().1),
ThrusterColors(thruster_firing_id, thruster_stopped_id), ThrusterColors(thruster_firing_id, thruster_stopped_id),
Transform::default().with_scale(Vec3::new(20.0, 20.0, 20.0)), Transform::default().with_scale(Vec3::new(20.0, 20.0, 20.0)),
)) ))
.with_child(( .with_child((
Mesh2d(thruster_mesh), Mesh2d(game_assets.thruster_mesh()),
MeshMaterial2d(thruster_material), MeshMaterial2d(game_assets.thruster_mat_inactive()),
Transform::default() Transform::default()
.with_scale(Vec3::splat(0.5)) .with_scale(Vec3::splat(0.5))
.with_translation(Vec3::new(-0.5, 0.0, -0.1)), .with_translation(Vec3::new(-0.5, 0.0, -0.1)),