remove shrinkwraprs

baajarmeh · Jan 16, 2021 · 1fae2d9 · 1fae2d9
1 parent a7c8d03
commit 1fae2d9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/amethyst_core/Cargo.toml b/amethyst_core/Cargo.toml
@@ -32,7 +32,6 @@ legion = { version = "0.3.1", default-features = false, features = [
 nalgebra = { version = "0.23.1", features = ["serde-serialize"] }
 rayon = "1.5"
 shrev = "1.1.1"
-shrinkwraprs = "0.3"
 simba = "0.3"
 smallvec = "1.4"
 thread_profiler = { version = "0.3", optional = true }

diff --git a/amethyst_core/src/named.rs b/amethyst_core/src/named.rs
@@ -1,7 +1,6 @@
 use std::{borrow::Cow, fmt::Display};
 
 use serde::{Deserialize, Serialize};
-use shrinkwraprs::Shrinkwrap;
 
 /// A component that gives a name to an [`Entity`].
 ///
@@ -60,8 +59,7 @@ use shrinkwraprs::Shrinkwrap;
 ///         }
 /// });
 /// ```
-#[derive(Shrinkwrap, Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[shrinkwrap(mutable)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Named(
     /// The name of the entity this component is attached to.
     pub Cow<'static, str>,

diff --git a/amethyst_core/src/transform/components/children.rs b/amethyst_core/src/transform/components/children.rs
@@ -1,10 +1,8 @@
-use shrinkwraprs::Shrinkwrap;
 use smallvec::SmallVec;
 
 use crate::ecs::*;
 
-#[derive(Shrinkwrap, Debug, Default, Clone)]
-#[shrinkwrap(mutable)]
+#[derive(Debug, Default, Clone)]
 /// Contains childrens of this entity.
 /// This component is automatically generated by [parent_update_system] based on [Parent] components.
 pub struct Children(pub SmallVec<[Entity; 8]>);

diff --git a/amethyst_core/src/transform/components/parent.rs b/amethyst_core/src/transform/components/parent.rs
@@ -1,14 +1,10 @@
-use shrinkwraprs::Shrinkwrap;
-
 use crate::ecs::*;
 
-#[derive(Shrinkwrap, Debug, Copy, Clone, Eq, PartialEq)]
-#[shrinkwrap(mutable)]
+#[derive( Debug, Copy, Clone, Eq, PartialEq)]
 /// Component used for hierarchy definition.
 /// Parent entity will automatically get [Children] component.
 pub struct Parent(pub Entity);
 
-#[derive(Shrinkwrap, Debug, Copy, Clone, Eq, PartialEq)]
-#[shrinkwrap(mutable)]
+#[derive( Debug, Copy, Clone, Eq, PartialEq)]
 /// Temporary component used for observing hierarchy changes.
 pub struct PreviousParent(pub Option<Entity>);
diff --git a/amethyst_core/src/transform/transform_system.rs b/amethyst_core/src/transform/transform_system.rs
@@ -54,7 +54,7 @@ impl System<'_> for TransformSystem {
 
                             if parent_has_transform {
                                 let parent_matrix = right
-                                    .entry_ref(**parent)
+                                    .entry_ref(parent.0)
                                     .expect("Invalid entity in Parent component")
                                     .into_component::<Transform>()
                                     .unwrap()