Merge pull request #3 from amethyst/master

Update to Master

Author: mrhatman

.github/pull_request_template.md

@@ -27,5 +27,5 @@ By placing an x in the boxes I certify that I have:
 If this modified or created any rs files:
 
 - [ ] Ran `cargo +stable fmt --all`
-- [ ] Ran `cargo clippy --all`
-- [ ] Ran `cargo test --all --features "empty"`
+- [ ] Ran `cargo clippy --all --features "empty"`
+- [ ] Ran `cargo test --all --features "empty"`

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "amethyst"
-version = "0.11.1"
+version = "0.12.0"
 authors = ["Eyal Kalderon <[email protected]>", "Amethyst Foundation <[email protected]>"]
 edition = "2018"
 description = "Data-oriented game engine written in Rust"
@@ -19,7 +19,7 @@ license = "MIT/Apache-2.0"
 travis-ci = { repository = "amethyst/amethyst", branch = "master" }
 
 [features]
-default = ["animation", "audio", "locale", "network", "renderer"]
+default = ["animation", "audio", "locale", "network", "renderer", "sentry"]
 
 vulkan = ["amethyst_rendy/vulkan"]
 metal = ["amethyst_rendy/metal"]
@@ -104,29 +104,29 @@ members = [
 ]
 
 [dependencies]
-amethyst_animation = { path = "amethyst_animation", version = "0.6.0", optional = true }
-amethyst_assets = { path = "amethyst_assets", version = "0.7.0" }
-amethyst_audio = { path = "amethyst_audio", version = "0.6.0", optional = true }
-amethyst_config = { path = "amethyst_config", version = "0.10.0" }
-amethyst_core = { path = "amethyst_core", version = "0.6.0" }
-amethyst_error = { path = "amethyst_error", version = "0.1.0" }
-amethyst_controls = { path = "amethyst_controls", version = "0.5.0" }
-amethyst_derive = { path = "amethyst_derive", version = "0.4.0" }
-amethyst_gltf = { path = "amethyst_gltf", version = "0.6.0", optional = true }
-amethyst_network = { path = "amethyst_network", version = "0.4.0", optional = true }
-amethyst_locale = { path = "amethyst_locale", version = "0.5.0", optional = true }
-amethyst_rendy = { path = "amethyst_rendy", version = "0.1.0", features = ["window"], optional = true }
-amethyst_input = { path = "amethyst_input", version = "0.7.0" }
-amethyst_ui = { path = "amethyst_ui", version = "0.6.0" }
-amethyst_utils = { path = "amethyst_utils", version = "0.6.0" }
-amethyst_window = { path = "amethyst_window", version = "0.1.0" }
-crossbeam-channel = "0.3.1"
+amethyst_animation = { path = "amethyst_animation", version = "0.7.0", optional = true }
+amethyst_assets = { path = "amethyst_assets", version = "0.8.0" }
+amethyst_audio = { path = "amethyst_audio", version = "0.7.0", optional = true }
+amethyst_config = { path = "amethyst_config", version = "0.11.0" }
+amethyst_core = { path = "amethyst_core", version = "0.7.0" }
+amethyst_error = { path = "amethyst_error", version = "0.2.0" }
+amethyst_controls = { path = "amethyst_controls", version = "0.6.0" }
+amethyst_derive = { path = "amethyst_derive", version = "0.5.0" }
+amethyst_gltf = { path = "amethyst_gltf", version = "0.7.0", optional = true }
+amethyst_network = { path = "amethyst_network", version = "0.5.0", optional = true }
+amethyst_locale = { path = "amethyst_locale", version = "0.6.0", optional = true }
+amethyst_rendy = { path = "amethyst_rendy", version = "0.2.0", features = ["window"], optional = true }
+amethyst_input = { path = "amethyst_input", version = "0.8.0" }
+amethyst_ui = { path = "amethyst_ui", version = "0.7.0" }
+amethyst_utils = { path = "amethyst_utils", version = "0.7.0" }
+amethyst_window = { path = "amethyst_window", version = "0.2.0" }
+crossbeam-channel = "0.3.9"
 derivative = "1.0"
 fern = { version = "0.5", features = ["colored"] }
 log = { version = "0.4.6", features = ["serde"] }
 rayon = "1.1.0"
 rustc_version_runtime = "0.1"
