diff --git a/Cargo.lock b/Cargo.lock index 9b2e090..eb841d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -580,11 +580,11 @@ dependencies = [ "anyhow", "cgmath", "crossbeam", + "galactica-behavior", "galactica-constants", "galactica-content", "galactica-gameobject", "galactica-render", - "galactica-shipbehavior", "galactica-ui", "galactica-world", "image", @@ -597,6 +597,15 @@ dependencies = [ "winit", ] +[[package]] +name = "galactica-behavior" +version = "0.0.0" +dependencies = [ + "cgmath", + "galactica-content", + "galactica-world", +] + [[package]] name = "galactica-constants" version = "0.0.0" @@ -642,15 +651,6 @@ dependencies = [ "winit", ] -[[package]] -name = "galactica-shipbehavior" -version = "0.0.0" -dependencies = [ - "cgmath", - "galactica-content", - "galactica-world", -] - [[package]] name = "galactica-ui" version = "0.0.0" diff --git a/Cargo.toml b/Cargo.toml index 953fc8c..e5b6779 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ members = [ "crates/render", "crates/constants", "crates/world", - "crates/shipbehavior", + "crates/behavior", "crates/gameobject", "crates/ui", ] @@ -45,7 +45,7 @@ galactica-content = { path = "crates/content" } galactica-render = { path = "crates/render" } galactica-constants = { path = "crates/constants" } galactica-world = { path = "crates/world" } -galactica-shipbehavior = { path = "crates/shipbehavior" } +galactica-behavior = { path = "crates/behavior" } galactica-gameobject = { path = "crates/gameobject" } galactica-ui = { path = "crates/ui" } diff --git a/TODO.md b/TODO.md index 10a1da7..883c97e 100644 --- a/TODO.md +++ b/TODO.md @@ -1,8 +1,9 @@ ## Specific Jobs + - Finish particles + - Projectile colliders & particles - UI: health, shield, fuel, heat, energy bars - UI: text arranger - Sound system - - Particles, impact effects - Debris on ship death ---------------------------------- diff --git a/crates/shipbehavior/Cargo.toml b/crates/behavior/Cargo.toml similarity index 83% rename from crates/shipbehavior/Cargo.toml rename to crates/behavior/Cargo.toml index c60fa1d..c3b18c0 100644 --- a/crates/shipbehavior/Cargo.toml +++ b/crates/behavior/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "galactica-shipbehavior" +name = "galactica-behavior" version = "0.0.0" edition = "2021" diff --git a/crates/shipbehavior/src/behavior/dummy.rs b/crates/behavior/src/behavior/dummy.rs similarity index 100% rename from crates/shipbehavior/src/behavior/dummy.rs rename to crates/behavior/src/behavior/dummy.rs diff --git a/crates/shipbehavior/src/behavior/mod.rs b/crates/behavior/src/behavior/mod.rs similarity index 100% rename from crates/shipbehavior/src/behavior/mod.rs rename to crates/behavior/src/behavior/mod.rs diff --git a/crates/shipbehavior/src/behavior/player.rs b/crates/behavior/src/behavior/player.rs similarity index 100% rename from crates/shipbehavior/src/behavior/player.rs rename to crates/behavior/src/behavior/player.rs diff --git a/crates/shipbehavior/src/behavior/point.rs b/crates/behavior/src/behavior/point.rs similarity index 100% rename from crates/shipbehavior/src/behavior/point.rs rename to crates/behavior/src/behavior/point.rs diff --git a/crates/shipbehavior/src/lib.rs b/crates/behavior/src/lib.rs similarity index 100% rename from crates/shipbehavior/src/lib.rs rename to crates/behavior/src/lib.rs diff --git a/src/game.rs b/src/game.rs index 1942327..0c85ed8 100644 --- a/src/game.rs +++ b/src/game.rs @@ -1,14 +1,14 @@ -use cgmath::{Point2, Point3}; +use cgmath::Point2; use content::SystemHandle; use std::time::Instant; use winit::event::{ElementState, MouseButton, MouseScrollDelta, TouchPhase, VirtualKeyCode}; use crate::camera::Camera; use crate::{content, inputstatus::InputStatus}; +use galactica_behavior::{behavior, ShipBehavior}; use galactica_constants; use galactica_gameobject as object; use galactica_render::{ObjectSprite, ParticleBuilder, UiSprite}; -use galactica_shipbehavior::{behavior, ShipBehavior}; use galactica_ui as ui; use galactica_world::{util, ShipPhysicsHandle, World};