chore: rename ecs* crates to engine-ecs*HEADmaster

23 files changed, 88 insertions, 89 deletions

diff --git a/engine/src/asset.rs b/engine/src/asset.rs
index e9a3831..1ab3cb1 100644
--- a/engine/src/asset.rs
+++ b/engine/src/asset.rs
@@ -15,10 +15,10 @@ use std::sync::mpsc::{
     channel as mpsc_channel,
 };
 
-use ecs::pair::{ChildOf, Pair};
-use ecs::phase::{PRE_UPDATE as PRE_UPDATE_PHASE, Phase};
-use ecs::sole::Single;
-use ecs::{Sole, declare_entity};
+use crate::ecs::pair::{ChildOf, Pair};
+use crate::ecs::phase::{PRE_UPDATE as PRE_UPDATE_PHASE, Phase};
+use crate::ecs::sole::Single;
+use crate::ecs::{Sole, declare_entity};
 
 use crate::work_queue::{Work, WorkQueue};
 
@@ -843,9 +843,9 @@ pub(crate) struct Extension
     pub assets: Assets,
 }
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
-    fn collect(self, mut collector: ecs::extension::Collector<'_>)
+    fn collect(self, mut collector: crate::ecs::extension::Collector<'_>)
     {
         let _ = collector.add_sole(self.assets);
 
diff --git a/engine/src/camera.rs b/engine/src/camera.rs
index fa3d612..22a0702 100644
--- a/engine/src/camera.rs
+++ b/engine/src/camera.rs
@@ -1,4 +1,4 @@
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::projection::{Perspective, Projection};
 use crate::vector::Vec3;
diff --git a/engine/src/camera/fly.rs b/engine/src/camera/fly.rs
index 2042c0c..eddc8ff 100644
--- a/engine/src/camera/fly.rs
+++ b/engine/src/camera/fly.rs
@@ -1,9 +1,9 @@
-use ecs::component::local::Local;
-use ecs::phase::UPDATE as UPDATE_PHASE;
-use ecs::sole::Single;
-use ecs::system::Into;
-use ecs::system::initializable::Initializable;
-use ecs::{Component, Query};
+use crate::ecs::component::local::Local;
+use crate::ecs::phase::UPDATE as UPDATE_PHASE;
+use crate::ecs::sole::Single;
+use crate::ecs::system::Into;
+use crate::ecs::system::initializable::Initializable;
+use crate::ecs::{Component, Query};
 
 use crate::builder;
 use crate::camera::{Active as ActiveCamera, Camera};
@@ -57,9 +57,9 @@ impl Default for Builder
 /// Fly camera extension.
 pub struct Extension(pub Options);
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
-    fn collect(self, mut collector: ecs::extension::Collector<'_>)
+    fn collect(self, mut collector: crate::ecs::extension::Collector<'_>)
     {
         collector.add_system(*UPDATE_PHASE, update.into_system().initialize((self.0,)));
     }
diff --git a/engine/src/collision.rs b/engine/src/collision.rs
index aefd9b6..24cb152 100644
--- a/engine/src/collision.rs
+++ b/engine/src/collision.rs
@@ -1,4 +1,4 @@
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::mesh::Mesh;
 use crate::vector::Vec3;
diff --git a/engine/src/delta_time.rs b/engine/src/delta_time.rs
index 33a2fc8..6f75247 100644
--- a/engine/src/delta_time.rs
+++ b/engine/src/delta_time.rs
@@ -1,8 +1,8 @@
 use std::time::{Duration, Instant};
 
-use ecs::component::local::Local;
-use ecs::sole::Single;
-use ecs::{Component, Sole};
+use crate::ecs::component::local::Local;
+use crate::ecs::sole::Single;
+use crate::ecs::{Component, Sole};
 
 #[derive(Debug, Clone, Default, Sole)]
 pub struct DeltaTime
diff --git a/engine/src/draw_flags.rs b/engine/src/draw_flags.rs
index 8328669..bd3d714 100644
--- a/engine/src/draw_flags.rs
+++ b/engine/src/draw_flags.rs
@@ -1,4 +1,4 @@
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::builder;
 
diff --git a/engine/src/input.rs b/engine/src/input.rs
index 60dd1e7..613f0ad 100644
--- a/engine/src/input.rs
+++ b/engine/src/input.rs
@@ -1,7 +1,7 @@
-use ecs::declare_entity;
-use ecs::extension::Collector as ExtensionCollector;
-use ecs::pair::{ChildOf, Pair};
-use ecs::phase::Phase;
+use crate::ecs::declare_entity;
+use crate::ecs::extension::Collector as ExtensionCollector;
+use crate::ecs::pair::{ChildOf, Pair};
+use crate::ecs::phase::Phase;
 
 use crate::windowing::PHASE as WINDOWING_PHASE;
 
@@ -23,7 +23,7 @@ declare_entity!(
 #[derive(Debug, Default)]
 pub struct Extension {}
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
     fn collect(self, mut collector: ExtensionCollector<'_>)
     {
diff --git a/engine/src/lib.rs b/engine/src/lib.rs
index 0941de0..5249e14 100644
--- a/engine/src/lib.rs
+++ b/engine/src/lib.rs
@@ -1,18 +1,17 @@
 #![deny(clippy::all, clippy::pedantic)]
 #![allow(clippy::needless_pass_by_value)]
 
-use ecs::component::Sequence as ComponentSequence;
-use ecs::extension::Extension;
-use ecs::phase::PRE_UPDATE as PRE_UPDATE_PHASE;
-use ecs::sole::Sole;
-use ecs::system::initializable::Initializable;
-use ecs::system::observer::Observer;
-use ecs::system::{Into, System};
-use ecs::uid::Uid;
-use ecs::{SoleAlreadyExistsError, World};
-
 use crate::asset::{Assets, Extension as AssetExtension};
 use crate::delta_time::{DeltaTime, LastUpdate, update as update_delta_time};
+use crate::ecs::component::Sequence as ComponentSequence;
+use crate::ecs::extension::Extension;
+use crate::ecs::phase::PRE_UPDATE as PRE_UPDATE_PHASE;
+use crate::ecs::sole::Sole;
+use crate::ecs::system::initializable::Initializable;
+use crate::ecs::system::observer::Observer;
+use crate::ecs::system::{Into, System};
+use crate::ecs::uid::Uid;
+use crate::ecs::{SoleAlreadyExistsError, World};
 use crate::shader::Extension as ShaderExtension;
 
 mod util;
@@ -40,7 +39,7 @@ pub mod texture;
 pub mod transform;
 pub mod windowing;
 
-pub extern crate ecs;
+pub extern crate engine_ecs as ecs;
 
 pub(crate) use crate::data_types::matrix;
 pub use crate::data_types::{color, vector};
diff --git a/engine/src/lighting.rs b/engine/src/lighting.rs
index 9ab2ca8..f1b6570 100644
--- a/engine/src/lighting.rs
+++ b/engine/src/lighting.rs
@@ -1,4 +1,4 @@
-use ecs::{Component, Sole};
+use crate::ecs::{Component, Sole};
 
 use crate::builder;
 use crate::color::Color;
diff --git a/engine/src/material.rs b/engine/src/material.rs
index ed1c139..accb9a1 100644
--- a/engine/src/material.rs
+++ b/engine/src/material.rs
@@ -1,4 +1,4 @@
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::asset::Handle as AssetHandle;
 use crate::builder;
diff --git a/engine/src/model.rs b/engine/src/model.rs
index ebf623f..0aaa877 100644
--- a/engine/src/model.rs
+++ b/engine/src/model.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 use std::collections::HashMap;
 
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::asset::{Assets, Handle as AssetHandle};
 use crate::material::Material;
diff --git a/engine/src/renderer.rs b/engine/src/renderer.rs
index b7bb2db..a302b8e 100644
--- a/engine/src/renderer.rs
+++ b/engine/src/renderer.rs
@@ -2,17 +2,17 @@ use std::collections::VecDeque;
 use std::sync::atomic::{AtomicU64, Ordering};
 
 use bitflags::bitflags;
-use ecs::actions::Actions;
-use ecs::component::local::Local;
-use ecs::event::component::{Changed, EventMatchExt, Removed};
-use ecs::pair::{ChildOf, Pair};
-use ecs::phase::{POST_UPDATE as POST_UPDATE_PHASE, Phase};
-use ecs::query::term::With;
-use ecs::sole::Single;
-use ecs::system::Into;
-use ecs::system::initializable::Initializable;
-use ecs::system::observer::Observe;
-use ecs::{Component, Query, Sole, declare_entity};
+use crate::ecs::actions::Actions;
+use crate::ecs::component::local::Local;
+use crate::ecs::event::component::{Changed, EventMatchExt, Removed};
+use crate::ecs::pair::{ChildOf, Pair};
+use crate::ecs::phase::{POST_UPDATE as POST_UPDATE_PHASE, Phase};
+use crate::ecs::query::term::With;
+use crate::ecs::sole::Single;
+use crate::ecs::system::Into;
+use crate::ecs::system::initializable::Initializable;
+use crate::ecs::system::observer::Observe;
+use crate::ecs::{Component, Query, Sole, declare_entity};
 use engine_macros::Reflection;
 
 use crate::asset::Handle as AssetHandle;
@@ -83,9 +83,9 @@ impl Extension
     }
 }
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
-    fn collect(self, mut collector: ecs::extension::Collector<'_>)
+    fn collect(self, mut collector: crate::ecs::extension::Collector<'_>)
     {
         collector.add_declared_entity(&PRE_RENDER_PHASE);
         collector.add_declared_entity(&RENDER_PHASE);
diff --git a/engine/src/renderer/main_render_pass.rs b/engine/src/renderer/main_render_pass.rs
index 7492379..abd1022 100644
--- a/engine/src/renderer/main_render_pass.rs
+++ b/engine/src/renderer/main_render_pass.rs
@@ -1,6 +1,6 @@
-use ecs::Query;
-use ecs::query::term::{With, Without};
-use ecs::sole::Single;
+use crate::ecs::Query;
+use crate::ecs::query::term::{With, Without};
+use crate::ecs::sole::Single;
 
 use crate::asset::Assets;
 use crate::draw_flags::{DrawFlags, NoDraw, PolygonModeConfig};
diff --git a/engine/src/renderer/object.rs b/engine/src/renderer/object.rs
index bdff885..8441959 100644
--- a/engine/src/renderer/object.rs
+++ b/engine/src/renderer/object.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::sync::atomic::{AtomicU64, Ordering};
 
-use ecs::Sole;
+use crate::ecs::Sole;
 
 use crate::asset::Id as AssetId;
 
diff --git a/engine/src/renderer/opengl.rs b/engine/src/renderer/opengl.rs
index 378a89d..dcdd6a5 100644
--- a/engine/src/renderer/opengl.rs
+++ b/engine/src/renderer/opengl.rs
@@ -3,10 +3,10 @@
 use std::borrow::Cow;
 use std::collections::HashMap;
 
-use ecs::actions::Actions;
-use ecs::query::term::Without;
-use ecs::sole::Single;
-use ecs::{Component, Query, Sole};
+use crate::ecs::actions::Actions;
+use crate::ecs::query::term::Without;
+use crate::ecs::sole::Single;
+use crate::ecs::{Component, Query, Sole};
 use glutin::config::Config as GlutinConfig;
 use glutin::display::GetGlDisplay;
 use glutin::error::Error as GlutinError;
@@ -164,9 +164,9 @@ enum GraphicsContextObject
 #[non_exhaustive]
 pub struct Extension {}
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
-    fn collect(self, mut collector: ecs::extension::Collector<'_>)
+    fn collect(self, mut collector: crate::ecs::extension::Collector<'_>)
     {
         collector.add_system(*RENDER_PHASE, handle_commands);
 
diff --git a/engine/src/shader.rs b/engine/src/shader.rs
index 1b368fb..d5611ca 100644
--- a/engine/src/shader.rs
+++ b/engine/src/shader.rs
@@ -6,10 +6,10 @@ use std::path::Path;
 use std::str::Utf8Error;
 
 use bitflags::{bitflags, bitflags_match};
-use ecs::pair::{ChildOf, Pair};
-use ecs::phase::{POST_UPDATE as POST_UPDATE_PHASE, Phase, START as START_PHASE};
-use ecs::sole::Single;
-use ecs::{Component, Sole, declare_entity};
+use crate::ecs::pair::{ChildOf, Pair};
+use crate::ecs::phase::{POST_UPDATE as POST_UPDATE_PHASE, Phase, START as START_PHASE};
+use crate::ecs::sole::Single;
+use crate::ecs::{Component, Sole, declare_entity};
 use shader_slang::{
     Blob as SlangBlob,
     ComponentType as SlangComponentType,
@@ -972,9 +972,9 @@ declare_entity!(
 
 pub(crate) struct Extension;
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
-    fn collect(self, mut collector: ecs::extension::Collector<'_>)
+    fn collect(self, mut collector: crate::ecs::extension::Collector<'_>)
     {
         let Some(global_session) = SlangGlobalSession::new() else {
             tracing::error!("Unable to create global shader-slang session");
diff --git a/engine/src/shader/default.rs b/engine/src/shader/default.rs
index 7f0d1bb..c217af6 100644
--- a/engine/src/shader/default.rs
+++ b/engine/src/shader/default.rs
@@ -1,10 +1,10 @@
 use std::path::Path;
 use std::sync::LazyLock;
 
-use ecs::Query;
-use ecs::actions::Actions;
-use ecs::query::term::Without;
-use ecs::sole::Single;
+use crate::ecs::Query;
+use crate::ecs::actions::Actions;
+use crate::ecs::query::term::Without;
+use crate::ecs::sole::Single;
 
 use crate::asset::{Assets, Label as AssetLabel};
 use crate::camera::{Active as ActiveCamera, Camera};
diff --git a/engine/src/transform.rs b/engine/src/transform.rs
index 05819bc..e80bd00 100644
--- a/engine/src/transform.rs
+++ b/engine/src/transform.rs
@@ -1,4 +1,4 @@
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::builder;
 use crate::vector::Vec3;
diff --git a/engine/src/util.rs b/engine/src/util.rs
index f18a9c7..439fe9a 100644
--- a/engine/src/util.rs
+++ b/engine/src/util.rs
@@ -1,4 +1,4 @@
-use ecs::util::VecExt;
+use crate::ecs::util::VecExt;
 
 #[derive(Debug)]
 pub struct MapVec<Key: Ord, Value>
diff --git a/engine/src/windowing.rs b/engine/src/windowing.rs
index e07ba3e..e34aaf0 100644
--- a/engine/src/windowing.rs
+++ b/engine/src/windowing.rs
@@ -8,16 +8,16 @@ use crossbeam_channel::{
     TrySendError,
     bounded as bounded_channel,
 };
-use ecs::actions::Actions;
-use ecs::component::Component;
-use ecs::entity::obtainer::Obtainer as EntityObtainer;
-use ecs::event::component::{Added, Changed, EventMatchExt, Removed};
-use ecs::pair::{ChildOf, Pair};
-use ecs::phase::{Phase, UPDATE as UPDATE_PHASE};
-use ecs::sole::Single;
-use ecs::system::observer::Observe;
-use ecs::uid::Uid;
-use ecs::{Query, Sole, declare_entity};
+use crate::ecs::actions::Actions;
+use crate::ecs::component::Component;
+use crate::ecs::entity::obtainer::Obtainer as EntityObtainer;
+use crate::ecs::event::component::{Added, Changed, EventMatchExt, Removed};
+use crate::ecs::pair::{ChildOf, Pair};
+use crate::ecs::phase::{Phase, UPDATE as UPDATE_PHASE};
+use crate::ecs::sole::Single;
+use crate::ecs::system::observer::Observe;
+use crate::ecs::uid::Uid;
+use crate::ecs::{Query, Sole, declare_entity};
 use raw_window_handle::{DisplayHandle, HandleError, HasDisplayHandle, WindowHandle};
 use winit::application::ApplicationHandler;
 use winit::dpi::PhysicalPosition;
@@ -74,9 +74,9 @@ declare_entity!(
 #[non_exhaustive]
 pub struct Extension {}
 
-impl ecs::extension::Extension for Extension
+impl crate::ecs::extension::Extension for Extension
 {
-    fn collect(self, mut collector: ecs::extension::Collector<'_>)
+    fn collect(self, mut collector: crate::ecs::extension::Collector<'_>)
     {
         collector.add_sole(Context::default()).ok();
         collector.add_sole(Keyboard::default()).ok();
diff --git a/engine/src/windowing/keyboard.rs b/engine/src/windowing/keyboard.rs
index a1c3e22..0bb70a7 100644
--- a/engine/src/windowing/keyboard.rs
+++ b/engine/src/windowing/keyboard.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use ecs::Sole;
+use crate::ecs::Sole;
 
 #[derive(Debug, Default, Sole)]
 pub struct Keyboard
diff --git a/engine/src/windowing/mouse.rs b/engine/src/windowing/mouse.rs
index 0ea04e2..2a3324e 100644
--- a/engine/src/windowing/mouse.rs
+++ b/engine/src/windowing/mouse.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use ecs::Sole;
+use crate::ecs::Sole;
 
 use crate::vector::Vec2;
 
diff --git a/engine/src/windowing/window.rs b/engine/src/windowing/window.rs
index 627bdec..72c6342 100644
--- a/engine/src/windowing/window.rs
+++ b/engine/src/windowing/window.rs
@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use ecs::Component;
+use crate::ecs::Component;
 
 use crate::data_types::dimens::Dimens;