hut/outfly
hut/outfly
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

generalize with generics

Browse source
This commit is contained in:
yuni 2024-04-05 19:34:01 +02:00
parent d90c2f82a6
commit 4512b63681
2 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/camera.rs
View file

@ -336,35 +336,33 @@ fn apply_input_to_player(
} }
// Find the closest world object that the player is looking at // Find the closest world object that the player is looking at
pub fn find_closest_target( pub fn find_closest_target<TargetSpecifier>(
q_objects: Query<(Entity, &Transform), (With<hud::IsClickable>, Without<hud::IsTargeted>)>, objects: Vec<(TargetSpecifier, &Transform)>,
q_camera: Query<&Transform, With<Camera>>, camera_transform: &Transform,
) -> (Option<Entity>, f32) ) -> (Option<TargetSpecifier>, f32)
{ {
let mut closest_entity: Option<Entity> = None; let mut closest_entity: Option<TargetSpecifier> = None;
let mut closest_distance: f32 = f32::MAX; let mut closest_distance: f32 = f32::MAX;
if let Ok(camtrans) = q_camera.get_single() { let target_vector = (camera_transform.rotation * Vec3::new(0.0, 0.0, -1.0))
let target_vector = (camtrans.rotation * Vec3::new(0.0, 0.0, -1.0))
.normalize_or_zero(); .normalize_or_zero();
let field_of_view = 20.0f32.to_radians(); let field_of_view = 20.0f32.to_radians();
let max_angle = field_of_view / 2.0; let max_angle = field_of_view / 2.0;
for (entity, trans) in &q_objects { for (entity, trans) in objects {
// Use Transform instead of Position because we're basing this // Use Transform instead of Position because we're basing this
// not on the player mesh but on the camera, which doesn't have a position. // not on the player mesh but on the camera, which doesn't have a position.
let pos_vector = (trans.translation - camtrans.translation) let pos_vector = (trans.translation - camera_transform.translation)
.normalize_or_zero(); .normalize_or_zero();
let cosine_of_angle = target_vector.dot(pos_vector); let cosine_of_angle = target_vector.dot(pos_vector);
let angle = cosine_of_angle.acos(); let angle = cosine_of_angle.acos();
if angle <= max_angle { if angle <= max_angle {
// It's in the field of view! // It's in the field of view!
//commands.entity(entity).insert(IsTargeted); //commands.entity(entity).insert(IsTargeted);
let distance = trans.translation.distance(camtrans.translation); let distance = trans.translation.distance(camera_transform.translation);
if distance < closest_distance { if distance < closest_distance {
closest_distance = distance; closest_distance = distance;
closest_entity = Some(entity); closest_entity = Some(entity);
} }
} }
} }
}
return (closest_entity, closest_distance); return (closest_entity, closest_distance);
} }

7
src/hud.rs
View file

@ -489,7 +489,7 @@ fn update(
// Target display // Target display
let target: Option<DVec3>; let target: Option<DVec3>;
if let Ok((targetpos, actr)) = q_target.get_single() { if let Ok((targetpos, _actr)) = q_target.get_single() {
target = Some(targetpos.0); target = Some(targetpos.0);
} }
else if q_target.is_empty() { else if q_target.is_empty() {
@ -600,10 +600,13 @@ fn handle_input(
if mouse_input.just_pressed(settings.key_selectobject) { if mouse_input.just_pressed(settings.key_selectobject) {
//ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Switch)); //ew_sfx.send(audio::PlaySfxEvent(audio::Sfx::Switch));
if q_target.is_empty() { if q_target.is_empty() {
if let (Some(entity), _dist) = camera::find_closest_target(q_objects, q_camera) { if let Ok(camtrans) = q_camera.get_single() {
let objects: Vec<(Entity, &Transform)> = q_objects.iter().collect();
if let (Some(entity), _dist) = camera::find_closest_target::<Entity>(objects, camtrans) {
commands.entity(entity).insert(IsTargeted); commands.entity(entity).insert(IsTargeted);
} }
} }
}
else { else {
for entity in &q_target { for entity in &q_target {
commands.entity(entity).remove::<IsTargeted>(); commands.entity(entity).remove::<IsTargeted>();