character hierarchy system param
This commit is contained in:
@@ -4,7 +4,7 @@ mod thrown;
|
||||
|
||||
use crate::{
|
||||
aim::AimTarget,
|
||||
character::ProjectileOrigin,
|
||||
character::CharacterHierarchy,
|
||||
global_observer,
|
||||
heads::ActiveHeads,
|
||||
heads_database::HeadsDatabase,
|
||||
@@ -86,8 +86,7 @@ fn on_trigger_state(
|
||||
mut active_heads: Query<&mut ActiveHeads, With<Player>>,
|
||||
heads_db: Res<HeadsDatabase>,
|
||||
time: Res<Time>,
|
||||
descendants: Query<&Children>,
|
||||
projectile_origin: Query<&GlobalTransform, With<ProjectileOrigin>>,
|
||||
character: CharacterHierarchy,
|
||||
) {
|
||||
if matches!(trigger.event(), TriggerState::Active) {
|
||||
let Ok(mut active_heads) = active_heads.get_single_mut() else {
|
||||
@@ -107,15 +106,13 @@ fn on_trigger_state(
|
||||
return;
|
||||
};
|
||||
|
||||
let Some(transform) = descendants
|
||||
.iter_descendants(player)
|
||||
.find_map(|child| projectile_origin.get(child).ok())
|
||||
let Some(projectile_origin) = character
|
||||
.projectile_origin(player)
|
||||
.map(|origin| origin.translation())
|
||||
else {
|
||||
return;
|
||||
};
|
||||
|
||||
let projectile_origin = transform.translation();
|
||||
|
||||
let Some((rot, dir)) = player_rot.iter().next().map(|t| (t.rotation, t.forward())) else {
|
||||
return;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user