franklinblanco/bevy_icon_creator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Even more bugs. Sorry :(

Browse Source
This commit is contained in:
Franklin 2024-03-24 16:31:25 +01:00
parent 2a38d63847
commit d2cea7f1ab
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -608,7 +608,7 @@ dependencies = [
[[package]] [[package]]
name = "bevy_icon_creator" name = "bevy_icon_creator"
version = "0.1.6" version = "0.1.7"
dependencies = [ dependencies = [
"bevy", "bevy",
] ]

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "bevy_icon_creator" name = "bevy_icon_creator"
version = "0.1.6" version = "0.1.7"
edition = "2021" edition = "2021"
authors = ["Franklin E. Blanco"] authors = ["Franklin E. Blanco"]
description = "A plugin to automatically create Icons from entities/models in bevy" description = "A plugin to automatically create Icons from entities/models in bevy"

4
src/update.rs
View File

@ -16,7 +16,7 @@ pub fn update_icon_creator_scenes(
mut images: ResMut<Assets<Image>>, mut images: ResMut<Assets<Image>>,
mut created_icons: ResMut<CreatedIcons>, mut created_icons: ResMut<CreatedIcons>,
) { ) {
for (scene_root_entity, scene_marker, mut scene_root_visibility, mut scene_root_marker) in scene_query.iter_mut() { 'a: for (scene_root_entity, scene_marker, mut scene_root_visibility, mut scene_root_marker) in scene_query.iter_mut() {
for (mut scene_camera, in_scene) in scene_camera_query.iter_mut() { for (mut scene_camera, in_scene) in scene_camera_query.iter_mut() {
if scene_marker.0 != in_scene.0 { continue; } if scene_marker.0 != in_scene.0 { continue; }
for (scene_parent_entity, in_scene) in scene_entity_parent_query.iter() { for (scene_parent_entity, in_scene) in scene_entity_parent_query.iter() {
@ -37,6 +37,7 @@ pub fn update_icon_creator_scenes(
scene_camera.target = RenderTarget::Image(camera_target_image_handle); scene_camera.target = RenderTarget::Image(camera_target_image_handle);
} else if scene_root_marker.0 >= MIN_FRAMES_TO_RENDER + entity_getting_icon_marker.extra_frames.unwrap_or(0) { } else if scene_root_marker.0 >= MIN_FRAMES_TO_RENDER + entity_getting_icon_marker.extra_frames.unwrap_or(0) {
commands.entity(scene_root_entity).remove::<SceneOccupiedMarker>(); commands.entity(scene_root_entity).remove::<SceneOccupiedMarker>();
scene_root_marker.0 = 0;
if let Some(mut entity_commands) = commands.get_entity(scene_parent_entity) { // Unoccupy if let Some(mut entity_commands) = commands.get_entity(scene_parent_entity) { // Unoccupy
entity_commands.remove::<SceneOccupiedMarker>(); entity_commands.remove::<SceneOccupiedMarker>();
scene_camera.is_active = false; scene_camera.is_active = false;
@ -44,6 +45,7 @@ pub fn update_icon_creator_scenes(
scene_camera.target = RenderTarget::default(); scene_camera.target = RenderTarget::default();
entity_commands.despawn_descendants(); entity_commands.despawn_descendants();
} }
continue 'a;
} }
} }
scene_root_marker.0 += 1; scene_root_marker.0 += 1;

4
src/utils.rs
View File

@ -9,7 +9,7 @@ pub fn mark_all_children_with_component<T: Bundle + Clone>(
) { ) {
if mark_parent { if mark_parent {
if let Some(mut entity_commands) = commands.get_entity(entity) { if let Some(mut entity_commands) = commands.get_entity(entity) {
entity_commands.insert(bundle.clone()); entity_commands.try_insert(bundle.clone());
} }
} }
mark_all_children_with_component_recursive(commands, entity, children_query, bundle, true); mark_all_children_with_component_recursive(commands, entity, children_query, bundle, true);
@ -29,7 +29,7 @@ fn mark_all_children_with_component_recursive<T: Bundle + Clone>(
} }
if !first_time { if !first_time {
if let Some(mut entity_commands) = commands.get_entity(entity) { if let Some(mut entity_commands) = commands.get_entity(entity) {
entity_commands.insert(bundle); entity_commands.try_insert(bundle);
} }
} }
} }