Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-25 06:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

update dependencies (#470)

Browse source
This commit is contained in:
Smite Rust 2020-09-11 03:54:24 +08:00 committed by GitHub
parent 9d0abeb014
commit a9ce7f4e82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 172 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
benches/Cargo.toml
View file

@ -11,4 +11,4 @@ bevy = { path = "../" }
[[bench]]
name = "iter"
path = "benches/bevy_tasks/iter.rs"
harness = false
harness = false

7
crates/bevy_app/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_app"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides core App functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -22,4 +25,4 @@ bevy_math = { path = "../bevy_math", version = "0.1" }
# other
libloading = { version = "0.6", optional = true }
log = { version = "0.4", features = ["release_max_level_info"] }
serde = { version = "1.0", features = ["derive"]}
serde = { version = "1.0", features = ["derive"] }

9
crates/bevy_asset/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_asset"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides asset functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -24,9 +27,9 @@ bevy_utils = { path = "../bevy_utils", version = "0.1" }
# other
uuid = { version = "0.8", features = ["v4", "serde"] }
serde = { version = "1", features = ["derive"] }
crossbeam-channel = "0.4.2"
crossbeam-channel = "0.4.4"
anyhow = "1.0"
thiserror = "1.0"
log = { version = "0.4", features = ["release_max_level_info"] }
notify = { version = "5.0.0-pre.2", optional = true }
parking_lot = "0.10.2"
parking_lot = "0.11.0"

15
crates/bevy_audio/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_audio"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides audio functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -11,14 +14,14 @@ keywords = ["bevy"]
[dependencies]
# bevy
bevy_app = {path = "../bevy_app", version = "0.1"}
bevy_asset = {path = "../bevy_asset", version = "0.1"}
bevy_ecs = {path = "../bevy_ecs", version = "0.1"}
bevy_app = { path = "../bevy_app", version = "0.1" }
bevy_asset = { path = "../bevy_asset", version = "0.1" }
bevy_ecs = { path = "../bevy_ecs", version = "0.1" }
# other
anyhow = "1.0"
rodio = {version = "0.11", default-features = false}
parking_lot = "0.10.2"
rodio = { version = "0.11", default-features = false }
parking_lot = "0.11.0"
[features]
mp3 = ["rodio/mp3"]

12
crates/bevy_core/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_core"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides core functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -10,7 +13,10 @@ license = "MIT"
keywords = ["bevy"]
[features]
dynamic_plugins = ["bevy_app/dynamic_plugins", "bevy_type_registry/dynamic_plugins"]
dynamic_plugins = [
"bevy_app/dynamic_plugins",
"bevy_type_registry/dynamic_plugins",
]
[dependencies]
bevy_app = { path = "../bevy_app", version = "0.1" }
@ -19,4 +25,4 @@ bevy_ecs = { path = "../bevy_ecs", version = "0.1" }
bevy_property = { path = "../bevy_property", version = "0.1" }
bevy_type_registry = { path = "../bevy_type_registry", version = "0.1" }
bevy_math = { path = "../bevy_math", version = "0.1" }
bevy_utils = { path = "../bevy_utils", version = "0.1" }
bevy_utils = { path = "../bevy_utils", version = "0.1" }

9
crates/bevy_derive/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_derive"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides derive implementations for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -13,8 +16,8 @@ keywords = ["bevy"]
proc-macro = true
[dependencies]
Inflector = {version = "0.11.4", default-features = false}
proc-macro-crate = "0.1.4"
Inflector = { version = "0.11.4", default-features = false }
proc-macro-crate = "0.1.5"
proc-macro2 = "1.0"
quote = "1.0"
syn = "1.0"

7
crates/bevy_diagnostic/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_diagnostic"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides diagnostic functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -21,4 +24,4 @@ bevy_utils = { path = "../bevy_utils", version = "0.1" }
# other
uuid = { version = "0.8", features = ["v4", "serde"] }
parking_lot = "0.10"
parking_lot = "0.11.0"

13
crates/bevy_ecs/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_ecs"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Bevy Engine's custom entity component system"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -17,8 +20,8 @@ profiler = []
bevy_hecs = { path = "hecs", features = ["macros", "serialize"], version = "0.1" }
bevy_tasks = { path = "../bevy_tasks", version = "0.1" }
bevy_utils = { path = "../bevy_utils", version = "0.1" }
rand = "0.7.2"
fixedbitset = "0.3.0"
downcast-rs = "1.1.1"
parking_lot = "0.10"
rand = "0.7.3"
fixedbitset = "0.3.1"
downcast-rs = "1.2.0"
parking_lot = "0.11.0"
log = { version = "0.4", features = ["release_max_level_info"] }

6
crates/bevy_ecs/hecs/macros/Cargo.toml
View file

@ -11,6 +11,6 @@ proc-macro = true
[dependencies]
syn = "1.0"
quote = "1.0.3"
proc-macro2 = "1.0.1"
proc-macro-crate = "0.1.4"
quote = "1.0"
proc-macro2 = "1.0"
proc-macro-crate = "0.1.5"

5
crates/bevy_gltf/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_gltf"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Bevy Engine GLTF loading"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"

5
crates/bevy_input/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_input"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides input functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"

7
crates/bevy_math/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_math"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides math functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -10,4 +13,4 @@ license = "MIT"
keywords = ["bevy"]
[dependencies]
glam = { version = "0.9.3", features = ["serde"] }
glam = { version = "0.9.4", features = ["serde"] }

7
crates/bevy_pbr/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_pbr"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Adds PBR rendering to Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -20,4 +23,4 @@ bevy_property = { path = "../bevy_property", version = "0.1" }
bevy_render = { path = "../bevy_render", version = "0.1" }
bevy_transform = { path = "../bevy_transform", version = "0.1" }
bevy_type_registry = { path = "../bevy_type_registry", version = "0.1" }
bevy_window = { path = "../bevy_window", version = "0.1" }
bevy_window = { path = "../bevy_window", version = "0.1" }

15
crates/bevy_property/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_property"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Dynamically interact with struct fields using their names"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -11,13 +14,13 @@ keywords = ["bevy"]
[dependencies]
# bevy
bevy_ecs = {path = "../bevy_ecs", version = "0.1"}
bevy_math = {path = "../bevy_math", version = "0.1"}
bevy_property_derive = {path = "bevy_property_derive", version = "0.1"}
bevy_utils = {path = "../bevy_utils", version = "0.1"}
bevy_ecs = { path = "../bevy_ecs", version = "0.1" }
bevy_math = { path = "../bevy_math", version = "0.1" }
bevy_property_derive = { path = "bevy_property_derive", version = "0.1" }
bevy_utils = { path = "../bevy_utils", version = "0.1" }
# other
erased-serde = "0.3"
ron = "0.6.2"
serde = "1"
smallvec = {version = "1.4", features = ["serde"]}
smallvec = { version = "1.4", features = ["serde"] }

7
crates/bevy_property/bevy_property_derive/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_property_derive"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Derive implementations for bevy_property"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -16,4 +19,4 @@ proc-macro = true
syn = "1.0"
proc-macro2 = "1.0"
quote = "1.0"
proc-macro-crate = "0.1.4"
proc-macro-crate = "0.1.5"

15
crates/bevy_render/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_render"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides rendering functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -31,16 +34,16 @@ image = { version = "0.23", default-features = false }
log = { version = "0.4", features = ["release_max_level_info"] }
uuid = { version = "0.8", features = ["v4", "serde"] }
serde = { version = "1", features = ["derive"] }
bitflags = "1.0"
smallvec = "1.4.0"
bitflags = "1.2.1"
smallvec = "1.4.2"
# TODO: replace once_cell with std equivalent if/when this lands: https://github.com/rust-lang/rfcs/pull/2788
once_cell = "1.4.0"
downcast-rs = "1.1.1"
once_cell = "1.4.1"
downcast-rs = "1.2.0"
thiserror = "1.0"
anyhow = "1.0"
hex = "0.4.2"
hexasphere = "1.0.0"
parking_lot = "0.10"
parking_lot = "0.11.0"
[target.'cfg(not(target_os = "ios"))'.dependencies]
bevy-glsl-to-spirv = "0.1.7"

9
crates/bevy_scene/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_scene"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides scene functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -19,9 +22,9 @@ bevy_type_registry = { path = "../bevy_type_registry", version = "0.1" }
bevy_utils = { path = "../bevy_utils", version = "0.1" }
# other
serde = { version = "1.0", features = ["derive"]}
serde = { version = "1.0", features = ["derive"] }
ron = "0.6.2"
uuid = { version = "0.8", features = ["v4", "serde"] }
anyhow = "1.0"
thiserror = "1.0"
parking_lot = "0.10.2"
parking_lot = "0.11.0"

7
crates/bevy_sprite/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_sprite"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides sprite functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -24,4 +27,4 @@ bevy_utils = { path = "../bevy_utils", version = "0.1" }
# other
rectangle-pack = "0.1"
thiserror = "1.0"
guillotiere = "0.5.2"
guillotiere = "0.6.0"

8
crates/bevy_tasks/Cargo.toml
View file

@ -4,15 +4,15 @@ version = "0.1.3"
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Lachlan Sneff <lachlan.sneff@gmail.com>",
"Philip Degarmo <aclysma@gmail.com>"
"Philip Degarmo <aclysma@gmail.com>",
]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
futures-lite = "1.0"
futures-lite = "1.4.0"
event-listener = "2.4.0"
async-executor = "0.2"
async-executor = "1.0.0"
async-channel = "1.4.2"
num_cpus = "1"
num_cpus = "1"

