From 45fee92eea0ec740a835267a972f21149c23f9e5 Mon Sep 17 00:00:00 2001
From: Rendo <geometicalplayer@gmail.com>
Date: Sat, 15 Nov 2025 10:32:49 +0500
Subject: [PATCH] refactor

---
 src/damagable/mod.rs               | 87 ------------------------------
 src/main.rs                        |  5 +-
 src/movable.rs                     | 31 +++++++++++
 src/{damagable => ships}/enemy.rs  |  0
 src/ships/mod.rs                   |  2 +
 src/{damagable => ships}/player.rs |  2 +-
 6 files changed, 37 insertions(+), 90 deletions(-)
 delete mode 100644 src/damagable/mod.rs
 create mode 100644 src/movable.rs
 rename src/{damagable => ships}/enemy.rs (100%)
 create mode 100644 src/ships/mod.rs
 rename src/{damagable => ships}/player.rs (96%)

diff --git a/src/damagable/mod.rs b/src/damagable/mod.rs
deleted file mode 100644
index deb9cf6..0000000
--- a/src/damagable/mod.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use bevy::prelude::*;
-
-use crate::{
-    collision::{Collided, Collider},
-    damagable::{
-        enemy::Enemy,
-        player::{Player, player_movement_system},
-    },
-};
-
-pub mod enemy;
-pub mod player;
-
-pub struct DamagablePlugin;
-
-impl Plugin for DamagablePlugin {
-    fn build(&self, app: &mut App) {
-        app.insert_resource(Time::<Fixed>::from_hz(60.0))
-            .add_systems(Startup, setup)
-            .add_systems(
-                FixedUpdate,
-                (player_movement_system, movement_system).chain(),
-            );
-    }
-}
-
-#[derive(Component)]
-pub struct Damagable {
-    hp: u32,
-}
-
-#[derive(Component)]
-pub struct Movable {
-    linear_speed: f32,
-    rotation_speed: f32,
-    max_linear_speed: f32,
-    max_rotation_speed: f32,
-}
-
-fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
-    let player_sprite: Handle<Image> = asset_server.load("player.png");
-    let enemy_sprite: Handle<Image> = asset_server.load("enemy.png");
-
-    commands.spawn(Camera2d);
-
-    //Create player
-    commands.spawn((
-        Player { acceleration: 100. },
-        Movable {
-            linear_speed: 0.,
-            rotation_speed: 0.,
-            max_linear_speed: 500.,
-            max_rotation_speed: f32::to_radians(360.),
-        },
-        Damagable { hp: 10 },
-        Sprite::from_image(player_sprite),
-        Transform::from_xyz(20., 20., 0.),
-        Collider::new(8.),
-    ));
-
-    commands.spawn((
-        Enemy,
-        Movable {
-            linear_speed: 0.,
-            rotation_speed: 0.,
-            max_linear_speed: 500.,
-            max_rotation_speed: f32::to_radians(360.),
-        },
-        Damagable { hp: 10 },
-        Sprite::from_image(enemy_sprite),
-        Transform::from_xyz(0., 0., 0.),
-        Collider::new(8.),
-    ));
-}
-
-fn movement_system(time: Res<Time>, query: Query<(&Movable, &mut Transform)>) {
-    for (movable, mut transform) in query {
-        transform.rotate_z(movable.rotation_speed * time.delta_secs());
-        let movement_direction = transform.rotation * Vec3::X;
-        let movement_distance = movable.linear_speed * time.delta_secs();
-        let translation_delta = movement_direction * movement_distance;
-
-        transform.translation += translation_delta;
-
-        //TODO: Loop on bounds
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index 381cd0d..dedb2bb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,10 +1,11 @@
 use bevy::prelude::*;
 
 use crate::collision::{Collided, Collider, CollisionPlugin};
-use crate::damagable::DamagablePlugin;
+use crate::movable::DamagablePlugin;
 
 mod collision;
-mod damagable;
+mod movable;
+mod ships;
 
 fn main() {
     App::new()
diff --git a/src/movable.rs b/src/movable.rs
new file mode 100644
index 0000000..c420833
--- /dev/null
+++ b/src/movable.rs
@@ -0,0 +1,31 @@
+use bevy::prelude::*;
+
+pub struct DamagablePlugin;
+
+impl Plugin for DamagablePlugin {
+    fn build(&self, app: &mut App) {
+        app.insert_resource(Time::<Fixed>::from_hz(60.0))
+            .add_systems(FixedUpdate, movement_system);
+    }
+}
+
+#[derive(Component)]
+pub struct Movable {
+    pub linear_speed: f32,
+    pub rotation_speed: f32,
+    pub max_linear_speed: f32,
+    pub max_rotation_speed: f32,
+}
+
+fn movement_system(time: Res<Time>, query: Query<(&Movable, &mut Transform)>) {
+    for (movable, mut transform) in query {
+        transform.rotate_z(movable.rotation_speed * time.delta_secs());
+        let movement_direction = transform.rotation * Vec3::X;
+        let movement_distance = movable.linear_speed * time.delta_secs();
+        let translation_delta = movement_direction * movement_distance;
+
+        transform.translation += translation_delta;
+
+        //TODO: Loop on bounds
+    }
+}
diff --git a/src/damagable/enemy.rs b/src/ships/enemy.rs
similarity index 100%
rename from src/damagable/enemy.rs
rename to src/ships/enemy.rs
diff --git a/src/ships/mod.rs b/src/ships/mod.rs
new file mode 100644
index 0000000..aa5cf62
--- /dev/null
+++ b/src/ships/mod.rs
@@ -0,0 +1,2 @@
+pub mod enemy;
+pub mod player;
diff --git a/src/damagable/player.rs b/src/ships/player.rs
similarity index 96%
rename from src/damagable/player.rs
rename to src/ships/player.rs
index 39f22b9..ba07a46 100644
--- a/src/damagable/player.rs
+++ b/src/ships/player.rs
@@ -1,4 +1,4 @@
-use crate::damagable::Movable;
+use crate::movable::Movable;
 use bevy::prelude::*;
 
 #[derive(Component)]