mirror of
https://github.com/orange-cpp/omath.git
synced 2026-08-08 05:52:07 +00:00
improved radar
This commit is contained in:
@@ -3,6 +3,8 @@
|
||||
//
|
||||
#pragma once
|
||||
#include "omath/linear_algebra/vector3.hpp"
|
||||
#include <functional>
|
||||
#include <optional>
|
||||
#include <type_traits>
|
||||
|
||||
namespace omath::algorithm
|
||||
@@ -10,7 +12,10 @@ namespace omath::algorithm
|
||||
template<class Camera, class FloatingType>
|
||||
requires std::is_floating_point_v<FloatingType>
|
||||
[[nodiscard]]
|
||||
constexpr Vector2<float> world_to_radar(const Camera& camera, const Vector3<FloatingType>& position, const FloatingType scale)
|
||||
constexpr Vector2<float> world_to_radar(
|
||||
const Camera& camera, const Vector3<FloatingType>& position, const FloatingType scale,
|
||||
const std::optional<std::function<FloatingType(const Vector3<FloatingType>&, const Vector3<FloatingType>&)>>
|
||||
calc_distance = std::nullopt)
|
||||
{
|
||||
const auto look_at_angles = camera.calc_look_at_angles(position);
|
||||
const auto current_angles = camera.get_view_angles();
|
||||
@@ -18,25 +23,40 @@ namespace omath::algorithm
|
||||
if consteval
|
||||
{
|
||||
const auto right_yaw = current_angles.yaw
|
||||
- camera.calc_look_at_angles(camera.get_origin() + camera.get_abs_right()).yaw
|
||||
- decltype(current_angles.yaw)::from_degrees(90);
|
||||
const auto sign = right_yaw.cos() < 0 ? -1.f : 1.f;
|
||||
- camera.calc_look_at_angles(camera.get_origin() + camera.get_abs_right()).yaw
|
||||
- decltype(current_angles.yaw)::from_degrees(90);
|
||||
const auto sign = right_yaw.cos() < 0 ? -1.f : 1.f;
|
||||
|
||||
const auto yaw = current_angles.yaw - look_at_angles.yaw - decltype(current_angles.yaw)::from_degrees(90);
|
||||
|
||||
auto distance = FloatingType{0};
|
||||
|
||||
if (calc_distance.has_value())
|
||||
distance = calc_distance.value()(camera.get_origin(), position);
|
||||
else
|
||||
distance = camera.get_origin().distance_to(position);
|
||||
|
||||
return omath::Vector2<float>(static_cast<float>(yaw.cos()) * sign, static_cast<float>(yaw.sin()))
|
||||
* (camera.get_origin().distance_to(position) * scale);
|
||||
* (distance * scale);
|
||||
}
|
||||
static const auto sign = [&camera, ¤t_angles]
|
||||
{
|
||||
const auto right_yaw = current_angles.yaw
|
||||
- camera.calc_look_at_angles(camera.get_origin() + camera.get_abs_right()).yaw
|
||||
- decltype(current_angles.yaw)::from_degrees(90);
|
||||
- camera.calc_look_at_angles(camera.get_origin() + camera.get_abs_right()).yaw
|
||||
- decltype(current_angles.yaw)::from_degrees(90);
|
||||
return right_yaw.cos() < 0 ? -1.f : 1.f;
|
||||
}();
|
||||
|
||||
const auto yaw = current_angles.yaw - look_at_angles.yaw - decltype(current_angles.yaw)::from_degrees(90);
|
||||
|
||||
auto distance = FloatingType{0};
|
||||
|
||||
if (calc_distance.has_value())
|
||||
distance = calc_distance.value()(camera.get_origin(), position);
|
||||
else
|
||||
distance = camera.get_origin().distance_to(position);
|
||||
|
||||
return omath::Vector2<float>(static_cast<float>(yaw.cos()) * sign, static_cast<float>(yaw.sin()))
|
||||
* (camera.get_origin().distance_to(position) * scale);
|
||||
* (distance * scale);
|
||||
}
|
||||
} // namespace omath::algorithm
|
||||
|
||||
Reference in New Issue
Block a user