-sentry = "0.15.4"
+sentry = { version = "0.15.4", optional = true }
 winit = { version = "0.19", features = ["serde", "icon_loading"] }
 serde = { version = "1.0", features = ["derive"] }
 palette = { version = "0.4", features = ["serde"] }

README.md

@@ -138,7 +138,7 @@ $ pacman -Sy grep gcc pkgconfig openssl alsa-lib cmake make python3 freetype2 aw
 ### Fedora
 
 ```
-# dnf install pkgconfig gcc openssl-devel alsa-lib-devel cmake make gcc-c++ freetype-devel expat-devel libxcb-devel
+# dnf install pkgconfig gcc openssl-devel alsa-lib-devel cmake make gcc-c++ freetype-devel expat-devel libxcb-devel libX11-devel
 ```
 
 ### openSUSE

amethyst_animation/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "amethyst_animation"
-version = "0.6.0"
+version = "0.7.0"
 authors = ["Simon Rönnberg <[email protected]>"]
 edition = "2018"
 description = "Animation support for Amethyst"
@@ -14,18 +14,16 @@ readme = "README.md"
 license = "MIT/Apache-2.0"
 
 [badges]
-appveyor = { repository = "amethyst/amethyst", branch = "master" }
 travis-ci = { repository = "amethyst/amethyst" }
 
 [dependencies]
-amethyst_assets = { path = "../amethyst_assets/", version = "0.7.0" }
-amethyst_core = { path = "../amethyst_core/", version = "0.6.0" }
-amethyst_error = { path = "../amethyst_error/", version = "0.1.0" }
-amethyst_derive = { path = "../amethyst_derive", version = "0.4.0" }
-amethyst_rendy = { path = "../amethyst_rendy", version = "0.1.0" }
+amethyst_assets = { path = "../amethyst_assets/", version = "0.8.0" }
+amethyst_core = { path = "../amethyst_core/", version = "0.7.0" }
+amethyst_error = { path = "../amethyst_error/", version = "0.2.0" }
+amethyst_derive = { path = "../amethyst_derive", version = "0.5.0" }
+amethyst_rendy = { path = "../amethyst_rendy", version = "0.2.0" }
 derivative = "1.0"
 fnv = "1"
-hibitset = { version = "0.5.1", features = ["parallel"] }
 itertools = "0.7.8"
 log = "0.4.6"
 minterpolate = { version = "0.4", features = ["serde"] }
@@ -38,4 +36,4 @@ thread_profiler = { version = "0.3", optional = true }
 [features]
 profiler = [ "thread_profiler/thread_profiler" ]
 nightly = [ "amethyst_core/nightly" ]
-float64 = ["amethyst_core/float64"]
+float64 = ["amethyst_core/float64"]

amethyst_animation/src/bundle.rs

@@ -1,13 +1,14 @@
 use crate::{
     resources::AnimationSampling,
-    skinning::VertexSkinningSystem,
+    skinning::VertexSkinningSystemDesc,
     systems::{
-        AnimationControlSystem, AnimationProcessor, SamplerInterpolationSystem, SamplerProcessor,
+        AnimationControlSystemDesc, AnimationProcessor, SamplerInterpolationSystem,
+        SamplerProcessor,
     },
 };
 use amethyst_core::{
-    ecs::prelude::{Component, DispatcherBuilder},
-    SystemBundle,
+    ecs::prelude::{Component, DispatcherBuilder, World},
+    SystemBundle, SystemDesc,
 };
 use amethyst_error::Error;
 use std::{hash::Hash, marker};
