mirror of
https://github.com/storytold/storyteller-bevy.git
synced 2026-10-29 09:08:58 +00:00
use async compat
This commit is contained in:
Generated
+14
@@ -305,6 +305,19 @@ dependencies = [
|
|||||||
"futures-core",
|
"futures-core",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "async-compat"
|
||||||
|
version = "0.2.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f68a707c1feb095d8c07f8a65b9f506b117d30af431cab89374357de7c11461b"
|
||||||
|
dependencies = [
|
||||||
|
"futures-core",
|
||||||
|
"futures-io",
|
||||||
|
"once_cell",
|
||||||
|
"pin-project-lite",
|
||||||
|
"tokio",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "async-executor"
|
name = "async-executor"
|
||||||
version = "1.8.0"
|
version = "1.8.0"
|
||||||
@@ -4851,6 +4864,7 @@ name = "studio"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
|
"async-compat",
|
||||||
"bevy",
|
"bevy",
|
||||||
"bevy-inspector-egui",
|
"bevy-inspector-egui",
|
||||||
"bevy_mod_outline",
|
"bevy_mod_outline",
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ space_editor = {git = "https://github.com/rewin123/space_editor", rev = "ce83f86
|
|||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
serde_repr = "0.1.18"
|
serde_repr = "0.1.18"
|
||||||
bevy_tweening = "0.9"
|
bevy_tweening = "0.9"
|
||||||
|
async-compat = "0.2"
|
||||||
|
|
||||||
[dependencies.reqwest]
|
[dependencies.reqwest]
|
||||||
version = "0.11.24"
|
version = "0.11.24"
|
||||||
|
|||||||
+1
-1
@@ -41,7 +41,7 @@
|
|||||||
"headless": {
|
"headless": {
|
||||||
"executor": "nx:run-commands",
|
"executor": "nx:run-commands",
|
||||||
"options": {
|
"options": {
|
||||||
"command": "cargo run -p studio --bin studio-headless -- {args}"
|
"command": "cargo run -p studio --bin studio-headless --"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"test": {
|
"test": {
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
use std::{io::ErrorKind, path::Path};
|
use std::{io::ErrorKind, path::Path};
|
||||||
|
|
||||||
|
use async_compat::Compat;
|
||||||
use bevy::{
|
use bevy::{
|
||||||
asset::io::{AssetReader, AssetReaderError, PathStream, Reader, VecReader},
|
asset::io::{AssetReader, AssetReaderError, PathStream, Reader, VecReader},
|
||||||
prelude::*,
|
prelude::*,
|
||||||
@@ -22,7 +23,7 @@ impl AssetReader for RemoteAssetReader {
|
|||||||
&'a self,
|
&'a self,
|
||||||
path: &'a Path,
|
path: &'a Path,
|
||||||
) -> BoxedFuture<'a, Result<Box<Reader<'a>>, AssetReaderError>> {
|
) -> BoxedFuture<'a, Result<Box<Reader<'a>>, AssetReaderError>> {
|
||||||
Box::pin(async move {
|
Box::pin(Compat::new(async move {
|
||||||
let token = path
|
let token = path
|
||||||
.ext_file_prefix()
|
.ext_file_prefix()
|
||||||
.ok_or_else(|| {
|
.ok_or_else(|| {
|
||||||
@@ -82,7 +83,7 @@ impl AssetReader for RemoteAssetReader {
|
|||||||
|
|
||||||
let reader: Box<Reader> = Box::new(VecReader::new(bytes));
|
let reader: Box<Reader> = Box::new(VecReader::new(bytes));
|
||||||
Ok(reader)
|
Ok(reader)
|
||||||
})
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_meta<'a>(
|
fn read_meta<'a>(
|
||||||
|
|||||||
Reference in New Issue
Block a user