c6204279eb
# Objective - Contributes to #15460 - Supersedes #8520 - Fixes #4906 ## Solution - Added a new `web` feature to `bevy`, and several of its crates. - Enabled new `web` feature automatically within crates without `no_std` support. ## Testing - `cargo build --no-default-features --target wasm32v1-none` --- ## Migration Guide When using Bevy crates which _don't_ automatically enable the `web` feature, please enable it when building for the browser. ## Notes - I added [`cfg_if`](https://crates.io/crates/cfg-if) to help manage some of the feature gate gore that this extra feature introduces. It's still pretty ugly, but I think much easier to read. - Certain `wasm` targets (e.g., [wasm32-wasip1](https://doc.rust-lang.org/nightly/rustc/platform-support/wasm32-wasip1.html#wasm32-wasip1)) provide an incomplete implementation for `std`. I have not tested these platforms, but I suspect Bevy's liberal use of usually unsupported features (e.g., threading) will cause these targets to fail. As such, consider `wasm32-unknown-unknown` as the only `wasm` platform with support from Bevy for `std`. All others likely will need to be treated as `no_std` platforms.
107 lines
3.7 KiB
Rust
107 lines
3.7 KiB
Rust
use super::TaskPool;
|
|
use bevy_platform_support::sync::OnceLock;
|
|
use core::ops::Deref;
|
|
|
|
macro_rules! taskpool {
|
|
($(#[$attr:meta])* ($static:ident, $type:ident)) => {
|
|
static $static: OnceLock<$type> = OnceLock::new();
|
|
|
|
$(#[$attr])*
|
|
#[derive(Debug)]
|
|
pub struct $type(TaskPool);
|
|
|
|
impl $type {
|
|
#[doc = concat!(" Gets the global [`", stringify!($type), "`] instance, or initializes it with `f`.")]
|
|
pub fn get_or_init(f: impl FnOnce() -> TaskPool) -> &'static Self {
|
|
$static.get_or_init(|| Self(f()))
|
|
}
|
|
|
|
#[doc = concat!(" Attempts to get the global [`", stringify!($type), "`] instance, \
|
|
or returns `None` if it is not initialized.")]
|
|
pub fn try_get() -> Option<&'static Self> {
|
|
$static.get()
|
|
}
|
|
|
|
#[doc = concat!(" Gets the global [`", stringify!($type), "`] instance.")]
|
|
#[doc = ""]
|
|
#[doc = " # Panics"]
|
|
#[doc = " Panics if the global instance has not been initialized yet."]
|
|
pub fn get() -> &'static Self {
|
|
$static.get().expect(
|
|
concat!(
|
|
"The ",
|
|
stringify!($type),
|
|
" has not been initialized yet. Please call ",
|
|
stringify!($type),
|
|
"::get_or_init beforehand."
|
|
)
|
|
)
|
|
}
|
|
}
|
|
|
|
impl Deref for $type {
|
|
type Target = TaskPool;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
&self.0
|
|
}
|
|
}
|
|
};
|
|
}
|
|
|
|
taskpool! {
|
|
/// A newtype for a task pool for CPU-intensive work that must be completed to
|
|
/// deliver the next frame
|
|
///
|
|
/// See [`TaskPool`] documentation for details on Bevy tasks.
|
|
/// [`AsyncComputeTaskPool`] should be preferred if the work does not have to be
|
|
/// completed before the next frame.
|
|
(COMPUTE_TASK_POOL, ComputeTaskPool)
|
|
}
|
|
|
|
taskpool! {
|
|
/// A newtype for a task pool for CPU-intensive work that may span across multiple frames
|
|
///
|
|
/// See [`TaskPool`] documentation for details on Bevy tasks.
|
|
/// Use [`ComputeTaskPool`] if the work must be complete before advancing to the next frame.
|
|
(ASYNC_COMPUTE_TASK_POOL, AsyncComputeTaskPool)
|
|
}
|
|
|
|
taskpool! {
|
|
/// A newtype for a task pool for IO-intensive work (i.e. tasks that spend very little time in a
|
|
/// "woken" state)
|
|
///
|
|
/// See [`TaskPool`] documentation for details on Bevy tasks.
|
|
(IO_TASK_POOL, IoTaskPool)
|
|
}
|
|
|
|
/// A function used by `bevy_app` to tick the global tasks pools on the main thread.
|
|
/// This will run a maximum of 100 local tasks per executor per call to this function.
|
|
///
|
|
/// # Warning
|
|
///
|
|
/// This function *must* be called on the main thread, or the task pools will not be updated appropriately.
|
|
#[cfg(not(all(target_arch = "wasm32", feature = "web")))]
|
|
pub fn tick_global_task_pools_on_main_thread() {
|
|
COMPUTE_TASK_POOL
|
|
.get()
|
|
.unwrap()
|
|
.with_local_executor(|compute_local_executor| {
|
|
ASYNC_COMPUTE_TASK_POOL
|
|
.get()
|
|
.unwrap()
|
|
.with_local_executor(|async_local_executor| {
|
|
IO_TASK_POOL
|
|
.get()
|
|
.unwrap()
|
|
.with_local_executor(|io_local_executor| {
|
|
for _ in 0..100 {
|
|
compute_local_executor.try_tick();
|
|
async_local_executor.try_tick();
|
|
io_local_executor.try_tick();
|
|
}
|
|
});
|
|
});
|
|
});
|
|
}
|