forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asset: make asset folder loading permissive of non-assets

Browse Source
This commit is contained in:
Carter Anderson 2020-06-07 11:45:18 -07:00
parent f2b3b909b4
commit c1dcc74e0f
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
crates/bevy_asset/src/asset_server.rs
View File

@ -127,7 +127,10 @@ impl AssetServer {
self.loaders.push(resources); self.loaders.push(resources);
} }
pub fn load_asset_folder<P: AsRef<Path>>(&self, path: P) -> Result<Vec<HandleId>, AssetServerError> { pub fn load_asset_folder<P: AsRef<Path>>(
&self,
path: P,
) -> Result<Vec<HandleId>, AssetServerError> {
let root_path = self.get_root_path()?; let root_path = self.get_root_path()?;
let asset_folder = root_path.join(path); let asset_folder = root_path.join(path);
let handle_ids = self.load_assets_in_folder_recursive(&asset_folder)?; let handle_ids = self.load_assets_in_folder_recursive(&asset_folder)?;
@ -285,7 +288,13 @@ impl AssetServer {
.get(path) .get(path)
.and_then(|handle_id| asset_info.get_mut(&handle_id)) .and_then(|handle_id| asset_info.get_mut(&handle_id))
{ {
asset_info.load_state = if let LoadState::Loaded(_version) = asset_info.load_state { new_version += 1; LoadState::Loading(new_version) } else { LoadState::Loading(new_version) }; asset_info.load_state =
if let LoadState::Loaded(_version) = asset_info.load_state {
new_version += 1;
LoadState::Loading(new_version)
} else {
LoadState::Loading(new_version)
};
asset_info.handle_id asset_info.handle_id
} else { } else {
let handle_id = HandleId::new(); let handle_id = HandleId::new();
@ -333,9 +342,13 @@ impl AssetServer {
} }
}); });
} }
pub fn get_load_state_untyped(&self, handle_id: HandleId) -> Option<LoadState> { pub fn get_load_state_untyped(&self, handle_id: HandleId) -> Option<LoadState> {
self.asset_info.read().unwrap().get(&handle_id).map(|asset_info| asset_info.load_state.clone()) self.asset_info
.read()
.unwrap()
.get(&handle_id)
.map(|asset_info| asset_info.load_state.clone())
} }
pub fn get_load_state<T>(&self, handle: Handle<T>) -> Option<LoadState> { pub fn get_load_state<T>(&self, handle: Handle<T>) -> Option<LoadState> {
@ -347,7 +360,9 @@ impl AssetServer {
for handle_id in handle_ids.iter() { for handle_id in handle_ids.iter() {
match self.get_load_state_untyped(*handle_id) { match self.get_load_state_untyped(*handle_id) {
Some(LoadState::Loaded(_)) => continue, Some(LoadState::Loaded(_)) => continue,
Some(LoadState::Loading(_)) => {load_state = LoadState::Loading(0);}, Some(LoadState::Loading(_)) => {
load_state = LoadState::Loading(0);
}
Some(LoadState::Failed(_)) => return Some(LoadState::Failed(0)), Some(LoadState::Failed(_)) => return Some(LoadState::Failed(0)),
None => return None, None => return None,
} }
@ -406,7 +421,10 @@ impl AssetServer {
}); });
} }
fn load_assets_in_folder_recursive(&self, path: &Path) -> Result<Vec<HandleId>, AssetServerError> { fn load_assets_in_folder_recursive(
&self,
path: &Path,
) -> Result<Vec<HandleId>, AssetServerError> {
if !path.is_dir() { if !path.is_dir() {
return Err(AssetServerError::AssetFolderNotADirectory( return Err(AssetServerError::AssetFolderNotADirectory(
path.to_str().unwrap().to_string(), path.to_str().unwrap().to_string(),
@ -418,17 +436,21 @@ impl AssetServer {
for entry in fs::read_dir(path)? { for entry in fs::read_dir(path)? {
let entry = entry?; let entry = entry?;
let child_path = entry.path(); let child_path = entry.path();
if !child_path.is_dir() { if child_path.is_dir() {
handle_ids.extend(self.load_assets_in_folder_recursive(&child_path)?);
} else {
let relative_child_path = child_path.strip_prefix(&root_path).unwrap(); let relative_child_path = child_path.strip_prefix(&root_path).unwrap();
let handle = self.load_untyped( let handle = match self.load_untyped(
relative_child_path relative_child_path
.to_str() .to_str()
.expect("Path should be a valid string"), .expect("Path should be a valid string"),
)?; ) {
Ok(handle) => handle,
Err(AssetServerError::MissingAssetHandler) => continue,
Err(err) => Err(err)?,
};
handle_ids.push(handle); handle_ids.push(handle);
} else {
handle_ids.extend(self.load_assets_in_folder_recursive(&child_path)?);
} }
} }

2
examples/asset/asset_loading.rs
View File

@ -9,7 +9,7 @@ fn main() {
fn setup( fn setup(
command_buffer: &mut CommandBuffer, command_buffer: &mut CommandBuffer,
mut asset_server: ResMut<AssetServer>, asset_server: Res<AssetServer>,
mut meshes: ResMut<Assets<Mesh>>, mut meshes: ResMut<Assets<Mesh>>,
mut materials: ResMut<Assets<StandardMaterial>>, mut materials: ResMut<Assets<StandardMaterial>>,
) { ) {