From 03253d3cc03f0ee841e587f35bad8159a4cc5d5c Mon Sep 17 00:00:00 2001 From: Acrimon Date: Mon, 29 Jul 2019 21:54:48 +0200 Subject: [PATCH 1/9] Switch everything to IDVStorage (No tuning yet.) --- common/Cargo.toml | 1 + common/src/comp/action_state.rs | 5 +++-- common/src/comp/agent.rs | 5 +++-- common/src/comp/animation.rs | 5 +++-- common/src/comp/body.rs | 5 +++-- common/src/comp/controller.rs | 5 +++-- common/src/comp/inputs.rs | 11 ++++++----- common/src/comp/inventory/item.rs | 5 +++-- common/src/comp/inventory/mod.rs | 5 +++-- common/src/comp/phys.rs | 9 +++++---- common/src/comp/player.rs | 5 +++-- common/src/comp/stats.rs | 7 ++++--- common/src/comp/visual.rs | 5 +++-- 13 files changed, 43 insertions(+), 30 deletions(-) diff --git a/common/Cargo.toml b/common/Cargo.toml index 118663b2fe..33f7672e96 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -6,6 +6,7 @@ edition = "2018" [dependencies] sphynx = { git = "https://gitlab.com/veloren/sphynx.git", features = ["serde1"] } +specs-idvs = { git = "http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git" } specs = { version = "0.14.2", features = ["serde", "nightly"] } vek = { version = "0.9.8", features = ["serde"] } diff --git a/common/src/comp/action_state.rs b/common/src/comp/action_state.rs index 18626300a4..23558ebb12 100644 --- a/common/src/comp/action_state.rs +++ b/common/src/comp/action_state.rs @@ -1,4 +1,5 @@ -use specs::{Component, FlaggedStorage, VecStorage}; +use specs::{Component, FlaggedStorage}; +use specs_idvs::IDVStorage; #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] pub struct ActionState { @@ -24,5 +25,5 @@ impl Default for ActionState { } impl Component for ActionState { - type Storage = FlaggedStorage>; + type Storage = FlaggedStorage>; } diff --git a/common/src/comp/agent.rs b/common/src/comp/agent.rs index 97fa052c6b..4847fdd8de 100644 --- a/common/src/comp/agent.rs +++ b/common/src/comp/agent.rs @@ -1,5 +1,6 @@ -use specs::{Component, Entity as EcsEntity, VecStorage}; +use specs::{Component, Entity as EcsEntity}; use vek::*; +use specs_idvs::IDVStorage; #[derive(Copy, Clone, Debug)] pub enum Agent { @@ -14,5 +15,5 @@ pub enum Agent { } impl Component for Agent { - type Storage = VecStorage; + type Storage = IDVStorage; } diff --git a/common/src/comp/animation.rs b/common/src/comp/animation.rs index 2ad33aa8db..f7ac0ac521 100644 --- a/common/src/comp/animation.rs +++ b/common/src/comp/animation.rs @@ -1,4 +1,5 @@ -use specs::{Component, FlaggedStorage, VecStorage}; +use specs::{Component, FlaggedStorage}; +use specs_idvs::IDVStorage; #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)] pub enum Animation { @@ -29,5 +30,5 @@ impl Default for AnimationInfo { } impl Component for AnimationInfo { - type Storage = FlaggedStorage>; + type Storage = FlaggedStorage>; } diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 4c9ae82124..6847ec4c05 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -3,7 +3,8 @@ pub mod object; pub mod quadruped; pub mod quadruped_medium; -use specs::{Component, FlaggedStorage, VecStorage}; +use specs::{Component, FlaggedStorage}; +use specs_idvs::IDVStorage; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum Body { @@ -14,5 +15,5 @@ pub enum Body { } impl Component for Body { - type Storage = FlaggedStorage>; + type Storage = FlaggedStorage>; } diff --git a/common/src/comp/controller.rs b/common/src/comp/controller.rs index 7cd5eba3a4..1391320ea1 100644 --- a/common/src/comp/controller.rs +++ b/common/src/comp/controller.rs @@ -1,5 +1,6 @@ -use specs::{Component, FlaggedStorage, VecStorage}; +use specs::{Component, FlaggedStorage}; use vek::*; +use specs_idvs::IDVStorage; #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)] pub struct Controller { @@ -12,5 +13,5 @@ pub struct Controller { } impl Component for Controller { - type Storage = FlaggedStorage>; + type Storage = FlaggedStorage>; } diff --git a/common/src/comp/inputs.rs b/common/src/comp/inputs.rs index bf00528f72..5f2a3a4373 100644 --- a/common/src/comp/inputs.rs +++ b/common/src/comp/inputs.rs @@ -1,5 +1,6 @@ -use specs::{Component, FlaggedStorage, NullStorage, VecStorage}; +use specs::{Component, FlaggedStorage, NullStorage}; use vek::*; +use specs_idvs::IDVStorage; #[derive(Clone, Debug, Default, Serialize, Deserialize)] pub struct Respawning; @@ -69,19 +70,19 @@ impl Rolling { } impl Component for MoveDir { - type Storage = VecStorage; + type Storage = IDVStorage; } impl Component for Wielding { - type Storage = FlaggedStorage>; + type Storage = FlaggedStorage>; } impl Component for Attacking { - type Storage = FlaggedStorage>; + type Storage = FlaggedStorage>; } impl Component for Rolling { - type Storage = FlaggedStorage>; + type Storage = FlaggedStorage>; } impl Component for OnGround { diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs index 52afd27211..faca9b5b57 100644 --- a/common/src/comp/inventory/item.rs +++ b/common/src/comp/inventory/item.rs @@ -1,4 +1,5 @@ -use specs::{Component, VecStorage}; +use specs::Component; +use specs_idvs::IDVStorage; #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] pub enum Weapon { @@ -60,5 +61,5 @@ pub enum Item { } impl Component for Item { - type Storage = VecStorage; + type Storage = IDVStorage; } diff --git a/common/src/comp/inventory/mod.rs b/common/src/comp/inventory/mod.rs index 0e4acd948d..11643cd6e8 100644 --- a/common/src/comp/inventory/mod.rs +++ b/common/src/comp/inventory/mod.rs @@ -1,4 +1,5 @@ -use specs::{Component, VecStorage}; +use specs::Component; +use specs_idvs::IDVStorage; //Re-Exports pub mod item; @@ -42,5 +43,5 @@ impl Inventory { } impl Component for Inventory { - type Storage = VecStorage; + type Storage = IDVStorage; } diff --git a/common/src/comp/phys.rs b/common/src/comp/phys.rs index 0c674d63ec..e8a9ca0ff8 100644 --- a/common/src/comp/phys.rs +++ b/common/src/comp/phys.rs @@ -1,12 +1,13 @@ -use specs::{Component, NullStorage, VecStorage}; +use specs::{Component, NullStorage}; use vek::*; +use specs_idvs::IDVStorage; // Position #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)] pub struct Pos(pub Vec3); impl Component for Pos { - type Storage = VecStorage; + type Storage = IDVStorage; } // Velocity @@ -14,7 +15,7 @@ impl Component for Pos { pub struct Vel(pub Vec3); impl Component for Vel { - type Storage = VecStorage; + type Storage = IDVStorage; } // Orientation @@ -22,7 +23,7 @@ impl Component for Vel { pub struct Ori(pub Vec3); impl Component for Ori { - type Storage = VecStorage; + type Storage = IDVStorage; } // ForceUpdate diff --git a/common/src/comp/player.rs b/common/src/comp/player.rs index e9b7a1d5c7..2078b0efb8 100644 --- a/common/src/comp/player.rs +++ b/common/src/comp/player.rs @@ -1,4 +1,5 @@ -use specs::{Component, FlaggedStorage, NullStorage, VecStorage}; +use specs::{Component, FlaggedStorage, NullStorage}; +use specs_idvs::IDVStorage; const MAX_ALIAS_LEN: usize = 32; @@ -23,7 +24,7 @@ impl Player { } impl Component for Player { - type Storage = FlaggedStorage>; + type Storage = FlaggedStorage>; } #[derive(Clone, Debug, Default, Serialize, Deserialize)] diff --git a/common/src/comp/stats.rs b/common/src/comp/stats.rs index 89bdcf1298..ac81196e84 100644 --- a/common/src/comp/stats.rs +++ b/common/src/comp/stats.rs @@ -1,5 +1,6 @@ use crate::state::Uid; -use specs::{Component, FlaggedStorage, VecStorage}; +use specs::{Component, FlaggedStorage}; +use specs_idvs::IDVStorage; #[derive(Clone, Copy, Debug, Serialize, Deserialize)] pub enum HealthSource { @@ -129,7 +130,7 @@ impl Stats { } impl Component for Stats { - type Storage = FlaggedStorage>; + type Storage = FlaggedStorage>; } #[derive(Copy, Clone, Debug, Serialize, Deserialize)] @@ -138,5 +139,5 @@ pub struct Dying { } impl Component for Dying { - type Storage = VecStorage; + type Storage = IDVStorage; } diff --git a/common/src/comp/visual.rs b/common/src/comp/visual.rs index 29e759ae95..16dafbfa95 100644 --- a/common/src/comp/visual.rs +++ b/common/src/comp/visual.rs @@ -1,5 +1,6 @@ -use specs::{Component, FlaggedStorage, VecStorage}; +use specs::{Component, FlaggedStorage}; use vek::*; +use specs_idvs::IDVStorage; #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)] pub struct LightEmitter { @@ -19,5 +20,5 @@ impl Default for LightEmitter { } impl Component for LightEmitter { - type Storage = FlaggedStorage>; + type Storage = FlaggedStorage>; } From 8be62be9803896c0e0e89f93c4a2b2a1d9359020 Mon Sep 17 00:00:00 2001 From: Acrimon Date: Mon, 29 Jul 2019 21:54:58 +0200 Subject: [PATCH 2/9] Formatted code. --- common/src/comp/agent.rs | 2 +- common/src/comp/controller.rs | 2 +- common/src/comp/inputs.rs | 2 +- common/src/comp/phys.rs | 2 +- common/src/comp/visual.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/comp/agent.rs b/common/src/comp/agent.rs index 4847fdd8de..89a90d5471 100644 --- a/common/src/comp/agent.rs +++ b/common/src/comp/agent.rs @@ -1,6 +1,6 @@ use specs::{Component, Entity as EcsEntity}; -use vek::*; use specs_idvs::IDVStorage; +use vek::*; #[derive(Copy, Clone, Debug)] pub enum Agent { diff --git a/common/src/comp/controller.rs b/common/src/comp/controller.rs index 1391320ea1..38f5796193 100644 --- a/common/src/comp/controller.rs +++ b/common/src/comp/controller.rs @@ -1,6 +1,6 @@ use specs::{Component, FlaggedStorage}; -use vek::*; use specs_idvs::IDVStorage; +use vek::*; #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)] pub struct Controller { diff --git a/common/src/comp/inputs.rs b/common/src/comp/inputs.rs index 5f2a3a4373..a98012c787 100644 --- a/common/src/comp/inputs.rs +++ b/common/src/comp/inputs.rs @@ -1,6 +1,6 @@ use specs::{Component, FlaggedStorage, NullStorage}; -use vek::*; use specs_idvs::IDVStorage; +use vek::*; #[derive(Clone, Debug, Default, Serialize, Deserialize)] pub struct Respawning; diff --git a/common/src/comp/phys.rs b/common/src/comp/phys.rs index e8a9ca0ff8..46144c8977 100644 --- a/common/src/comp/phys.rs +++ b/common/src/comp/phys.rs @@ -1,6 +1,6 @@ use specs::{Component, NullStorage}; -use vek::*; use specs_idvs::IDVStorage; +use vek::*; // Position #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)] diff --git a/common/src/comp/visual.rs b/common/src/comp/visual.rs index 16dafbfa95..e192e0f44d 100644 --- a/common/src/comp/visual.rs +++ b/common/src/comp/visual.rs @@ -1,6 +1,6 @@ use specs::{Component, FlaggedStorage}; -use vek::*; use specs_idvs::IDVStorage; +use vek::*; #[derive(Copy, Clone, Debug, PartialEq, Serialize, Deserialize)] pub struct LightEmitter { From 579651c86253ffbd35f84533bdeef437fb5c75c2 Mon Sep 17 00:00:00 2001 From: Acrimon Date: Mon, 29 Jul 2019 21:55:57 +0200 Subject: [PATCH 3/9] Update lockfile. --- Cargo.lock | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5dfc54bb80..8cee989816 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -305,7 +305,7 @@ name = "cgl" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gleam 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)", + "gleam 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -812,7 +812,11 @@ dependencies = [ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +======= + "regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update lockfile. "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1094,15 +1098,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +<<<<<<< HEAD +======= + "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gl_generator" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +>>>>>>> Update lockfile. "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gleam" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gl_generator 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2581,6 +2598,15 @@ dependencies = [ "tuple_utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "specs-idvs" +version = "0.1.0" +source = "git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git#806479e4edb6b96dab0b8f37c991be8420dcffe7" +dependencies = [ + "hibitset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", + "specs 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "sphynx" version = "0.1.0" @@ -2867,6 +2893,7 @@ dependencies = [ "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "specs 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)", + "specs-idvs 0.1.0 (git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git)", "sphynx 0.1.0 (git+https://gitlab.com/veloren/sphynx.git)", "vek 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3262,7 +3289,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum gio 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2db9fad8f1b0d4c7338a210a6cbdf081dcc1a3c223718c698c4f313f6c288acb" "checksum gio-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2a57872499171d279f8577ce83837da4cae62b08dd32892236ed67ab7ea61030" "checksum gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39a23d5e872a275135d66895d954269cf5e8661d234eb1c2480f4ce0d586acbd" -"checksum gleam 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "c8a455b5a3ccd35daeb89fdb8a89ebb0a1fe23c05c7a7f9017840bc3ae176f71" +"checksum gl_generator 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1c08ca9be9c177722189cd6a956c9e604563a9c689587b548a8cd7d1d865b022" +"checksum gleam 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "cae10d7c99d0e77b4766e850a60898a17c1abaf01075531f1066f03dc7dc5fc5" "checksum glib 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5e0be1b1432e227bcd1a9b28db9dc1474a7e7fd4227e08e16f35304f32d09b61" "checksum glib-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615bef979b5838526aee99241afc80cfb2e34a8735d4bcb8ec6072598c18a408" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" @@ -3426,6 +3454,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" "checksum smithay-client-toolkit 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2ccb8c57049b2a34d2cc2b203fa785020ba0129d31920ef0d317430adaf748fa" "checksum specs 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)" = "de65613ada4338aa7ba71eca60eca24c60483433eec0077bc4f33cfc31f4bdf0" +"checksum specs-idvs 0.1.0 (git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git)" = "" "checksum sphynx 0.1.0 (git+https://gitlab.com/veloren/sphynx.git)" = "" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" From c75925c5a3b76ab46b5f0b5c840b875eaf41a449 Mon Sep 17 00:00:00 2001 From: Acrimon Date: Mon, 29 Jul 2019 22:19:24 +0200 Subject: [PATCH 4/9] Updated specs-idvs --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 8cee989816..1839a48f5f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2601,7 +2601,7 @@ dependencies = [ [[package]] name = "specs-idvs" version = "0.1.0" -source = "git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git#806479e4edb6b96dab0b8f37c991be8420dcffe7" +source = "git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git#c3464f8c846dd9f5c60e5718c5151aa691adf89f" dependencies = [ "hibitset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "specs 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)", From 005a1b664052e9c02a5203c4f7bfd0d2290300dd Mon Sep 17 00:00:00 2001 From: Acrimon Date: Tue, 30 Jul 2019 15:44:06 +0200 Subject: [PATCH 5/9] Update specs-idvs --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 1839a48f5f..e60347c570 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2601,7 +2601,7 @@ dependencies = [ [[package]] name = "specs-idvs" version = "0.1.0" -source = "git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git#c3464f8c846dd9f5c60e5718c5151aa691adf89f" +source = "git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git#102e69490ece0b4057099f08eafd34c0a431b0de" dependencies = [ "hibitset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "specs 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)", From c2f8dbc2d7c1eb614e1d9c60a7459fbeccde6225 Mon Sep 17 00:00:00 2001 From: Acrimon Date: Wed, 31 Jul 2019 11:15:21 +0200 Subject: [PATCH 6/9] Updated specs-idvs. --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index e60347c570..3cb9976342 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2601,7 +2601,7 @@ dependencies = [ [[package]] name = "specs-idvs" version = "0.1.0" -source = "git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git#102e69490ece0b4057099f08eafd34c0a431b0de" +source = "git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git#282b0b573ba485fe71b5800d6c354adeb19a3c1b" dependencies = [ "hibitset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "specs 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)", From 9fbf710cc9a657fa4b670dc7a778e1799140847b Mon Sep 17 00:00:00 2001 From: Acrimon Date: Wed, 31 Jul 2019 11:30:46 +0200 Subject: [PATCH 7/9] Swapped some rarely use storages. --- Cargo.lock | 2 +- common/src/comp/action_state.rs | 4 ++-- common/src/comp/inventory/mod.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3cb9976342..952a9e9858 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2601,7 +2601,7 @@ dependencies = [ [[package]] name = "specs-idvs" version = "0.1.0" -source = "git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git#282b0b573ba485fe71b5800d6c354adeb19a3c1b" +source = "git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git#0a61720de65311840804cce31b4344747dff1df0" dependencies = [ "hibitset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "specs 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/common/src/comp/action_state.rs b/common/src/comp/action_state.rs index 23558ebb12..d638318538 100644 --- a/common/src/comp/action_state.rs +++ b/common/src/comp/action_state.rs @@ -1,4 +1,4 @@ -use specs::{Component, FlaggedStorage}; +use specs::{Component, FlaggedStorage, HashMapStorage}; use specs_idvs::IDVStorage; #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)] @@ -25,5 +25,5 @@ impl Default for ActionState { } impl Component for ActionState { - type Storage = FlaggedStorage>; + type Storage = FlaggedStorage>; } diff --git a/common/src/comp/inventory/mod.rs b/common/src/comp/inventory/mod.rs index 11643cd6e8..44b5833ada 100644 --- a/common/src/comp/inventory/mod.rs +++ b/common/src/comp/inventory/mod.rs @@ -43,5 +43,5 @@ impl Inventory { } impl Component for Inventory { - type Storage = IDVStorage; + type Storage = HashMapStorage; } From dadcf270981174c4d28abcb0de3095490baf7c7f Mon Sep 17 00:00:00 2001 From: Acrimon Date: Wed, 31 Jul 2019 11:37:06 +0200 Subject: [PATCH 8/9] Fixed missing import. --- common/src/comp/inventory/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/comp/inventory/mod.rs b/common/src/comp/inventory/mod.rs index 44b5833ada..7843684e18 100644 --- a/common/src/comp/inventory/mod.rs +++ b/common/src/comp/inventory/mod.rs @@ -1,4 +1,4 @@ -use specs::Component; +use specs::{Component, HashMapStorage}; use specs_idvs::IDVStorage; //Re-Exports From 3f85f35084f5d93939b8893583c064be61ee0c95 Mon Sep 17 00:00:00 2001 From: Acrimon Date: Wed, 31 Jul 2019 11:45:23 +0200 Subject: [PATCH 9/9] Fix lockfile. --- Cargo.lock | 65 ++++++++++++++++++++++++++++++++++------------- common/Cargo.toml | 2 +- 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 952a9e9858..123e8121b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -812,11 +812,7 @@ dependencies = [ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -======= - "regex 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update lockfile. "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1098,8 +1094,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -<<<<<<< HEAD -======= "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1110,7 +1104,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ->>>>>>> Update lockfile. "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1181,7 +1174,7 @@ dependencies = [ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "winit 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1475,6 +1468,14 @@ dependencies = [ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "lock_api" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "log" version = "0.3.9" @@ -1906,6 +1907,16 @@ dependencies = [ "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "parking_lot" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "parking_lot_core" version = "0.3.1" @@ -1930,6 +1941,21 @@ dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "parking_lot_core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "peeking_take_while" version = "0.1.2" @@ -1937,7 +1963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "percent-encoding" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2610,7 +2636,7 @@ dependencies = [ [[package]] name = "sphynx" version = "0.1.0" -source = "git+https://gitlab.com/veloren/sphynx.git#11cdc7422568aaabd376c87242a60f636e68b40d" +source = "git+https://gitlab.com/veloren/sphynx.git?rev=11cdc7422568aaabd376c87242a60f636e68b40d#11cdc7422568aaabd376c87242a60f636e68b40d" dependencies = [ "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2894,7 +2920,7 @@ dependencies = [ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "specs 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)", "specs-idvs 0.1.0 (git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git)", - "sphynx 0.1.0 (git+https://gitlab.com/veloren/sphynx.git)", + "sphynx 0.1.0 (git+https://gitlab.com/veloren/sphynx.git?rev=11cdc7422568aaabd376c87242a60f636e68b40d)", "vek 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2968,7 +2994,7 @@ dependencies = [ "veloren-client 0.2.0", "veloren-common 0.2.0", "veloren-server 0.2.0", - "winit 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3115,7 +3141,7 @@ dependencies = [ [[package]] name = "winit" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3128,8 +3154,8 @@ dependencies = [ "libc 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "percent-encoding 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-client 0.21.13 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3329,6 +3355,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum line_drawing 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9" "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" +"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" "checksum lz4-compress 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f966533a922a9bba9e95e594c1fdb3b9bf5fdcdb11e37e51ad84cd76e468b91" @@ -3377,10 +3404,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum pango-sys 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94039b3921a4af4058a3e4335e5d15099101f298a92f5afc40bab3a3027594a1" "checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5" "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" +"checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7" "checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c" "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" +"checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c" "checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" -"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +"checksum percent-encoding 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba4f28a6faf4ffea762ba8f4baef48c61a6db348647c73095034041fc79dd954" "checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f" "checksum piston-float 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b058c3a640efd4bcf63266512e4bb03187192c1b29edd38b16d5a014613e3199" "checksum piston-viewport 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d96dd995f7dabe6d57cda668ec0fda39d6fe6e1e0b23f772582f383f2013611" @@ -3455,7 +3484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum smithay-client-toolkit 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2ccb8c57049b2a34d2cc2b203fa785020ba0129d31920ef0d317430adaf748fa" "checksum specs 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)" = "de65613ada4338aa7ba71eca60eca24c60483433eec0077bc4f33cfc31f4bdf0" "checksum specs-idvs 0.1.0 (git+http://gitlab.nebulanet.cc/xacrimon/specs-idvs.git)" = "" -"checksum sphynx 0.1.0 (git+https://gitlab.com/veloren/sphynx.git)" = "" +"checksum sphynx 0.1.0 (git+https://gitlab.com/veloren/sphynx.git?rev=11cdc7422568aaabd376c87242a60f636e68b40d)" = "" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum static_assertions 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" "checksum stb_truetype 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "69b7df505db8e81d54ff8be4693421e5b543e08214bd8d99eb761fcb4d5668ba" @@ -3502,7 +3531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" "checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" -"checksum winit 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d233301129ddd33260b47f76900b50e154b7254546e2edba0e5468a1a5fe4de3" +"checksum winit 0.19.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd67dc9e0f9e13da393d9b6fa13042f3aed9b2bb2db6717d72d4cc271970c415" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "checksum x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)" = "940586acb859ea05c53971ac231685799a7ec1dee66ac0bccc0e6ad96e06b4e3" "checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" diff --git a/common/Cargo.toml b/common/Cargo.toml index 33f7672e96..fa2f539247 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Joshua Barretto ", "Maciej Ćwięka