diff --git a/src/asteroids.rs b/src/asteroids.rs index c81cfaf..7c3004f 100644 --- a/src/asteroids.rs +++ b/src/asteroids.rs @@ -7,7 +7,7 @@ use std::time::Duration; use bevy::prelude::*; -use crate::{GameAssets, Rotation, WorldSize, physics::Position, physics::Velocity}; +use crate::{GameAssets, Rotation, WorldSize, physics::Velocity}; #[derive(Component, Deref, DerefMut)] pub struct Asteroid(AsteroidSize); @@ -120,7 +120,7 @@ pub fn spawn_asteroid( Asteroid(AsteroidSize::Small), Collider::ball(collider_radius), Sensor, - Position(spawn.pos), + Transform::from_translation(spawn.pos.extend(0.0)), Velocity(spawn.vel), Rotation(0.0), Mesh2d(mesh), diff --git a/src/physics.rs b/src/physics.rs index f7eca79..1d65684 100644 --- a/src/physics.rs +++ b/src/physics.rs @@ -5,9 +5,6 @@ use crate::WorldSize; use bevy::prelude::*; -#[derive(Component)] -pub(crate) struct Position(pub(crate) bevy::math::Vec2); - #[derive(Component)] pub(crate) struct Velocity(pub(crate) bevy::math::Vec2); diff --git a/src/ship.rs b/src/ship.rs index da6b297..fd19e21 100644 --- a/src/ship.rs +++ b/src/ship.rs @@ -1,6 +1,6 @@ use crate::{ GameAssets, Rotation, - physics::{Position, Velocity, Wrapping}, + physics::{Velocity, Wrapping}, }; use bevy::prelude::*; @@ -18,7 +18,6 @@ pub fn spawn_player(mut commands: Commands, game_assets: Res) { ActiveCollisionTypes::STATIC_STATIC, Ship, Wrapping, - Position(Vec2::default()), Velocity(Vec2::ZERO), Rotation(0.0), Mesh2d(game_assets.ship().0),