10
crates/bevy_tasks/README.md
View file

@ -8,19 +8,19 @@ a single thread and having that thread await the completion of those tasks. This
generating the tasks from a slice of data. This library is intended for games and makes no attempt to ensure fairness
or ordering of spawned tasks.
It is based on [`multitask`][multitask], a lightweight executor that allows the end user to manage their own threads.
`multitask` is based on async-task, a core piece of async-std.
It is based on [`async-executor`][async-executor], a lightweight executor that allows the end user to manage their own threads.
`async-executor` is based on async-task, a core piece of async-std.
[bevy]: https://bevyengine.org
[rayon]: https://github.com/rayon-rs/rayon
[multitask]: https://github.com/stjepang/multitask
[async-executor]: https://github.com/stjepang/async-executor
## Dependencies
A very small dependency list is a key feature of this module
```
├── multitask
├── async-executor
│ ├── async-task
│ ├── concurrent-queue
│ │ └── cache-padded
@ -28,5 +28,5 @@ A very small dependency list is a key feature of this module
├── num_cpus
│ └── libc
├── parking
└── pollster
└── futures-lite
```

10
crates/bevy_tasks/src/task.rs
View file

@ -4,7 +4,7 @@ use std::{
task::{Context, Poll},
};
/// Wraps `multitask::Task`, a spawned future.
/// Wraps `async_executor::Task`, a spawned future.
///
/// Tasks are also futures themselves and yield the output of the spawned future.
///
@ -12,11 +12,11 @@ use std::{
/// more gracefully and wait until it stops running, use the [`cancel()`][Task::cancel()] method.
///
/// Tasks that panic get immediately canceled. Awaiting a canceled task also causes a panic.
/// Wraps multitask::Task
/// Wraps async_executor::Task
pub struct Task<T>(async_executor::Task<T>);
impl<T> Task<T> {
/// Detaches the task to let it keep running in the background. See `multitask::Task::detach`
/// Detaches the task to let it keep running in the background. See `async_executor::Task::detach`
pub fn detach(self) {
self.0.detach();
}
@ -29,7 +29,7 @@ impl<T> Task<T> {
/// While it's possible to simply drop the [`Task`] to cancel it, this is a cleaner way of
/// canceling because it also waits for the task to stop running.
///
/// See `multitask::Task::cancel`
/// See `async_executor::Task::cancel`
pub async fn cancel(self) -> Option<T> {
self.0.cancel().await
}
@ -39,7 +39,7 @@ impl<T> Future for Task<T> {
type Output = T;
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
// Safe because Task is pinned and contains multitask::Task by value
// Safe because Task is pinned and contains async_executor::Task by value
unsafe { self.map_unchecked_mut(|x| &mut x.0).poll(cx) }
}
}

8
crates/bevy_tasks/src/task_pool.rs
View file

@ -6,6 +6,8 @@ use std::{
thread::{self, JoinHandle},
};
use futures_lite::future;
/// Used to create a TaskPool
#[derive(Debug, Default, Clone)]
pub struct TaskPoolBuilder {
@ -125,7 +127,7 @@ impl TaskPool {
.spawn(move || {
let shutdown_future = ex.run(shutdown_rx.recv());
// Use unwrap_err because we expect a Closed error
futures_lite::future::block_on(shutdown_future).unwrap_err();
future::block_on(shutdown_future).unwrap_err();
})
.expect("failed to spawn thread")
})
@ -159,7 +161,7 @@ impl TaskPool {
// before this function returns. However, rust has no way of knowing
// this so we must convert to 'static here to appease the compiler as it is unable to
// validate safety.
let executor: &async_executor::Executor = &*self.executor as &async_executor::Executor;
let executor: &async_executor::Executor = &*self.executor;
let executor: &'scope async_executor::Executor = unsafe { mem::transmute(executor) };
let fut = async move {
@ -193,7 +195,7 @@ impl TaskPool {
let fut: Pin<&'static mut (dyn Future<Output = Vec<T>> + Send + 'static)> =
unsafe { mem::transmute(fut) };
futures_lite::future::block_on(self.executor.spawn(fut))
future::block_on(self.executor.spawn(fut))
}
/// Spawns a static future onto the thread pool. The returned Task is a future. It can also be

9
crates/bevy_text/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_text"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides text functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -20,5 +23,5 @@ bevy_sprite = { path = "../bevy_sprite", version = "0.1" }
bevy_utils = { path = "../bevy_utils", version = "0.1" }
# other
ab_glyph = "0.2.2"
anyhow = "1.0"
ab_glyph = "0.2.5"
anyhow = "1.0"

11
crates/bevy_transform/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_transform"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides hierarchy and transform functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -14,10 +17,10 @@ keywords = ["bevy"]
bevy_app = { path = "../bevy_app", version = "0.1" }
bevy_ecs = { path = "../bevy_ecs", version = "0.1" }
bevy_math = { path = "../bevy_math", version = "0.1" }
bevy_property = { path = "../bevy_property", version = "0.1" }
bevy_type_registry = { path = "../bevy_type_registry", version = "0.1" }
bevy_property = { path = "../bevy_property", version = "0.1" }
bevy_type_registry = { path = "../bevy_type_registry", version = "0.1" }
bevy_utils = { path = "../bevy_utils", version = "0.1" }
# other
log = "0.4"
smallvec = { version = "1.4", features = ["serde"] }
smallvec = { version = "1.4", features = ["serde"] }

7
crates/bevy_type_registry/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_type_registry"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides a type registry for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -21,4 +24,4 @@ bevy_utils = { path = "../bevy_utils", version = "0.1" }
# other
serde = { version = "1", features = ["derive"] }
parking_lot = "0.10.2"
parking_lot = "0.11.0"

7
crates/bevy_ui/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_ui"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "A custom ECS-driven UI framework built specifically for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -27,4 +30,4 @@ bevy_window = { path = "../bevy_window", version = "0.1" }
bevy_utils = { path = "../bevy_utils", version = "0.1" }
# other
stretch = "0.3"
stretch = "0.3"

5
crates/bevy_utils/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_utils"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "A collection of utils for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"

11
crates/bevy_wgpu/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_wgpu"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "A wgpu render backend for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -27,8 +30,8 @@ bevy_utils = { path = "../bevy_utils", version = "0.1" }
# other
wgpu = "0.6"
pollster = "0.2.0"
futures-lite = "1.4.0"
log = { version = "0.4", features = ["release_max_level_info"] }
crossbeam-channel = "0.4.2"
crossbeam-channel = "0.4.4"
crossbeam-utils = "0.7.2"
parking_lot = "0.10.2"
parking_lot = "0.11.0"

3
crates/bevy_wgpu/src/lib.rs
View file

@ -5,6 +5,7 @@ mod wgpu_renderer;
mod wgpu_resources;
mod wgpu_type_converter;
use futures_lite::future;
pub use wgpu_render_pass::*;
pub use wgpu_renderer::*;
pub use wgpu_resources::*;
@ -32,7 +33,7 @@ impl Plugin for WgpuPlugin {
}
pub fn wgpu_render_system(resources: &mut Resources) -> impl FnMut(&mut World, &mut Resources) {
let mut wgpu_renderer = pollster::block_on(WgpuRenderer::new());
let mut wgpu_renderer = future::block_on(WgpuRenderer::new());
let resource_context = WgpuRenderResourceContext::new(wgpu_renderer.device.clone());
resources.insert::<Box<dyn RenderResourceContext>>(Box::new(resource_context.clone()));
resources.insert(SharedBuffers::new(Box::new(resource_context)));

3
crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs
View file

@ -16,6 +16,7 @@ use bevy_render::{
texture::{Extent3d, SamplerDescriptor, TextureDescriptor},
};
use bevy_window::{Window, WindowId};
use futures_lite::future;
use std::{borrow::Cow, ops::Range, sync::Arc};
use wgpu::util::DeviceExt;
@ -539,7 +540,7 @@ impl RenderResourceContext for WgpuRenderResourceContext {
let buffer_slice = buffer.slice(..);
let data = buffer_slice.map_async(wgpu::MapMode::Write);
self.device.poll(wgpu::Maintain::Wait);
if pollster::block_on(data).is_err() {
if future::block_on(data).is_err() {
panic!("failed to map buffer to host");
}
}

7
crates/bevy_window/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_window"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "Provides windowing functionality for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -17,4 +20,4 @@ bevy_math = { path = "../bevy_math", version = "0.1" }
bevy_utils = { path = "../bevy_utils", version = "0.1" }
# other
uuid = { version = "0.8", features = ["v4", "serde"] }
uuid = { version = "0.8", features = ["v4", "serde"] }

9
crates/bevy_winit/Cargo.toml
View file

@ -2,7 +2,10 @@
name = "bevy_winit"
version = "0.1.3"
edition = "2018"
authors = ["Bevy Contributors <bevyengine@gmail.com>", "Carter Anderson <mcanders1@gmail.com>"]
authors = [
"Bevy Contributors <bevyengine@gmail.com>",
"Carter Anderson <mcanders1@gmail.com>",
]
description = "A winit window and input backend for Bevy Engine"
homepage = "https://bevyengine.org"
repository = "https://github.com/bevyengine/bevy"
@ -23,5 +26,5 @@ bevy_window = { path = "../bevy_window", version = "0.1" }
bevy_utils = { path = "../bevy_utils", version = "0.1" }
# other
winit = { version = "0.22.2", package = "cart-tmp-winit", default-features = false}
log = { version = "0.4", features = ["release_max_level_info"] }
winit = { version = "0.22.2", package = "cart-tmp-winit", default-features = false }
log = { version = "0.4", features = ["release_max_level_info"] }