franklinblanco
/
Blender_bevy_components_workflow
mirror of https://github.com/kaosat-dev/Blender_bevy_components_workflow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve global transform initialization

This commit is contained in:
Jan Hohenheim 2024-09-10 10:39:10 +02:00
parent cc4e2d1f07
commit 21142bf846
No known key found for this signature in database
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/blenvy/src/blueprints/spawn_from_blueprints.rs
View File

@ -440,7 +440,12 @@ pub(crate) fn blueprints_check_assets_loading(
pub(crate) fn blueprints_assets_loaded( pub(crate) fn blueprints_assets_loaded(
spawn_placeholders: Query< spawn_placeholders: Query<
(Entity, &BlueprintInfo, Option<&Transform>, Option<&Name>), (
Entity,
&BlueprintInfo,
Option<(&Transform, &GlobalTransform)>,
Option<&Name>,
),
( (
Added<BlueprintAssetsLoaded>, Added<BlueprintAssetsLoaded>,
Without<BlueprintAssetsNotLoaded>, Without<BlueprintAssetsNotLoaded>,
@ -454,7 +459,7 @@ pub(crate) fn blueprints_assets_loaded(
mut commands: Commands, mut commands: Commands,
) { ) {
for (entity, blueprint_info, transform, name) in spawn_placeholders.iter() { for (entity, blueprint_info, maybe_transform, name) in spawn_placeholders.iter() {
/*info!( /*info!(
"BLUEPRINT: all assets loaded, attempting to spawn blueprint SCENE {:?} for entity {:?}, id: {:}, parent:{:?}", "BLUEPRINT: all assets loaded, attempting to spawn blueprint SCENE {:?} for entity {:?}, id: {:}, parent:{:?}",
blueprint_info.name, name, entity, original_parent blueprint_info.name, name, entity, original_parent
@ -485,10 +490,10 @@ pub(crate) fn blueprints_assets_loaded(
let scene = &blueprint_gltf.named_scenes[main_scene_name]; let scene = &blueprint_gltf.named_scenes[main_scene_name];
// transforms are optional, but still deal with them correctly // transforms are optional, but still deal with them correctly
let mut transforms: Transform = Transform::default(); let (transform, global_transform) = match maybe_transform {
if transform.is_some() { Some((transform, global_transform)) => (*transform, *global_transform),
transforms = *transform.unwrap(); None => (Transform::default(), GlobalTransform::default()),
} };
let mut original_children: Vec<Entity> = vec![]; let mut original_children: Vec<Entity> = vec![];
if let Ok(c) = all_children.get(entity) { if let Ok(c) = all_children.get(entity) {
@ -516,7 +521,8 @@ pub(crate) fn blueprints_assets_loaded(
commands.entity(entity).insert(( commands.entity(entity).insert((
SceneBundle { SceneBundle {
scene: scene.clone(), scene: scene.clone(),
transform: transforms, transform,
global_transform,
..Default::default() ..Default::default()
}, },
OriginalChildren(original_children), OriginalChildren(original_children),