compartmentalise all code into core, ui and world modules

CHANGELOG.md

@@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Separate nav and speedometer UI features into own modules
 - Open game centered on primary monitor
 - Hide cursor
-- Compartmentalise main plugins into core, ui and world modules
+- Compartmentalise code into core, ui and world modules
 
 ## [0.0.13] - 2023-10-10
 

src/effects/animate.rs → src/core/effects/animate.rs

@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::resources::state::GameState;
+use super::super::resources::state::GameState;
 
 pub struct AnimatePlugin;
 impl Plugin for AnimatePlugin {

src/core/mod.rs

@@ -1,6 +1,9 @@
 use bevy::prelude::*;
 
-use crate::{
+pub mod effects;
+pub mod resources;
+
+use self::{
     effects::{animate::AnimatePlugin, blink::EffectsPlugin},
     resources::{game_time::GameTimePlugin, state::StatePlugin},
 };

src/resources/game_time.rs → src/core/resources/game_time.rs

@@ -1,6 +1,6 @@
 use bevy::{prelude::*, time::Stopwatch};
 
-use crate::resources::state::GameState;
+use super::state::GameState;
 
 #[derive(Resource, Deref)]
 pub struct GameTime(Stopwatch);

src/resources/mod.rs → src/core/resources/mod.rs

@@ -1,5 +1,3 @@
 pub mod assets;
-pub mod camera;
 pub mod game_time;
-pub mod spatial;
 pub mod state;

src/resources/state.rs → src/core/resources/state.rs

@@ -3,7 +3,7 @@ use bevy::{
     prelude::*,
 };
 
-use crate::resources::assets::AudioAssets;
+use super::assets::AudioAssets;
 
 #[derive(States, Debug, Copy, Clone, Hash, Eq, PartialEq, Default)]
 pub enum GameState {

src/main.rs

@@ -7,23 +7,17 @@ use bevy_asset_loader::prelude::*;
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
 use bevy_rapier2d::prelude::*;
 
-mod astronomy;
 mod core;
-mod effects;
-mod hud;
-mod menus;
-mod resources;
 mod shaders;
-mod ship;
 mod ui;
 mod world;
 
 use crate::{
-    core::CorePlugin,
-    resources::{
+    core::resources::{
         assets::{AudioAssets, SpriteAssets, UiAssets},
         state::GameState,
     },
+    core::CorePlugin,
     ui::UiPlugin,
     world::WorldPlugin,
 };

src/resources/camera.rs → src/ui/camera.rs

@@ -6,7 +6,7 @@ use crate::shaders::{
     pixelate::{PixelatePlugin, PixelateSettings},
 };
 
-use crate::{resources::state::GameState, ship::Ship};
+use crate::{core::resources::state::GameState, world::ship::Ship};
 
 pub struct CameraPlugin;
 impl Plugin for CameraPlugin {

src/hud/indicator.rs → src/ui/hud/indicator.rs

@@ -1,6 +1,6 @@
 use bevy::{math::Vec3Swizzles, prelude::*};
 
-use crate::{resources::state::GameState, ship::Ship};
+use crate::{core::resources::state::GameState, world::ship::Ship};
 
 pub struct IndicatorPlugin;
 impl Plugin for IndicatorPlugin {

src/hud/mod.rs → src/ui/hud/mod.rs

@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::{resources::assets::UiAssets, resources::state::GameState};
+use crate::core::{resources::assets::UiAssets, resources::state::GameState};
 
 pub mod indicator;
 pub mod nav;

src/hud/nav.rs → src/ui/hud/nav.rs

@@ -1,7 +1,7 @@
 use bevy::{math::Vec3Swizzles, prelude::*};
 use bevy_spatial::{kdtree::KDTree2, SpatialAccess};
 
-use crate::{resources::spatial::KDNode, ship::Ship};
+use crate::{world::ship::Ship, world::spatial::KDNode};
 
 /// UI Location component
 #[derive(Component)]

src/hud/speedometer.rs → src/ui/hud/speedometer.rs

@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::Velocity;
 
-use crate::ship::Ship;
+use crate::world::ship::Ship;
 
 /// UI Speed component
 #[derive(Component)]

src/menus/credits.rs → src/ui/menus/credits.rs

@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::resources::{
+use crate::core::resources::{
     assets::UiAssets,
     state::{ForState, GameState},
 };

src/menus/pause.rs → src/ui/menus/pause.rs

@@ -5,7 +5,7 @@ use leafwing_input_manager::{
     Actionlike,
 };
 
-use crate::{
+use crate::core::{
     effects::blink::DrawBlinkTimer,
     resources::{
         assets::UiAssets,

src/menus/start_menu.rs → src/ui/menus/start_menu.rs

@@ -4,7 +4,7 @@ use leafwing_input_manager::{
     Actionlike,
 };
 
-use crate::{
+use crate::core::{
     effects::blink::DrawBlinkTimer,
     resources::{
         assets::{AudioAssets, UiAssets},

src/ui/mod.rs

@@ -1,9 +1,13 @@
 use bevy::prelude::*;
 
-use crate::{
+pub mod camera;
+pub mod hud;
+pub mod menus;
+
+use self::{
+    camera::CameraPlugin,
     hud::HudPlugin,
     menus::{credits::CreditsPlugin, pause::PausePlugin, start_menu::MenuPlugin},
-    resources::camera::CameraPlugin,
 };
 
 pub struct UiPlugin;

src/astronomy/orbit.rs → src/world/astronomy/orbit.rs

@@ -1,6 +1,6 @@
 use bevy::prelude::*;
 
-use crate::resources::{game_time::GameTime, state::GameState};
+use crate::core::resources::{game_time::GameTime, state::GameState};
 
 const ORBITAL_PERIOD_SCALING_FACTOR: f32 = 1.0;
 

src/astronomy/planet.rs → src/world/astronomy/planet.rs

@@ -1,9 +1,9 @@
 use bevy::prelude::*;
 
 use crate::{
-    effects::animate::{AnimationBundle, AnimationIndices, AnimationTimer},
-    hud::indicator::Indicated,
-    resources::spatial::KDNode,
+    core::effects::animate::{AnimationBundle, AnimationIndices, AnimationTimer},
+    ui::hud::indicator::Indicated,
+    world::spatial::KDNode,
 };
 
 use super::orbit::{Orbit, Orbitable};

src/astronomy/planetary_system.rs → src/world/astronomy/planetary_system.rs

@@ -1,8 +1,8 @@
 use bevy::prelude::*;
 
 use crate::{
-    hud::indicator::Indicated,
-    resources::{assets::SpriteAssets, state::GameState},
+    core::resources::{assets::SpriteAssets, state::GameState},
+    ui::hud::indicator::Indicated,
 };
 
 use super::{

src/astronomy/star.rs → src/world/astronomy/star.rs

@@ -1,9 +1,10 @@
 use bevy::prelude::*;
 
 use crate::{
-    effects::animate::{AnimationBundle, AnimationIndices, AnimationTimer},
-    hud::indicator::Indicated,
-    resources::{assets::SpriteAssets, spatial::KDNode},
+    core::effects::animate::{AnimationBundle, AnimationIndices, AnimationTimer},
+    core::resources::assets::SpriteAssets,
+    ui::hud::indicator::Indicated,
+    world::spatial::KDNode,
 };
 
 use super::orbit::Orbitable;

src/astronomy/starfield.rs → src/world/astronomy/starfield.rs

@@ -3,7 +3,7 @@ use bevy_tiling_background::{
     BackgroundImageBundle, BackgroundMaterial, SetImageRepeatingExt, TilingBackgroundPlugin,
 };
 
-use crate::resources::{assets::SpriteAssets, state::GameState};
+use crate::core::resources::{assets::SpriteAssets, state::GameState};
 
 pub struct StarfieldPlugin;
 impl Plugin for StarfieldPlugin {

src/world/mod.rs

@@ -1,10 +1,14 @@
 use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;
 
-use crate::{
+pub mod astronomy;
+pub mod ship;
+pub mod spatial;
+
+use self::{
     astronomy::{planetary_system::PlanetarySystemPlugin, starfield::StarfieldPlugin},
-    resources::spatial::SpatialPlugin,
     ship::ShipPlugin,
+    spatial::SpatialPlugin,
 };
 
 pub struct WorldPlugin;

src/ship.rs → src/world/ship.rs

@@ -2,7 +2,7 @@ use bevy::prelude::*;
 use bevy_rapier2d::prelude::*;
 use leafwing_input_manager::prelude::*;
 
-use crate::resources::{assets::SpriteAssets, state::GameState};
+use crate::core::resources::{assets::SpriteAssets, state::GameState};
 
 #[derive(Actionlike, PartialEq, Eq, Clone, Copy, Hash, Debug, Reflect)]
 pub enum ShipAction {