diff --git a/context/Cargo.toml b/context/Cargo.toml index 9c251ea..435be07 100644 --- a/context/Cargo.toml +++ b/context/Cargo.toml @@ -5,9 +5,7 @@ authors = ["hodasemi "] edition = "2024" [dependencies] -utilities = { workspace = true } audio = { workspace = true, optional = true } -assetpath = { workspace = true } anyhow = { workspace = true } presentation = { path = "../presentation" } diff --git a/engine/Cargo.toml b/engine/Cargo.toml index 28a4dcd..ab4d849 100644 --- a/engine/Cargo.toml +++ b/engine/Cargo.toml @@ -6,8 +6,6 @@ edition = "2024" [dependencies] # needed -destructure_traitobject = { workspace = true } -itertools = { workspace = true } serde = { workspace = true } ron = { workspace = true } paste = { workspace = true } @@ -20,8 +18,6 @@ assetpath = { workspace = true } shaderc = { workspace = true } config_handler = { path = "../ConfigHandler" } -lua-wrapper = { path = "../lua-wrapper" } -scene_update_macros = { path = "../scene_update_macros" } asset = { path = "../asset" } loading_screen = { path = "../loading-screen" } context = { path = "../context", features = ["bundle_sdl2", "sound"] } diff --git a/engine/src/prelude.rs b/engine/src/prelude.rs index c763426..4d2ee91 100644 --- a/engine/src/prelude.rs +++ b/engine/src/prelude.rs @@ -14,11 +14,6 @@ pub use crate::engine::{ engine_settings::*, }; -pub use serde::{ - Deserialize, Deserializer, Serialize, Serializer, - ser::{SerializeMap, SerializeSeq, SerializeStruct}, -}; - pub use ecs::*; pub use ron; diff --git a/engine/src/scene/content/components/bounding_box.rs b/engine/src/scene/content/components/bounding_box.rs index 1524fd3..900e993 100644 --- a/engine/src/scene/content/components/bounding_box.rs +++ b/engine/src/scene/content/components/bounding_box.rs @@ -2,6 +2,7 @@ use crate::prelude::*; use asset::GltfBoundingBox as GltfBB; +use serde::{Deserialize, Serialize}; use utilities::prelude::cgmath::Vector3; #[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)] diff --git a/engine/src/scene/content/components/location.rs b/engine/src/scene/content/components/location.rs index dbdb1b9..1b54a8c 100644 --- a/engine/src/scene/content/components/location.rs +++ b/engine/src/scene/content/components/location.rs @@ -1,6 +1,7 @@ use cgmath::{Matrix2, Rad, Vector2, Vector3, Zero}; use cgmath::Matrix4; +use serde::{Deserialize, Serialize}; use crate::prelude::*; use anyhow::Result; diff --git a/engine/src/scene/content/components/particle_system.rs b/engine/src/scene/content/components/particle_system.rs index c982d54..a59cc41 100644 --- a/engine/src/scene/content/components/particle_system.rs +++ b/engine/src/scene/content/components/particle_system.rs @@ -2,6 +2,7 @@ use crate::prelude::*; use asset::*; +use serde::{Deserialize, Serialize}; use utilities::prelude::cgmath::{Deg, InnerSpace, Matrix4, vec3}; use std::sync::{Arc, Mutex, MutexGuard}; diff --git a/entity_manager/src/animation_info.rs b/entity_manager/src/animation_info.rs index 8f49084..1002eaf 100644 --- a/entity_manager/src/animation_info.rs +++ b/entity_manager/src/animation_info.rs @@ -2,6 +2,7 @@ use std::{collections::HashMap, time::Duration}; use anyhow::Result; use engine::prelude::*; +use serde::{Deserialize, Serialize}; use crate::entityparser::AnimationData; diff --git a/entity_manager/src/entity_tags.rs b/entity_manager/src/entity_tags.rs index 8ac1716..69bcd5b 100644 --- a/entity_manager/src/entity_tags.rs +++ b/entity_manager/src/entity_tags.rs @@ -1,6 +1,6 @@ use std::fmt; -use engine::prelude::*; +use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)] pub enum EntityTags { diff --git a/entity_manager/src/entityparser.rs b/entity_manager/src/entityparser.rs index dee97b5..3b73f8d 100644 --- a/entity_manager/src/entityparser.rs +++ b/entity_manager/src/entityparser.rs @@ -4,6 +4,7 @@ use assetpath::AssetPath; use anyhow::Result; use engine::prelude::*; +use serde::{Deserialize, Serialize}; use crate::animation_info::AnimationType;