@@ -35,9 +36,13 @@ impl<'a> VertexSkinningBundle<'a> {
 }
 
 impl<'a, 'b, 'c> SystemBundle<'a, 'b> for VertexSkinningBundle<'c> {
-    fn build(self, builder: &mut DispatcherBuilder<'a, 'b>) -> Result<(), Error> {
+    fn build(
+        self,
+        world: &mut World,
+        builder: &mut DispatcherBuilder<'a, 'b>,
+    ) -> Result<(), Error> {
         builder.add(
-            VertexSkinningSystem::new(),
+            VertexSkinningSystemDesc::default().build(world),
             "vertex_skinning_system",
             self.dep,
         );
@@ -85,7 +90,11 @@ impl<'a, 'b, 'c, T> SystemBundle<'a, 'b> for SamplingBundle<'c, T>
 where
     T: AnimationSampling + Component,
 {
-    fn build(self, builder: &mut DispatcherBuilder<'a, 'b>) -> Result<(), Error> {
+    fn build(
+        self,
+        _world: &mut World,
+        builder: &mut DispatcherBuilder<'a, 'b>,
+    ) -> Result<(), Error> {
         builder.add(SamplerProcessor::<T::Primitive>::new(), "", &[]);
         builder.add(SamplerInterpolationSystem::<T>::new(), self.name, self.dep);
         Ok(())
@@ -140,15 +149,19 @@ where
     I: PartialEq + Eq + Hash + Copy + Send + Sync + 'static,
     T: AnimationSampling + Component + Clone,
 {
-    fn build(self, builder: &mut DispatcherBuilder<'a, 'b>) -> Result<(), Error> {
+    fn build(
+        self,
+        world: &mut World,
+        builder: &mut DispatcherBuilder<'a, 'b>,
+    ) -> Result<(), Error> {
         builder.add(AnimationProcessor::<T>::new(), "", &[]);
         builder.add(
-            AnimationControlSystem::<I, T>::new(),
+            AnimationControlSystemDesc::<I, T>::default().build(world),
             self.animation_name,
             self.dep,
         );
         SamplingBundle::<T>::new(self.sampling_name)
             .with_dep(&[self.animation_name])
-            .build(builder)
+            .build(world, builder)
     }
 }

amethyst_animation/src/skinning/resources.rs

@@ -1,10 +1,12 @@
 use derivative::Derivative;
-use hibitset::BitSet;
 use serde::{Deserialize, Serialize};
 
 use amethyst_assets::{PrefabData, ProgressCounter};
 use amethyst_core::{
-    ecs::prelude::{Component, DenseVecStorage, Entity, WriteStorage},
+    ecs::{
+        hibitset::BitSet,
+        prelude::{Component, DenseVecStorage, Entity, WriteStorage},
+    },
     math::Matrix4,
 };
 use amethyst_derive::PrefabData;

amethyst_animation/src/skinning/systems.rs

@@ -1,9 +1,10 @@
 use amethyst_core::{
     ecs::prelude::{
-        BitSet, ComponentEvent, Join, ReadStorage, ReaderId, Resources, System, WriteStorage,
+        BitSet, ComponentEvent, Join, ReadStorage, ReaderId, System, SystemData, World,
+        WriteStorage,
     },
     math::{convert, Matrix4},
-    Transform,
+    SystemDesc, Transform,
 };
 use amethyst_rendy::skinning::JointTransforms;
 
@@ -14,22 +15,40 @@ use thread_profiler::profile_scope;
 
 use super::resources::*;
 
+/// Builds a `VertexSkinningSystem`.
+#[derive(Default, Debug)]
+pub struct VertexSkinningSystemDesc;
+
+impl<'a, 'b> SystemDesc<'a, 'b, VertexSkinningSystem> for VertexSkinningSystemDesc {
+    fn build(self, world: &mut World) -> VertexSkinningSystem {
+        <VertexSkinningSystem as System<'_>>::SystemData::setup(world);
+        let mut transform = WriteStorage::<Transform>::fetch(&world);
+        let updated_id = transform.register_reader();
+
+        VertexSkinningSystem::new(updated_id)
+    }
+}
+
 /// System for performing vertex skinning.
 ///
 /// Needs to run after global transforms have been updated for the current frame.
-#[derive(Default, Debug)]
+#[derive(Debug)]
 pub struct VertexSkinningSystem {
     /// Also scratch space, used while determining which skins need to be updated.
     updated: BitSet,
     updated_skins: BitSet,
     /// Used for tracking modifications to global transforms
-    updated_id: Option<ReaderId<ComponentEvent>>,
+    updated_id: ReaderId<ComponentEvent>,
 }
 
 impl VertexSkinningSystem {
     /// Creates a new `VertexSkinningSystem`
-    pub fn new() -> Self {
-        Self::default()
+    pub fn new(updated_id: ReaderId<ComponentEvent>) -> Self {
+        Self {
+            updated: BitSet::default(),
+            updated_skins: BitSet::default(),
+            updated_id,
+        }
     }
 }
 
@@ -49,9 +68,7 @@ impl<'a> System<'a> for VertexSkinningSystem {
 
         global_transforms
             .channel()
-            .read(self.updated_id.as_mut().expect(
-                "`VertexSkinningSystem::setup` was not called before `VertexSkinningSystem::run`",
-            ))
+            .read(&mut self.updated_id)
             .for_each(|event| match event {
                 ComponentEvent::Inserted(id) | ComponentEvent::Modified(id) => {
                     self.updated.add(*id);
@@ -126,11 +143,4 @@ impl<'a> System<'a> for VertexSkinningSystem {
             }
         }
     }
-
-    fn setup(&mut self, res: &mut Resources) {
-        use amethyst_core::ecs::prelude::SystemData;
-        Self::SystemData::setup(res);
-        let mut transform = WriteStorage::<Transform>::fetch(res);
-        self.updated_id = Some(transform.register_reader());
-    }
 }

amethyst_animation/src/systems/control.rs

@@ -1,16 +1,22 @@
-use std::{hash::Hash, marker, time::Duration};
+use std::{
+    hash::Hash,
+    marker::{self, PhantomData},
+    time::Duration,
+};
 
+use derivative::Derivative;
 use fnv::FnvHashMap;
 use log::error;
 use minterpolate::InterpolationPrimitive;
 
 use amethyst_assets::{AssetStorage, Handle};
 use amethyst_core::{
     ecs::prelude::{
-        Component, Entities, Entity, Join, Read, ReadStorage, Resources, System, SystemData,
+        Component, Entities, Entity, Join, Read, ReadStorage, System, SystemData, World,
         WriteStorage,
     },
     timing::secs_to_duration,
+    SystemDesc,
 };
 
 use crate::resources::{
@@ -22,6 +28,27 @@ use crate::resources::{
 #[cfg(feature = "profiler")]
 use thread_profiler::profile_scope;
 
+/// Builds an `AnimationControlSystem`.
+#[derive(Derivative, Debug)]
+#[derivative(Default(bound = ""))]
+pub struct AnimationControlSystemDesc<I, T> {
+    marker: PhantomData<(I, T)>,
+}
+
+impl<'a, 'b, I, T> SystemDesc<'a, 'b, AnimationControlSystem<I, T>>
+    for AnimationControlSystemDesc<I, T>
+where
+    I: Copy + Eq + Hash + Send + Sync + 'static,
+    T: AnimationSampling + Component + Clone,
+{
+    fn build(self, world: &mut World) -> AnimationControlSystem<I, T> {
+        <AnimationControlSystem<I, T> as System<'_>>::SystemData::setup(world);
+        ReadStorage::<AnimationSet<I, T>>::setup(world);
+
+        AnimationControlSystem::new()
+    }
+}
+
 /// System for setting up animations, should run before `SamplerInterpolationSystem`.
 ///
 /// Will process all active `AnimationControl` + `AnimationHierarchy`, and do processing of the
@@ -47,7 +74,8 @@ where
 
 impl<I, T> AnimationControlSystem<I, T>
 where
-    I: Eq + Hash,
+    I: PartialEq + Eq + Hash + Copy + Send + Sync + 'static,
+    T: AnimationSampling + Component + Clone,
 {
     /// Creates a new `AnimationControlSystem`
     pub fn new() -> Self {
@@ -212,11 +240,6 @@ where
             controls.remove(entity);
         }
     }
-
-    fn setup(&mut self, res: &mut Resources) {
-        Self::SystemData::setup(res);
-        ReadStorage::<AnimationSet<I, T>>::setup(res);
-    }
 }
 
 fn get_running_duration<T>(

amethyst_animation/src/systems/mod.rs

@@ -2,7 +2,10 @@ use amethyst_assets::Processor;
 
 use crate::resources::{Animation, Sampler};
 
-pub use self::{control::AnimationControlSystem, sampling::SamplerInterpolationSystem};
+pub use self::{
+    control::{AnimationControlSystem, AnimationControlSystemDesc},
+    sampling::SamplerInterpolationSystem,
+};
 
 mod control;
 mod sampling;