mirror of
https://github.com/orange-cpp/omath.git
synced 2026-08-08 14:02:06 +00:00
Compare commits
35 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5b9bc0f3f8 | |||
| ac57e8da9e | |||
| ecc9852cd8 | |||
| 5591eb6f88 | |||
| 4a6d7c458b | |||
| a791ac1a84 | |||
| 56b10d3d9c | |||
| c068e3e0d8 | |||
| 078e00db0d | |||
| b3c8438bf1 | |||
| 335096d0c8 | |||
| 9f4cc99790 | |||
| f2ff761823 | |||
| 4cd5e8f829 | |||
| eac3adba2a | |||
| 4e413d977a | |||
| d4c86dacc7 | |||
| 945f80241c | |||
| 238d6aef4e | |||
| feb26e01c6 | |||
| 2c6d7c2dfa | |||
| fb1ffac240 | |||
| cbe220664f | |||
| 1618a41318 | |||
| 26823609e7 | |||
| 1c89b12d32 | |||
| 176f5b2aa1 | |||
| 78d92a3c0f | |||
| d2ef40e0bd | |||
| d67d956aca | |||
| 5e3bb0e961 | |||
| 11b429d975 | |||
| b4f4917aec | |||
| 9299ea8960 | |||
| 1982185b71 |
@@ -245,72 +245,37 @@ jobs:
|
||||
run: |
|
||||
./out/Debug/unit_tests.exe
|
||||
|
||||
- name: Process Coverage (llvm-profdata & llvm-cov)
|
||||
- name: Process and render coverage
|
||||
if: ${{ matrix.triplet == 'x64-windows' }}
|
||||
shell: pwsh
|
||||
run: |
|
||||
$BUILD_DIR = "cmake-build/build/${{ matrix.preset }}"
|
||||
$EXE_PATH = "./out/Debug/unit_tests.exe"
|
||||
$buildDir = "cmake-build/build/${{ matrix.preset }}"
|
||||
$exePath = "./out/Debug/unit_tests.exe"
|
||||
$profile = "$buildDir/unit_tests.profdata"
|
||||
$htmlDir = "$buildDir/coverage-html"
|
||||
|
||||
# 1. Merge raw profile data (essential step)
|
||||
& "C:/Program Files/LLVM/bin/llvm-profdata.exe" merge `
|
||||
-sparse "$BUILD_DIR/unit_tests.profraw" `
|
||||
-o "$BUILD_DIR/unit_tests.profdata"
|
||||
-sparse "$buildDir/unit_tests.profraw" `
|
||||
-o $profile
|
||||
|
||||
# 2. Export to LCOV format
|
||||
# NOTE: We explicitly ignore vcpkg_installed and system headers
|
||||
& "C:/Program Files/LLVM/bin/llvm-cov.exe" export "$EXE_PATH" `
|
||||
-instr-profile="$BUILD_DIR/unit_tests.profdata" `
|
||||
-format=lcov `
|
||||
-ignore-filename-regex="vcpkg_installed|external|tests" `
|
||||
> "$BUILD_DIR/lcov.info"
|
||||
|
||||
if (Test-Path "$BUILD_DIR/lcov.info") {
|
||||
Write-Host "✅ LCOV info created at $BUILD_DIR/lcov.info"
|
||||
} else {
|
||||
Write-Error "Failed to create LCOV info"
|
||||
exit 1
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
exit $LASTEXITCODE
|
||||
}
|
||||
|
||||
- name: Install LCOV (for genhtml)
|
||||
if: ${{ matrix.triplet == 'x64-windows' }}
|
||||
run: choco install lcov -y
|
||||
& "C:/Program Files/LLVM/bin/llvm-cov.exe" show $exePath `
|
||||
"-instr-profile=$profile" `
|
||||
"-format=html" `
|
||||
"-output-dir=$htmlDir" `
|
||||
"-ignore-filename-regex=vcpkg_installed|external|tests" `
|
||||
"-show-branches=count"
|
||||
|
||||
- name: Generate HTML Report
|
||||
if: ${{ matrix.triplet == 'x64-windows' }}
|
||||
shell: bash
|
||||
run: |
|
||||
BUILD_DIR="cmake-build/build/${{ matrix.preset }}"
|
||||
LCOV_INFO="${BUILD_DIR}/lcov.info"
|
||||
HTML_DIR="${BUILD_DIR}/coverage-html"
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
exit $LASTEXITCODE
|
||||
}
|
||||
|
||||
# Fix paths for genhtml (Perl hates backslashes)
|
||||
sed -i 's|\\|/|g' "${LCOV_INFO}"
|
||||
|
||||
# Locate genhtml provided by 'choco install lcov'
|
||||
# It is typically in ProgramData/chocolatey/lib/lcov/tools/bin
|
||||
GENHTML=$(find /c/ProgramData/chocolatey -name genhtml -print -quit)
|
||||
|
||||
if [ -z "$GENHTML" ]; then
|
||||
echo "Error: genhtml executable not found"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Using genhtml: $GENHTML"
|
||||
mkdir -p "$HTML_DIR"
|
||||
|
||||
# Run genhtml
|
||||
# Added --demangle-cpp if your version supports it, otherwise remove it
|
||||
perl "$GENHTML" \
|
||||
"${LCOV_INFO}" \
|
||||
--output-directory "$HTML_DIR" \
|
||||
--title "OMath Coverage Report" \
|
||||
--legend \
|
||||
--show-details \
|
||||
--branch-coverage \
|
||||
--ignore-errors source
|
||||
|
||||
echo "✅ LCOV HTML report generated at $HTML_DIR"
|
||||
if (-not (Test-Path "$htmlDir/index.html")) {
|
||||
throw "LLVM coverage report was not generated"
|
||||
}
|
||||
|
||||
- name: Upload Coverage (HTML Report)
|
||||
if: ${{ matrix.triplet == 'x64-windows' }}
|
||||
@@ -742,7 +707,11 @@ jobs:
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
cmake --build cmake-build/build/${{ matrix.preset }} --target unit_tests omath
|
||||
if [[ "${{ matrix.msystem }}" == "MINGW32" ]]; then
|
||||
cmake --build cmake-build/build/${{ matrix.preset }} --target unit_tests omath --parallel 1
|
||||
else
|
||||
cmake --build cmake-build/build/${{ matrix.preset }} --target unit_tests omath
|
||||
fi
|
||||
|
||||
- name: Run unit_tests.exe
|
||||
run: |
|
||||
|
||||
+20
-10
@@ -2,11 +2,9 @@
|
||||
// Created by Vlad on 9/17/2025.
|
||||
//
|
||||
#include <benchmark/benchmark.h>
|
||||
|
||||
#include <omath/omath.hpp>
|
||||
using namespace omath;
|
||||
|
||||
|
||||
void mat_float_multiplication_col_major(benchmark::State& state)
|
||||
{
|
||||
using MatType = Mat<128, 128, float, MatStoreType::COLUMN_MAJOR>;
|
||||
@@ -15,9 +13,12 @@ void mat_float_multiplication_col_major(benchmark::State& state)
|
||||
a.set(3.f);
|
||||
b.set(7.f);
|
||||
|
||||
|
||||
for ([[maybe_unused]] const auto _ : state)
|
||||
std::ignore = a * b;
|
||||
{
|
||||
benchmark::DoNotOptimize(a);
|
||||
benchmark::DoNotOptimize(b);
|
||||
benchmark::DoNotOptimize(a * b);
|
||||
}
|
||||
}
|
||||
void mat_float_multiplication_row_major(benchmark::State& state)
|
||||
{
|
||||
@@ -27,9 +28,12 @@ void mat_float_multiplication_row_major(benchmark::State& state)
|
||||
a.set(3.f);
|
||||
b.set(7.f);
|
||||
|
||||
|
||||
for ([[maybe_unused]] const auto _ : state)
|
||||
std::ignore = a * b;
|
||||
{
|
||||
benchmark::DoNotOptimize(a);
|
||||
benchmark::DoNotOptimize(b);
|
||||
benchmark::DoNotOptimize(a * b);
|
||||
}
|
||||
}
|
||||
|
||||
void mat_double_multiplication_row_major(benchmark::State& state)
|
||||
@@ -40,9 +44,12 @@ void mat_double_multiplication_row_major(benchmark::State& state)
|
||||
a.set(3.f);
|
||||
b.set(7.f);
|
||||
|
||||
|
||||
for ([[maybe_unused]] const auto _ : state)
|
||||
std::ignore = a * b;
|
||||
{
|
||||
benchmark::DoNotOptimize(a);
|
||||
benchmark::DoNotOptimize(b);
|
||||
benchmark::DoNotOptimize(a * b);
|
||||
}
|
||||
}
|
||||
|
||||
void mat_double_multiplication_col_major(benchmark::State& state)
|
||||
@@ -53,9 +60,12 @@ void mat_double_multiplication_col_major(benchmark::State& state)
|
||||
a.set(3.f);
|
||||
b.set(7.f);
|
||||
|
||||
|
||||
for ([[maybe_unused]] const auto _ : state)
|
||||
std::ignore = a * b;
|
||||
{
|
||||
benchmark::DoNotOptimize(a);
|
||||
benchmark::DoNotOptimize(b);
|
||||
benchmark::DoNotOptimize(a * b);
|
||||
}
|
||||
}
|
||||
|
||||
BENCHMARK(mat_float_multiplication_col_major)->Iterations(5000);
|
||||
|
||||
@@ -2,22 +2,105 @@
|
||||
// Created by Vlad on 9/18/2025.
|
||||
//
|
||||
#include <benchmark/benchmark.h>
|
||||
#include <omath/omath.hpp>
|
||||
using namespace omath;
|
||||
#include <omath/projectile_prediction/proj_pred_engine_legacy.hpp>
|
||||
|
||||
using namespace omath::projectile_prediction;
|
||||
|
||||
constexpr float simulation_time_step = 1.f / 1000.f;
|
||||
constexpr float hit_distance_tolerance = 5.f;
|
||||
|
||||
void source_engine_projectile_prediction(benchmark::State& state)
|
||||
namespace
|
||||
{
|
||||
constexpr Target<float> target{.m_origin = {100, 0, 90}, .m_velocity = {0, 0, 0}, .m_is_airborne = false};
|
||||
constexpr Projectile<float> projectile = {.m_origin = {3, 2, 1}, .m_launch_speed = 5000.f, .m_gravity_scale = 0.4f};
|
||||
using Engine = omath::projectile_prediction::ProjPredEngineLegacy<>;
|
||||
using Projectile = omath::projectile_prediction::Projectile<float>;
|
||||
using Target = omath::projectile_prediction::Target<float>;
|
||||
|
||||
for ([[maybe_unused]] const auto _: state)
|
||||
std::ignore = ProjPredEngineLegacy<>(400.f, simulation_time_step, 50.f, hit_distance_tolerance)
|
||||
.maybe_calculate_aim_point(projectile, target);
|
||||
}
|
||||
struct PredictionScenario
|
||||
{
|
||||
Projectile projectile;
|
||||
Target target;
|
||||
float gravity;
|
||||
float simulation_time_step;
|
||||
float maximum_simulation_time;
|
||||
float distance_tolerance;
|
||||
bool expects_solution;
|
||||
};
|
||||
|
||||
BENCHMARK(source_engine_projectile_prediction)->Iterations(10'000);
|
||||
void run_prediction_benchmark(benchmark::State& state, const PredictionScenario& scenario)
|
||||
{
|
||||
const Engine engine(scenario.gravity, scenario.simulation_time_step, scenario.maximum_simulation_time,
|
||||
scenario.distance_tolerance);
|
||||
auto projectile = scenario.projectile;
|
||||
auto target = scenario.target;
|
||||
|
||||
if (engine.maybe_calculate_aim_point(projectile, target).has_value() != scenario.expects_solution)
|
||||
{
|
||||
state.SkipWithError("Projectile benchmark scenario returned an unexpected result");
|
||||
return;
|
||||
}
|
||||
|
||||
for ([[maybe_unused]] const auto _ : state)
|
||||
{
|
||||
benchmark::DoNotOptimize(projectile);
|
||||
benchmark::DoNotOptimize(target);
|
||||
auto result = engine.maybe_calculate_aim_point(projectile, target);
|
||||
benchmark::DoNotOptimize(result);
|
||||
}
|
||||
}
|
||||
|
||||
void projectile_prediction_near_static_hit(benchmark::State& state)
|
||||
{
|
||||
constexpr PredictionScenario scenario{
|
||||
.projectile = {.m_origin = {3.f, 2.f, 1.f}, .m_launch_speed = 5000.f, .m_gravity_scale = 0.4f},
|
||||
.target = {.m_origin = {100.f, 0.f, 90.f}, .m_velocity = {0.f, 0.f, 0.f}, .m_is_airborne = false},
|
||||
.gravity = 400.f,
|
||||
.simulation_time_step = 1.f / 1000.f,
|
||||
.maximum_simulation_time = 50.f,
|
||||
.distance_tolerance = 5.f,
|
||||
.expects_solution = true,
|
||||
};
|
||||
run_prediction_benchmark(state, scenario);
|
||||
}
|
||||
|
||||
void projectile_prediction_moving_hit(benchmark::State& state)
|
||||
{
|
||||
constexpr PredictionScenario scenario{
|
||||
.projectile = {.m_origin = {0.f, 0.f, 0.f}, .m_launch_speed = 3000.f, .m_gravity_scale = 1.f},
|
||||
.target = {.m_origin = {500.f, 100.f, 0.f}, .m_velocity = {-50.f, 20.f, 0.f}, .m_is_airborne = false},
|
||||
.gravity = 800.f,
|
||||
.simulation_time_step = 1.f / 500.f,
|
||||
.maximum_simulation_time = 30.f,
|
||||
.distance_tolerance = 10.f,
|
||||
.expects_solution = true,
|
||||
};
|
||||
run_prediction_benchmark(state, scenario);
|
||||
}
|
||||
|
||||
void projectile_prediction_unreachable_full_scan(benchmark::State& state)
|
||||
{
|
||||
constexpr PredictionScenario scenario{
|
||||
.projectile = {.m_origin = {0.f, 0.f, 0.f}, .m_launch_speed = 1.f, .m_gravity_scale = 1.f},
|
||||
.target = {.m_origin = {100'000.f, 0.f, 0.f}, .m_velocity = {0.f, 0.f, 0.f}, .m_is_airborne = false},
|
||||
.gravity = 9.81f,
|
||||
.simulation_time_step = 1.f / 1000.f,
|
||||
.maximum_simulation_time = 2.f,
|
||||
.distance_tolerance = 5.f,
|
||||
.expects_solution = false,
|
||||
};
|
||||
run_prediction_benchmark(state, scenario);
|
||||
}
|
||||
|
||||
void projectile_prediction_receding_full_scan(benchmark::State& state)
|
||||
{
|
||||
constexpr PredictionScenario scenario{
|
||||
.projectile = {.m_origin = {0.f, 0.f, 0.f}, .m_launch_speed = 100.f, .m_gravity_scale = 0.f},
|
||||
.target = {.m_origin = {100.f, 0.f, 0.f}, .m_velocity = {200.f, 0.f, 0.f}, .m_is_airborne = false},
|
||||
.gravity = 9.81f,
|
||||
.simulation_time_step = 1.f / 1000.f,
|
||||
.maximum_simulation_time = 2.f,
|
||||
.distance_tolerance = 0.01f,
|
||||
.expects_solution = false,
|
||||
};
|
||||
run_prediction_benchmark(state, scenario);
|
||||
}
|
||||
} // namespace
|
||||
|
||||
BENCHMARK(projectile_prediction_near_static_hit);
|
||||
BENCHMARK(projectile_prediction_moving_hit);
|
||||
BENCHMARK(projectile_prediction_unreachable_full_scan);
|
||||
BENCHMARK(projectile_prediction_receding_full_scan);
|
||||
|
||||
@@ -6,6 +6,17 @@ if (@OMATH_IMGUI_INTEGRATION@)
|
||||
find_dependency(imgui CONFIG)
|
||||
endif()
|
||||
|
||||
if (@OMATH_ENABLE_LUA@)
|
||||
find_dependency(Lua)
|
||||
endif()
|
||||
|
||||
if (@OMATH_ENABLE_HOOKING@)
|
||||
find_dependency(safetyhook CONFIG)
|
||||
if (NOT WIN32 AND (UNIX AND NOT APPLE))
|
||||
find_dependency(OpenGL)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Load the targets for the omath library
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/omathTargets.cmake")
|
||||
check_required_components(omath)
|
||||
|
||||
+12
-10
@@ -3,8 +3,8 @@
|
||||
> Header: `omath/trigonometry/angle.hpp`
|
||||
> Namespace: `omath`
|
||||
> Template: `Angle<Type = float, min = 0, max = 360, flags = AngleFlags::Normalized>`
|
||||
> Requires: `std::is_arithmetic_v<Type>`
|
||||
> Formatters: `std::formatter` for `char`, `wchar_t`, `char8_t` → `"{}deg"`
|
||||
> Requires: `std::is_floating_point_v<Type>`
|
||||
> Formatters: `std::formatter` for `char` and `wchar_t` → `"{}deg"`
|
||||
|
||||
---
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
Two behaviors via `AngleFlags`:
|
||||
|
||||
* `AngleFlags::Normalized` (default): values are wrapped into `[min, max]` using `angles::wrap_angle`.
|
||||
* `AngleFlags::Normalized` (default): values are wrapped into `[min, max)` using `angles::wrap_angle`.
|
||||
* `AngleFlags::Clamped`: values are clamped to `[min, max]` using `std::clamp`.
|
||||
|
||||
---
|
||||
@@ -28,12 +28,16 @@ enum class AngleFlags { Normalized = 0, Clamped = 1 };
|
||||
|
||||
template<class Type = float, Type min = Type(0), Type max = Type(360),
|
||||
AngleFlags flags = AngleFlags::Normalized>
|
||||
requires std::is_arithmetic_v<Type>
|
||||
requires std::is_floating_point_v<Type>
|
||||
class Angle {
|
||||
public:
|
||||
// Construction
|
||||
static constexpr Angle from_degrees(const Type& deg) noexcept;
|
||||
static constexpr Angle from_radians(const Type& rad) noexcept;
|
||||
static constexpr Angle from_asin(const Type& value) noexcept;
|
||||
static constexpr Angle from_acos(const Type& value) noexcept;
|
||||
static constexpr Angle from_atan(const Type& value) noexcept;
|
||||
static constexpr Angle from_atan2(const Type& y, const Type& x) noexcept;
|
||||
constexpr Angle() noexcept; // 0 deg, adjusted by flags/range
|
||||
|
||||
// Accessors / conversions (degrees stored internally)
|
||||
@@ -45,10 +49,9 @@ public:
|
||||
Type sin() const noexcept;
|
||||
Type cos() const noexcept;
|
||||
Type tan() const noexcept;
|
||||
Type atan() const noexcept; // atan(as_radians()) (rarely used)
|
||||
Type cot() const noexcept; // cos()/sin() (watch sin≈0)
|
||||
|
||||
// Arithmetic (wraps or clamps per flags and [min,max])
|
||||
// Arithmetic (wraps or clamps per flags and configured range)
|
||||
constexpr Angle& operator+=(const Angle&) noexcept;
|
||||
constexpr Angle& operator-=(const Angle&) noexcept;
|
||||
constexpr Angle operator+(const Angle&) noexcept;
|
||||
@@ -68,7 +71,7 @@ public:
|
||||
std::format("{}", Angle<float>::from_degrees(45)); // "45deg"
|
||||
```
|
||||
|
||||
Formatters exist for `char`, `wchar_t`, and `char8_t`.
|
||||
Formatters exist for `char` and `wchar_t`.
|
||||
|
||||
---
|
||||
|
||||
@@ -116,10 +119,9 @@ float deg = *yaw; // same as yaw.as_degrees()
|
||||
## Semantics & notes
|
||||
|
||||
* **Storage & units:** Internally stores **degrees** (`Type m_angle`). `as_radians()`/`from_radians()` use the project helpers in `omath::angles`.
|
||||
* **Arithmetic honors policy:** `operator+=`/`-=` and the binary `+`/`-` apply **wrap** or **clamp** in `[min,max]`, mirroring construction behavior.
|
||||
* **`atan()`**: returns `std::atan(as_radians())` (the arctangent of the *radian value*). This is mathematically unusual for an angle type and is rarely useful; prefer `tan()`/`atan2` in client code when solving geometry problems.
|
||||
* **Arithmetic honors policy:** `operator+=`/`-=` and the binary `+`/`-` apply **wrap** or **clamp**, mirroring construction behavior.
|
||||
* **`cot()` / `tan()` singularities:** Near multiples where `sin() ≈ 0` or `cos() ≈ 0`, results blow up. Guard in your usage if inputs can approach these points.
|
||||
* **Comparison:** `operator<=>` is defaulted. With normalization, distinct representatives can compare as expected (e.g., `-180` vs `180` in signed ranges are distinct endpoints).
|
||||
* **Comparison:** `operator<=>` is defaulted. Normalization canonicalizes the maximum endpoint to the minimum endpoint.
|
||||
* **No implicit numeric conversion:** There’s **no `operator Type()`**. Use `as_degrees()`/`as_radians()` (or `*angle`) explicitly—this intentional friction avoids unit mistakes.
|
||||
|
||||
---
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
> Namespace: `omath::angles`
|
||||
> All functions are `[[nodiscard]]` and `noexcept` where applicable.
|
||||
|
||||
A small set of constexpr-friendly utilities for converting between degrees/radians, converting horizontal/vertical field of view, and wrapping angles into a closed interval.
|
||||
A small set of constexpr-friendly utilities for converting between degrees/radians, converting horizontal/vertical field of view, and wrapping angles into a half-open interval.
|
||||
|
||||
---
|
||||
|
||||
@@ -29,9 +29,9 @@ template<class Type>
|
||||
requires std::is_floating_point_v<Type>
|
||||
Type vertical_fov_to_horizontal(const Type& vertical_fov, const Type& aspect) noexcept;
|
||||
|
||||
// Wrap angle into [min, max] (any arithmetic type)
|
||||
// Wrap angle into [min, max) (floating-point types)
|
||||
template<class Type>
|
||||
requires std::is_arithmetic_v<Type>
|
||||
requires std::is_floating_point_v<Type>
|
||||
Type wrap_angle(const Type& angle, const Type& min, const Type& max) noexcept;
|
||||
```
|
||||
|
||||
@@ -66,10 +66,10 @@ Formulas (in radians):
|
||||
|
||||
### Wrapping angles (or any periodic value)
|
||||
|
||||
Wrap any numeric `angle` into `[min, max]`:
|
||||
Wrap any floating-point `angle` into `[min, max)`:
|
||||
|
||||
```cpp
|
||||
// Wrap degrees into [0, 360]
|
||||
// Wrap degrees into [0, 360)
|
||||
float a = omath::angles::wrap_angle( 370.0f, 0.0f, 360.0f); // 10
|
||||
float b = omath::angles::wrap_angle( -15.0f, 0.0f, 360.0f); // 345
|
||||
// Signed range [-180,180]
|
||||
@@ -83,10 +83,10 @@ float c = omath::angles::wrap_angle( 200.0f, -180.0f, 180.0f); // -160
|
||||
* **Type requirements**
|
||||
|
||||
* Converters & FOV helpers require **floating-point** `Type`.
|
||||
* `wrap_angle` accepts any arithmetic `Type` (floats or integers).
|
||||
* `wrap_angle` accepts floating-point types.
|
||||
* **Aspect ratio** must be **positive** and finite. For `aspect == 0` the FOV helpers are undefined.
|
||||
* **Units**: FOV functions accept/return **degrees** but compute internally in radians.
|
||||
* **Wrapping interval**: Behavior assumes `max > min`. The result lies in the **closed interval** `[min, max]` with modulo arithmetic; if you need half-open behavior (e.g., `[min,max)`), adjust your range or post-process endpoint cases.
|
||||
* **Wrapping interval**: Behavior assumes `max > min`. The result lies in the half-open interval `[min, max)`.
|
||||
* **constexpr**: Converters are `constexpr`; FOV helpers are runtime constexpr-compatible except for `std::atan/std::tan` constraints on some standard libraries.
|
||||
|
||||
---
|
||||
@@ -103,5 +103,5 @@ float v = horizontal_fov_to_vertical(90.0f, 16.0f/9.0f);
|
||||
float h = vertical_fov_to_horizontal(v, 16.0f/9.0f);
|
||||
assert(std::abs(h - 90.0f) < 1e-5f);
|
||||
|
||||
assert(wrap_angle(360.0f, 0.0f, 360.0f) == 0.0f || wrap_angle(360.0f, 0.0f, 360.0f) == 360.0f);
|
||||
assert(wrap_angle(360.0f, 0.0f, 360.0f) == 0.0f);
|
||||
```
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
#include <imgui.h>
|
||||
#include <imgui_impl_dx11.h>
|
||||
#include <imgui_impl_win32.h>
|
||||
#include <thread>
|
||||
#include <tuple>
|
||||
|
||||
extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND, UINT, WPARAM, LPARAM);
|
||||
|
||||
@@ -17,13 +19,35 @@ namespace
|
||||
ID3D11DeviceContext* g_context = nullptr;
|
||||
ID3D11RenderTargetView* g_render_target_view = nullptr;
|
||||
|
||||
void create_render_target(IDXGISwapChain* swap_chain)
|
||||
[[nodiscard]]
|
||||
bool create_render_target(IDXGISwapChain* swap_chain)
|
||||
{
|
||||
ID3D11Texture2D* back_buffer = nullptr;
|
||||
if (FAILED(swap_chain->GetBuffer(0, IID_PPV_ARGS(&back_buffer))))
|
||||
return;
|
||||
g_device->CreateRenderTargetView(back_buffer, nullptr, &g_render_target_view);
|
||||
return false;
|
||||
|
||||
D3D11_RENDER_TARGET_VIEW_DESC desc{};
|
||||
desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMS;
|
||||
desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
|
||||
|
||||
const HRESULT result = g_device->CreateRenderTargetView(back_buffer, &desc, &g_render_target_view);
|
||||
back_buffer->Release();
|
||||
return SUCCEEDED(result);
|
||||
}
|
||||
|
||||
void release_render_target()
|
||||
{
|
||||
if (g_context)
|
||||
g_context->OMSetRenderTargets(0, nullptr, nullptr);
|
||||
|
||||
if (g_render_target_view)
|
||||
{
|
||||
g_render_target_view->Release();
|
||||
g_render_target_view = nullptr;
|
||||
}
|
||||
|
||||
if (g_context)
|
||||
g_context->Flush();
|
||||
}
|
||||
|
||||
void init(IDXGISwapChain* swap_chain)
|
||||
@@ -36,9 +60,9 @@ namespace
|
||||
g_device->GetImmediateContext(&g_context);
|
||||
|
||||
DXGI_SWAP_CHAIN_DESC desc{};
|
||||
swap_chain->GetDesc(&desc);
|
||||
std::ignore = swap_chain->GetDesc(&desc);
|
||||
|
||||
create_render_target(swap_chain);
|
||||
std::ignore = create_render_target(swap_chain);
|
||||
|
||||
ImGui::CreateContext();
|
||||
ImGui::StyleColorsDark();
|
||||
@@ -51,7 +75,7 @@ namespace
|
||||
|
||||
auto& mgr = omath::hooks::HooksManager::get();
|
||||
mgr.set_on_wnd_proc(
|
||||
[](HWND h, UINT msg, WPARAM wp, LPARAM lp) -> std::optional<LRESULT>
|
||||
[](const HWND h, const UINT msg, const WPARAM wp, const LPARAM lp) -> std::optional<LRESULT>
|
||||
{
|
||||
if (ImGui_ImplWin32_WndProcHandler(h, msg, wp, lp))
|
||||
return 0;
|
||||
@@ -71,44 +95,49 @@ namespace
|
||||
return;
|
||||
}
|
||||
|
||||
if (!g_render_target_view)
|
||||
create_render_target(swap_chain);
|
||||
if (!g_render_target_view && !create_render_target(swap_chain))
|
||||
return;
|
||||
|
||||
ID3D11RenderTargetView* previous_render_target_views[D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT]{};
|
||||
ID3D11DepthStencilView* previous_depth_stencil_view = nullptr;
|
||||
g_context->OMGetRenderTargets(D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, previous_render_target_views,
|
||||
&previous_depth_stencil_view);
|
||||
|
||||
g_context->OMSetRenderTargets(1, &g_render_target_view, nullptr);
|
||||
|
||||
ImGui_ImplDX11_NewFrame();
|
||||
ImGui_ImplWin32_NewFrame();
|
||||
ImGui::NewFrame();
|
||||
|
||||
ImGui::SetNextWindowSize({300.f, 80.f}, ImGuiCond_Once);
|
||||
ImGui::SetNextWindowPos({10.f, 10.f}, ImGuiCond_Once);
|
||||
ImGui::Begin("omath | DX11 hook");
|
||||
ImGui::Text("Hook active");
|
||||
ImGui::Text("FPS: %.1f", ImGui::GetIO().Framerate);
|
||||
ImGui::End();
|
||||
ImGui::GetIO().MouseDrawCursor = true;
|
||||
ImGui::ShowDemoWindow();
|
||||
|
||||
ImGui::Render();
|
||||
ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData());
|
||||
|
||||
g_context->OMSetRenderTargets(D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, previous_render_target_views,
|
||||
previous_depth_stencil_view);
|
||||
for (ID3D11RenderTargetView* render_target_view : previous_render_target_views)
|
||||
{
|
||||
if (render_target_view)
|
||||
render_target_view->Release();
|
||||
}
|
||||
if (previous_depth_stencil_view)
|
||||
previous_depth_stencil_view->Release();
|
||||
}
|
||||
|
||||
void on_resize_buffers(IDXGISwapChain*, UINT, UINT, UINT, DXGI_FORMAT, UINT)
|
||||
{
|
||||
if (g_render_target_view)
|
||||
{
|
||||
g_render_target_view->Release();
|
||||
g_render_target_view = nullptr;
|
||||
}
|
||||
release_render_target();
|
||||
}
|
||||
} // namespace
|
||||
|
||||
BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
|
||||
BOOL WINAPI DllMain(const HINSTANCE h_instance, const DWORD reason, LPVOID)
|
||||
{
|
||||
if (reason == DLL_PROCESS_ATTACH)
|
||||
{
|
||||
DisableThreadLibraryCalls(h_instance);
|
||||
CreateThread(
|
||||
nullptr, 0,
|
||||
[](LPVOID) -> DWORD
|
||||
std::thread(
|
||||
[]()
|
||||
{
|
||||
while (!GetModuleHandle("d3d11.dll"))
|
||||
Sleep(100);
|
||||
@@ -116,10 +145,10 @@ BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
|
||||
auto& mgr = omath::hooks::HooksManager::get();
|
||||
mgr.set_on_present(on_present);
|
||||
mgr.set_on_resize_buffers(on_resize_buffers);
|
||||
mgr.hook_dx11();
|
||||
std::ignore = mgr.hook_dx11();
|
||||
return 0;
|
||||
},
|
||||
nullptr, 0, nullptr);
|
||||
})
|
||||
.detach();
|
||||
}
|
||||
else if (reason == DLL_PROCESS_DETACH)
|
||||
{
|
||||
@@ -134,11 +163,7 @@ BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
|
||||
ImGui::DestroyContext();
|
||||
}
|
||||
|
||||
if (g_render_target_view)
|
||||
{
|
||||
g_render_target_view->Release();
|
||||
g_render_target_view = nullptr;
|
||||
}
|
||||
release_render_target();
|
||||
if (g_context)
|
||||
{
|
||||
g_context->Release();
|
||||
|
||||
@@ -449,9 +449,8 @@ BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
|
||||
if (reason == DLL_PROCESS_ATTACH)
|
||||
{
|
||||
DisableThreadLibraryCalls(h_instance);
|
||||
CreateThread(
|
||||
nullptr, 0,
|
||||
[](LPVOID) -> DWORD
|
||||
std::thread(
|
||||
[]()
|
||||
{
|
||||
while (!GetModuleHandle("d3d12.dll"))
|
||||
Sleep(100);
|
||||
@@ -462,8 +461,8 @@ BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
|
||||
mgr.set_on_execute_command_lists(on_execute_command_lists);
|
||||
std::ignore = mgr.hook_dx12();
|
||||
return 0;
|
||||
},
|
||||
nullptr, 0, nullptr);
|
||||
})
|
||||
.detach();
|
||||
}
|
||||
else if (reason == DLL_PROCESS_DETACH)
|
||||
{
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
#include "omath/hooks/hooks_manager.hpp"
|
||||
#include <Windows.h>
|
||||
#include <d3d9.h>
|
||||
#include <imgui.h>
|
||||
#include <imgui_impl_dx9.h>
|
||||
#include <imgui_impl_win32.h>
|
||||
|
||||
#include "omath/hooks/hooks_manager.hpp"
|
||||
|
||||
extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND, UINT, WPARAM, LPARAM);
|
||||
|
||||
namespace
|
||||
{
|
||||
bool g_initialized = false;
|
||||
bool g_initialized = false;
|
||||
bool g_init_attempted = false;
|
||||
|
||||
void init(IDirect3DDevice9* device)
|
||||
@@ -31,12 +30,14 @@ namespace
|
||||
ImGui_ImplDX9_Init(device);
|
||||
|
||||
auto& mgr = omath::hooks::HooksManager::get();
|
||||
mgr.set_on_wnd_proc([](HWND h, UINT msg, WPARAM wp, LPARAM lp) -> std::optional<LRESULT> {
|
||||
if (ImGui_ImplWin32_WndProcHandler(h, msg, wp, lp))
|
||||
return 0;
|
||||
return std::nullopt;
|
||||
});
|
||||
mgr.hook_wnd_proc(params.hFocusWindow);
|
||||
mgr.set_on_wnd_proc(
|
||||
[](HWND h, UINT msg, WPARAM wp, LPARAM lp) -> std::optional<LRESULT>
|
||||
{
|
||||
if (ImGui_ImplWin32_WndProcHandler(h, msg, wp, lp))
|
||||
return 0;
|
||||
return std::nullopt;
|
||||
});
|
||||
std::ignore = mgr.hook_wnd_proc(params.hFocusWindow);
|
||||
|
||||
g_initialized = true;
|
||||
}
|
||||
@@ -54,11 +55,8 @@ namespace
|
||||
ImGui_ImplWin32_NewFrame();
|
||||
ImGui::NewFrame();
|
||||
|
||||
ImGui::SetNextWindowSize({300.f, 80.f}, ImGuiCond_Once);
|
||||
ImGui::SetNextWindowPos({10.f, 10.f}, ImGuiCond_Once);
|
||||
ImGui::Begin("omath | DX9 hook");
|
||||
ImGui::Text("Hook active");
|
||||
ImGui::Text("FPS: %.1f", ImGui::GetIO().Framerate);
|
||||
ImGui::GetIO().MouseDrawCursor = true;
|
||||
ImGui::ShowDemoWindow();
|
||||
ImGui::End();
|
||||
|
||||
ImGui::EndFrame();
|
||||
@@ -78,17 +76,19 @@ BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
|
||||
if (reason == DLL_PROCESS_ATTACH)
|
||||
{
|
||||
DisableThreadLibraryCalls(h_instance);
|
||||
CreateThread(nullptr, 0, [](LPVOID) -> DWORD
|
||||
{
|
||||
while (!GetModuleHandle("d3d9.dll"))
|
||||
Sleep(100);
|
||||
std::thread(
|
||||
[]()
|
||||
{
|
||||
while (!GetModuleHandle("d3d9.dll"))
|
||||
Sleep(100);
|
||||
|
||||
auto& mgr = omath::hooks::HooksManager::get();
|
||||
mgr.set_on_dx9_present(on_present);
|
||||
mgr.set_on_dx9_reset(on_reset);
|
||||
mgr.hook_dx9();
|
||||
return 0;
|
||||
}, nullptr, 0, nullptr);
|
||||
auto& mgr = omath::hooks::HooksManager::get();
|
||||
mgr.set_on_dx9_present(on_present);
|
||||
mgr.set_on_dx9_reset(on_reset);
|
||||
std::ignore = mgr.hook_dx9();
|
||||
return 0;
|
||||
})
|
||||
.detach();
|
||||
}
|
||||
else if (reason == DLL_PROCESS_DETACH)
|
||||
{
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
#include "main_window.hpp"
|
||||
#include "omath/hud/renderer_realizations/imgui_renderer.hpp"
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <cmath>
|
||||
#include <imgui.h>
|
||||
#include <imgui_impl_glfw.h>
|
||||
#include <imgui_impl_opengl3.h>
|
||||
@@ -65,6 +66,19 @@ namespace imgui_desktop::gui
|
||||
ImGui::Begin("Controls", &m_opened,
|
||||
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);
|
||||
ImGui::PushItemWidth(160.f);
|
||||
const auto draw_glow_controls = [](const char* label, GlowSettings& settings)
|
||||
{
|
||||
ImGui::PushID(label);
|
||||
ImGui::TextUnformatted(label);
|
||||
ImGui::Checkbox("Glow", &settings.enabled);
|
||||
if (settings.enabled)
|
||||
{
|
||||
ImGui::ColorEdit4("Color", reinterpret_cast<float*>(&settings.color), ImGuiColorEditFlags_NoInputs);
|
||||
ImGui::InputFloat("Radius", &settings.radius);
|
||||
ImGui::InputFloat("Intensity", &settings.intensity);
|
||||
}
|
||||
ImGui::PopID();
|
||||
};
|
||||
|
||||
if (ImGui::CollapsingHeader("Entity", ImGuiTreeNodeFlags_DefaultOpen))
|
||||
{
|
||||
@@ -72,6 +86,12 @@ namespace imgui_desktop::gui
|
||||
ImGui::SliderFloat("Top Y", &m_entity_top_y, 20.f, m_entity_bottom_y - 20.f);
|
||||
ImGui::SliderFloat("Bottom Y", &m_entity_bottom_y, m_entity_top_y + 20.f, vp->Size.y - 20.f);
|
||||
ImGui::SliderFloat("Aspect", &m_entity_aspect, 1.f, 10.f);
|
||||
draw_glow_controls("Canvas light", m_canvas_glow);
|
||||
if (m_canvas_glow.enabled)
|
||||
{
|
||||
ImGui::InputInt("Blur layers##canvas", &m_canvas_glow_layers);
|
||||
ImGui::InputFloat("Rounding##canvas", &m_canvas_glow_rounding);
|
||||
}
|
||||
}
|
||||
|
||||
if (ImGui::CollapsingHeader("Box", ImGuiTreeNodeFlags_DefaultOpen))
|
||||
@@ -83,9 +103,20 @@ namespace imgui_desktop::gui
|
||||
ImGui::Checkbox("Dashed", &m_show_dashed_box);
|
||||
ImGui::ColorEdit4("Color##box", reinterpret_cast<float*>(&m_box_color), ImGuiColorEditFlags_NoInputs);
|
||||
ImGui::ColorEdit4("Fill##box", reinterpret_cast<float*>(&m_box_fill), ImGuiColorEditFlags_NoInputs);
|
||||
ImGui::Checkbox("Gradient fill", &m_gradient_box_fill);
|
||||
ImGui::Checkbox("Animate gradients", &m_animate_gradients);
|
||||
if (m_gradient_box_fill)
|
||||
{
|
||||
ImGui::ColorEdit4("Gradient top##box", reinterpret_cast<float*>(&m_box_gradient_top),
|
||||
ImGuiColorEditFlags_NoInputs);
|
||||
ImGui::ColorEdit4("Gradient bottom##box", reinterpret_cast<float*>(&m_box_gradient_bottom),
|
||||
ImGuiColorEditFlags_NoInputs);
|
||||
}
|
||||
ImGui::ColorEdit4("Outline##box", reinterpret_cast<float*>(&m_box_outline), ImGuiColorEditFlags_NoInputs);
|
||||
ImGui::SliderFloat("Thickness", &m_box_thickness, 0.5f, 5.f);
|
||||
ImGui::SliderFloat("Corner ratio", &m_corner_ratio, 0.05f, 0.5f);
|
||||
draw_glow_controls("Box glow", m_box_glow);
|
||||
draw_glow_controls("Cornered box glow", m_cornered_box_glow);
|
||||
ImGui::Separator();
|
||||
ImGui::ColorEdit4("Dash color", reinterpret_cast<float*>(&m_dash_color), ImGuiColorEditFlags_NoInputs);
|
||||
ImGui::SliderFloat("Dash length", &m_dash_len, 2.f, 30.f);
|
||||
@@ -99,6 +130,7 @@ namespace imgui_desktop::gui
|
||||
ImGui::ColorEdit4("BG##bar", reinterpret_cast<float*>(&m_bar_bg_color), ImGuiColorEditFlags_NoInputs);
|
||||
ImGui::ColorEdit4("Outline##bar", reinterpret_cast<float*>(&m_bar_outline_color),
|
||||
ImGuiColorEditFlags_NoInputs);
|
||||
ImGui::Checkbox("Gradient bars", &m_gradient_bars);
|
||||
ImGui::SliderFloat("Width##bar", &m_bar_width, 1.f, 20.f);
|
||||
ImGui::SliderFloat("Value##bar", &m_bar_value, 0.f, 1.f);
|
||||
ImGui::SliderFloat("Offset##bar", &m_bar_offset, 1.f, 20.f);
|
||||
@@ -116,11 +148,26 @@ namespace imgui_desktop::gui
|
||||
ImGui::Checkbox("Bot dashed##bar", &m_show_bottom_dashed_bar);
|
||||
ImGui::SliderFloat("Dash len##bar", &m_bar_dash_len, 2.f, 20.f);
|
||||
ImGui::SliderFloat("Dash gap##bar", &m_bar_dash_gap, 1.f, 15.f);
|
||||
draw_glow_controls("Bar glow", m_bar_glow);
|
||||
}
|
||||
|
||||
if (ImGui::CollapsingHeader("Labels", ImGuiTreeNodeFlags_DefaultOpen))
|
||||
{
|
||||
ImGui::Checkbox("Outlined", &m_outlined);
|
||||
ImGui::Checkbox("Gradient centered label", &m_gradient_label);
|
||||
if (m_gradient_label)
|
||||
{
|
||||
ImGui::ColorEdit4("Gradient left##lbl", reinterpret_cast<float*>(&m_label_gradient_left),
|
||||
ImGuiColorEditFlags_NoInputs);
|
||||
ImGui::ColorEdit4("Gradient right##lbl", reinterpret_cast<float*>(&m_label_gradient_right),
|
||||
ImGuiColorEditFlags_NoInputs);
|
||||
if (m_animate_gradients)
|
||||
{
|
||||
int direction = static_cast<int>(m_label_gradient_direction);
|
||||
if (ImGui::Combo("Direction##lbl", &direction, "Right to left\0Left to right\0"))
|
||||
m_label_gradient_direction = static_cast<omath::hud::GradientDirection>(direction);
|
||||
}
|
||||
}
|
||||
ImGui::SliderFloat("Offset##lbl", &m_label_offset, 0.f, 15.f);
|
||||
ImGui::Checkbox("Right##lbl", &m_show_right_labels);
|
||||
ImGui::SameLine();
|
||||
@@ -131,6 +178,7 @@ namespace imgui_desktop::gui
|
||||
ImGui::Checkbox("Ctr top##lbl", &m_show_centered_top);
|
||||
ImGui::SameLine();
|
||||
ImGui::Checkbox("Ctr bot##lbl", &m_show_centered_bottom);
|
||||
draw_glow_controls("Label glow", m_label_glow);
|
||||
}
|
||||
|
||||
if (ImGui::CollapsingHeader("Skeleton"))
|
||||
@@ -193,9 +241,83 @@ namespace imgui_desktop::gui
|
||||
using namespace omath::hud::widget;
|
||||
using omath::hud::when;
|
||||
const auto* vp = ImGui::GetMainViewport();
|
||||
const Bar bar{m_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, m_bar_value, m_bar_offset};
|
||||
const DashedBar dbar{m_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width,
|
||||
m_bar_value, m_bar_dash_len, m_bar_dash_gap, m_bar_offset};
|
||||
const float entity_height = m_entity_bottom_y - m_entity_top_y;
|
||||
const float entity_half_width = entity_height / m_entity_aspect;
|
||||
const auto joint = [&](const float x, const float y)
|
||||
{
|
||||
return omath::Vector2<float>{m_entity_x + (x * 2.f - 1.f) * entity_half_width,
|
||||
m_entity_top_y + y * entity_height};
|
||||
};
|
||||
const auto head = joint(0.5f, 0.1f);
|
||||
const auto neck = joint(0.5f, 0.22f);
|
||||
const auto torso = joint(0.5f, 0.5f);
|
||||
const auto left_shoulder = joint(0.3f, 0.25f);
|
||||
const auto right_shoulder = joint(0.7f, 0.25f);
|
||||
const auto left_elbow = joint(0.18f, 0.42f);
|
||||
const auto right_elbow = joint(0.82f, 0.42f);
|
||||
const auto left_hand = joint(0.1f, 0.58f);
|
||||
const auto right_hand = joint(0.9f, 0.58f);
|
||||
const auto left_hip = joint(0.4f, 0.55f);
|
||||
const auto right_hip = joint(0.6f, 0.55f);
|
||||
const auto left_knee = joint(0.36f, 0.75f);
|
||||
const auto right_knee = joint(0.64f, 0.75f);
|
||||
const auto left_foot = joint(0.3f, 0.95f);
|
||||
const auto right_foot = joint(0.7f, 0.95f);
|
||||
const std::array skeleton_bones = {
|
||||
Bone{head, neck},
|
||||
Bone{neck, torso},
|
||||
Bone{neck, left_shoulder},
|
||||
Bone{left_shoulder, left_elbow},
|
||||
Bone{left_elbow, left_hand},
|
||||
Bone{neck, right_shoulder},
|
||||
Bone{right_shoulder, right_elbow},
|
||||
Bone{right_elbow, right_hand},
|
||||
Bone{torso, left_hip},
|
||||
Bone{left_hip, left_knee},
|
||||
Bone{left_knee, left_foot},
|
||||
Bone{torso, right_hip},
|
||||
Bone{right_hip, right_knee},
|
||||
Bone{right_knee, right_foot},
|
||||
};
|
||||
const auto animated_color = [&](const omath::Color& color, const float hue_offset)
|
||||
{
|
||||
if (!m_animate_gradients)
|
||||
return color;
|
||||
|
||||
auto hsv = color.to_hsv();
|
||||
hsv.hue = std::fmod(hsv.hue + static_cast<float>(ImGui::GetTime()) * 0.15f + hue_offset, 1.f);
|
||||
const auto animated = omath::Color::from_hsv(hsv).value();
|
||||
return omath::Color{animated.x, animated.y, animated.z, color.value().w};
|
||||
};
|
||||
const auto box_gradient_top = animated_color(m_box_gradient_top, 0.f);
|
||||
const auto box_gradient_bottom = animated_color(m_box_gradient_bottom, 0.5f);
|
||||
const auto red = omath::Color{1.f, 0.f, 0.f, 1.f};
|
||||
const auto green = omath::Color{0.f, 1.f, 0.f, 1.f};
|
||||
const auto make_glow = [](const GlowSettings& settings) -> std::optional<Glow>
|
||||
{
|
||||
if (!settings.enabled)
|
||||
return std::nullopt;
|
||||
return Glow{settings.color, settings.radius, settings.intensity};
|
||||
};
|
||||
const auto box_glow = make_glow(m_box_glow);
|
||||
const auto cornered_box_glow = make_glow(m_cornered_box_glow);
|
||||
const auto bar_glow = make_glow(m_bar_glow);
|
||||
const auto label_glow = make_glow(m_label_glow);
|
||||
const auto canvas_glow = make_glow(m_canvas_glow);
|
||||
const BarPaint bar_color = m_gradient_bars ? BarPaint{BarGradient{red, green}} : BarPaint{m_bar_color};
|
||||
const Bar bar{bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, m_bar_value, m_bar_offset, bar_glow};
|
||||
const Paint box_fill = m_gradient_box_fill
|
||||
? Paint{omath::hud::Gradient{box_gradient_top, box_gradient_top,
|
||||
box_gradient_bottom, box_gradient_bottom}}
|
||||
: Paint{m_box_fill};
|
||||
const Paint centered_label_color =
|
||||
m_gradient_label ? Paint{omath::hud::Gradient{m_label_gradient_left, m_label_gradient_right,
|
||||
m_label_gradient_right, m_label_gradient_left,
|
||||
m_animate_gradients, 4.f, 0.7f,
|
||||
m_label_gradient_direction}}
|
||||
: Paint{omath::Color::from_rgba(255, 255, 255, 255)};
|
||||
|
||||
auto outline_helper = [](const bool is_outline) -> Outlined
|
||||
{
|
||||
@@ -204,10 +326,13 @@ namespace imgui_desktop::gui
|
||||
omath::hud::EntityOverlay({m_entity_x, m_entity_top_y}, {m_entity_x, m_entity_bottom_y}, m_entity_aspect,
|
||||
std::make_shared<omath::hud::ImguiHudRenderer>())
|
||||
.contents(
|
||||
when(canvas_glow.has_value(), CanvasGlow{canvas_glow.value_or(Glow{m_canvas_glow.color}),
|
||||
m_canvas_glow_layers, m_canvas_glow_rounding}),
|
||||
// ── Boxes ────────────────────────────────────────────────────
|
||||
when(m_show_box, Box{m_box_color, m_box_fill, m_box_outline, m_box_thickness}),
|
||||
when(m_show_cornered_box, CorneredBox{omath::Color::from_rgba(255, 0, 255, 255), m_box_fill,
|
||||
m_box_outline, m_corner_ratio, m_box_thickness}),
|
||||
when(m_show_box, Box{m_box_color, box_fill, m_box_outline, m_box_thickness, box_glow}),
|
||||
when(m_show_cornered_box,
|
||||
CorneredBox{omath::Color::from_rgba(255, 0, 255, 255), m_box_fill, m_box_outline,
|
||||
m_corner_ratio, m_box_thickness, cornered_box_glow}),
|
||||
when(m_show_dashed_box, DashedBox{m_dash_color, m_dash_len, m_dash_gap, m_dash_thickness}),
|
||||
RightSide{
|
||||
when(m_show_right_bar, bar),
|
||||
@@ -254,14 +379,14 @@ namespace imgui_desktop::gui
|
||||
when(m_show_bottom_bar, bar),
|
||||
when(m_show_bottom_dashed_bar, dbar),
|
||||
when(m_show_centered_bottom,
|
||||
Centered{Label{omath::Color::from_rgba(255, 255, 255, 255), m_label_offset,
|
||||
outline_helper(m_outlined), "PlayerName"}}),
|
||||
Centered{Label{centered_label_color, m_label_offset, outline_helper(m_outlined),
|
||||
"Gradient PlayerName", label_glow}}),
|
||||
when(m_show_bottom_labels, Label{omath::Color::from_rgba(200, 200, 0, 255),
|
||||
m_label_offset, outline_helper(m_outlined), "42m"}),
|
||||
},
|
||||
when(m_show_aim, AimDot{{m_entity_x, m_entity_top_y + 40.f}, m_aim_color, m_aim_radius}),
|
||||
when(m_show_scan, ScanMarker{m_scan_color, m_scan_outline, m_scan_outline_thickness}),
|
||||
when(m_show_skeleton, Skeleton{m_skel_color, m_skel_thickness}),
|
||||
when(m_show_skeleton, Skeleton{skeleton_bones, m_skel_color, m_skel_thickness}),
|
||||
when(m_show_proj, ProjectileAim{{m_proj_pos_x, m_proj_pos_y},
|
||||
m_proj_color,
|
||||
m_proj_size,
|
||||
|
||||
@@ -17,6 +17,14 @@ namespace imgui_desktop::gui
|
||||
void Run();
|
||||
|
||||
private:
|
||||
struct GlowSettings
|
||||
{
|
||||
omath::Color color{0.f, 0.7f, 1.f, 0.8f};
|
||||
float radius = 4.f;
|
||||
float intensity = 0.8f;
|
||||
bool enabled = false;
|
||||
};
|
||||
|
||||
void draw_controls();
|
||||
void draw_overlay();
|
||||
void present();
|
||||
@@ -30,8 +38,12 @@ namespace imgui_desktop::gui
|
||||
// Box
|
||||
omath::Color m_box_color{1.f, 1.f, 1.f, 1.f};
|
||||
omath::Color m_box_fill{0.f, 0.f, 0.f, 0.f};
|
||||
omath::Color m_box_gradient_top{0.1f, 0.6f, 1.f, 0.55f};
|
||||
omath::Color m_box_gradient_bottom{0.7f, 0.1f, 1.f, 0.15f};
|
||||
omath::Color m_box_outline{0.f, 0.f, 0.f, 0.f};
|
||||
float m_box_thickness = 1.f, m_corner_ratio = 0.2f;
|
||||
bool m_gradient_box_fill = true;
|
||||
bool m_animate_gradients = false;
|
||||
bool m_show_box = true, m_show_cornered_box = true, m_show_dashed_box = false;
|
||||
|
||||
// Dashed box
|
||||
@@ -43,19 +55,32 @@ namespace imgui_desktop::gui
|
||||
omath::Color m_bar_bg_color{0.f, 0.f, 0.f, 0.5f};
|
||||
omath::Color m_bar_outline_color{0.f, 0.f, 0.f, 1.f};
|
||||
float m_bar_width = 4.f, m_bar_value = 0.75f, m_bar_offset = 5.f;
|
||||
bool m_show_right_bar = true, m_show_left_bar = true;
|
||||
bool m_show_top_bar = true, m_show_bottom_bar = true;
|
||||
bool m_gradient_bars = true;
|
||||
bool m_show_right_bar = true, m_show_left_bar = true;
|
||||
bool m_show_top_bar = true, m_show_bottom_bar = true;
|
||||
bool m_show_right_dashed_bar = false, m_show_left_dashed_bar = false;
|
||||
bool m_show_top_dashed_bar = false, m_show_bottom_dashed_bar = false;
|
||||
bool m_show_top_dashed_bar = false, m_show_bottom_dashed_bar = false;
|
||||
float m_bar_dash_len = 6.f, m_bar_dash_gap = 4.f;
|
||||
|
||||
// Labels
|
||||
float m_label_offset = 3.f;
|
||||
omath::Color m_label_gradient_left{0.f, 0.8f, 1.f, 1.f};
|
||||
omath::Color m_label_gradient_right{1.f, 0.2f, 0.7f, 1.f};
|
||||
bool m_outlined = true;
|
||||
bool m_gradient_label = true;
|
||||
omath::hud::GradientDirection m_label_gradient_direction = omath::hud::GradientDirection::RightToLeft;
|
||||
bool m_show_right_labels = true, m_show_left_labels = true;
|
||||
bool m_show_top_labels = true, m_show_bottom_labels = true;
|
||||
bool m_show_top_labels = true, m_show_bottom_labels = true;
|
||||
bool m_show_centered_top = true, m_show_centered_bottom = true;
|
||||
|
||||
GlowSettings m_box_glow;
|
||||
GlowSettings m_cornered_box_glow{{1.f, 0.f, 1.f, 0.8f}};
|
||||
GlowSettings m_bar_glow{{1.f, 0.f, 0.f, 0.8f}};
|
||||
GlowSettings m_label_glow;
|
||||
GlowSettings m_canvas_glow{{1.f, 0.5f, 0.f, 0.8f}, 100.f};
|
||||
int m_canvas_glow_layers = 64;
|
||||
float m_canvas_glow_rounding = 40.f;
|
||||
|
||||
// Skeleton
|
||||
omath::Color m_skel_color = omath::Color::from_rgba(255, 255, 255, 200);
|
||||
float m_skel_thickness = 1.f;
|
||||
|
||||
@@ -10,17 +10,27 @@ namespace omath::algorithm
|
||||
template<class Camera, class FloatingType>
|
||||
requires std::is_floating_point_v<FloatingType>
|
||||
[[nodiscard]]
|
||||
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 auto look_at_angles = camera.calc_look_at_angles(position);
|
||||
const auto current_angles = camera.get_view_angles();
|
||||
|
||||
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;
|
||||
|
||||
const auto yaw = current_angles.yaw - look_at_angles.yaw - decltype(current_angles.yaw)::from_degrees(90);
|
||||
return omath::Vector2<float>(static_cast<float>(yaw.cos()) * sign, static_cast<float>(yaw.sin()))
|
||||
* (camera.get_origin().distance_to(position) * scale);
|
||||
}
|
||||
static const auto sign = [&camera, ¤t_angles]
|
||||
{
|
||||
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 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);
|
||||
return right_yaw.cos() < 0 ? -1.f : 1.f;
|
||||
}();
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
#pragma once
|
||||
#include "omath/engines/cry_engine/formulas.hpp"
|
||||
#include "omath/internal/constexpr_math.hpp"
|
||||
#include "omath/projection/camera.hpp"
|
||||
namespace omath::cry_engine
|
||||
{
|
||||
@@ -16,8 +15,8 @@ namespace omath::cry_engine
|
||||
const Vector3<float>& look_at) noexcept
|
||||
{
|
||||
const auto direction = (look_at - cam_origin).normalized();
|
||||
return {PitchAngle::from_radians(internal::asin(direction.z)),
|
||||
YawAngle::from_radians(-internal::atan2(direction.x, direction.y)), RollAngle::from_radians(0.f)};
|
||||
return {PitchAngle::from_asin(direction.z), -YawAngle::from_atan2(direction.x, direction.y),
|
||||
RollAngle::from_radians(0.f)};
|
||||
}
|
||||
|
||||
[[nodiscard("view matrix result should not be discarded")]]
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
#pragma once
|
||||
#include "omath/engines/frostbite_engine/formulas.hpp"
|
||||
#include "omath/internal/constexpr_math.hpp"
|
||||
#include "omath/projection/camera.hpp"
|
||||
|
||||
namespace omath::frostbite_engine
|
||||
@@ -18,8 +17,8 @@ namespace omath::frostbite_engine
|
||||
{
|
||||
const auto direction = (look_at - cam_origin).normalized();
|
||||
|
||||
return {PitchAngle::from_radians(-internal::asin(direction.y)),
|
||||
YawAngle::from_radians(internal::atan2(direction.x, direction.z)), RollAngle::from_radians(0.f)};
|
||||
return {-PitchAngle::from_asin(direction.y), YawAngle::from_atan2(direction.x, direction.z),
|
||||
RollAngle::from_radians(0.f)};
|
||||
}
|
||||
|
||||
[[nodiscard("view matrix result should not be discarded")]]
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
#pragma once
|
||||
#include "omath/engines/iw_engine/formulas.hpp"
|
||||
#include "omath/internal/constexpr_math.hpp"
|
||||
#include "omath/projection/camera.hpp"
|
||||
|
||||
namespace omath::iw_engine
|
||||
@@ -18,8 +17,8 @@ namespace omath::iw_engine
|
||||
{
|
||||
const auto direction = (look_at - cam_origin).normalized();
|
||||
|
||||
return {PitchAngle::from_radians(-internal::asin(direction.z)),
|
||||
YawAngle::from_radians(internal::atan2(direction.y, direction.x)), RollAngle::from_radians(0.f)};
|
||||
return {-PitchAngle::from_asin(direction.z), YawAngle::from_atan2(direction.y, direction.x),
|
||||
RollAngle::from_radians(0.f)};
|
||||
}
|
||||
|
||||
[[nodiscard("view matrix result should not be discarded")]]
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
#pragma once
|
||||
#include "omath/engines/opengl_engine/formulas.hpp"
|
||||
#include "omath/internal/constexpr_math.hpp"
|
||||
#include "omath/projection/camera.hpp"
|
||||
|
||||
namespace omath::opengl_engine
|
||||
@@ -18,8 +17,8 @@ namespace omath::opengl_engine
|
||||
{
|
||||
const auto direction = (look_at - cam_origin).normalized();
|
||||
|
||||
return {PitchAngle::from_radians(internal::asin(direction.y)),
|
||||
YawAngle::from_radians(-internal::atan2(direction.x, -direction.z)), RollAngle::from_radians(0.f)};
|
||||
return {PitchAngle::from_asin(direction.y), -YawAngle::from_atan2(direction.x, -direction.z),
|
||||
RollAngle::from_radians(0.f)};
|
||||
}
|
||||
|
||||
[[nodiscard("view matrix result should not be discarded")]]
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
#pragma once
|
||||
#include "omath/engines/rage_engine/formulas.hpp"
|
||||
#include "omath/internal/constexpr_math.hpp"
|
||||
#include "omath/projection/camera.hpp"
|
||||
|
||||
namespace omath::rage_engine
|
||||
@@ -18,8 +17,8 @@ namespace omath::rage_engine
|
||||
{
|
||||
const auto direction = (look_at - cam_origin).normalized();
|
||||
|
||||
return {PitchAngle::from_radians(internal::asin(direction.z)),
|
||||
YawAngle::from_radians(-internal::atan2(direction.x, direction.y)), RollAngle::from_radians(0.f)};
|
||||
return {PitchAngle::from_asin(direction.z), -YawAngle::from_atan2(direction.x, direction.y),
|
||||
RollAngle::from_radians(0.f)};
|
||||
}
|
||||
|
||||
[[nodiscard("view matrix result should not be discarded")]]
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
#pragma once
|
||||
#include "omath/engines/source_engine/formulas.hpp"
|
||||
#include "omath/internal/constexpr_math.hpp"
|
||||
#include "omath/projection/camera.hpp"
|
||||
|
||||
namespace omath::source_engine
|
||||
@@ -18,8 +17,8 @@ namespace omath::source_engine
|
||||
{
|
||||
const auto direction = (look_at - cam_origin).normalized();
|
||||
|
||||
return {PitchAngle::from_radians(-internal::asin(direction.z)),
|
||||
YawAngle::from_radians(internal::atan2(direction.y, direction.x)), RollAngle::from_radians(0.f)};
|
||||
return {-PitchAngle::from_asin(direction.z),
|
||||
YawAngle::from_atan2(direction.y, direction.x), RollAngle::from_radians(0.f)};
|
||||
}
|
||||
|
||||
[[nodiscard("view matrix result should not be discarded")]]
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
#include "omath/engines/source_engine/formulas.hpp"
|
||||
#include "omath/projectile_prediction/projectile.hpp"
|
||||
#include "omath/projectile_prediction/target.hpp"
|
||||
#include <cmath>
|
||||
#include <limits>
|
||||
#include <optional>
|
||||
|
||||
namespace omath::source_engine
|
||||
@@ -14,19 +16,58 @@ namespace omath::source_engine
|
||||
{
|
||||
public:
|
||||
[[nodiscard("projectile position result should not be discarded")]]
|
||||
constexpr static Vector3<float> predict_projectile_position(const projectile_prediction::Projectile<float>& projectile,
|
||||
const float pitch, const float yaw,
|
||||
const float time, const float gravity) noexcept
|
||||
constexpr static Vector3<float>
|
||||
predict_projectile_position(const projectile_prediction::Projectile<float>& projectile, const float pitch,
|
||||
const float yaw, const float time, const float gravity) noexcept
|
||||
{
|
||||
const auto launch_pos = projectile.m_origin + projectile.m_launch_offset;
|
||||
auto current_pos = launch_pos
|
||||
+ forward_vector({PitchAngle::from_degrees(-pitch), YawAngle::from_degrees(yaw),
|
||||
RollAngle::from_degrees(0)})
|
||||
* projectile.m_launch_speed * time;
|
||||
const auto pitch_angle = PitchAngle::from_degrees(-pitch);
|
||||
const auto yaw_angle = YawAngle::from_degrees(yaw);
|
||||
const auto pitch_cos = pitch_angle.cos();
|
||||
// Roll is always zero here, so this is the exact first column of the rotation matrix.
|
||||
const Vector3 forward{pitch_cos * yaw_angle.cos(), pitch_cos * yaw_angle.sin(), -pitch_angle.sin()};
|
||||
auto current_pos = launch_pos + forward * projectile.m_launch_speed * time;
|
||||
current_pos.z -= (gravity * projectile.m_gravity_scale) * (time * time) * 0.5f;
|
||||
|
||||
return current_pos;
|
||||
}
|
||||
|
||||
[[nodiscard("reachability result should not be discarded")]]
|
||||
static constexpr bool
|
||||
can_projectile_reach_target_at_time(const projectile_prediction::Projectile<float>& projectile,
|
||||
const Vector3<float>& target_position, const float time,
|
||||
const float gravity, const float distance_tolerance) noexcept
|
||||
{
|
||||
if (!(distance_tolerance >= 0.f))
|
||||
return false;
|
||||
|
||||
// After undoing gravity, every possible projectile position is on a sphere with radius speed * time.
|
||||
const auto launch_position = projectile.m_origin + projectile.m_launch_offset;
|
||||
auto adjusted_delta = target_position - launch_position;
|
||||
const auto gravity_displacement = (gravity * projectile.m_gravity_scale) * (time * time) * 0.5f;
|
||||
adjusted_delta.z += gravity_displacement;
|
||||
|
||||
const auto target_distance_sqr = adjusted_delta.length_sqr();
|
||||
const auto projectile_distance = std::abs(projectile.m_launch_speed * time);
|
||||
const auto floating_point_margin =
|
||||
std::numeric_limits<float>::epsilon() * 8.f
|
||||
* (std::abs(target_position.x) + std::abs(target_position.y) + std::abs(target_position.z)
|
||||
+ std::abs(launch_position.x) + std::abs(launch_position.y) + std::abs(launch_position.z)
|
||||
+ std::abs(gravity_displacement) + projectile_distance + distance_tolerance + 1.f);
|
||||
|
||||
if (!std::isfinite(target_distance_sqr) || !std::isfinite(floating_point_margin)) [[unlikely]]
|
||||
return true;
|
||||
|
||||
const auto conservative_tolerance = distance_tolerance + floating_point_margin;
|
||||
const auto maximum_distance = projectile_distance + conservative_tolerance;
|
||||
if (target_distance_sqr > maximum_distance * maximum_distance)
|
||||
return false;
|
||||
|
||||
const auto minimum_distance =
|
||||
projectile_distance > conservative_tolerance ? projectile_distance - conservative_tolerance : 0.f;
|
||||
return target_distance_sqr >= minimum_distance * minimum_distance;
|
||||
}
|
||||
|
||||
[[nodiscard("target position result should not be discarded")]]
|
||||
static constexpr Vector3<float> predict_target_position(const projectile_prediction::Target<float>& target,
|
||||
const float time, const float gravity) noexcept
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
#pragma once
|
||||
#include "omath/engines/unity_engine/formulas.hpp"
|
||||
#include "omath/internal/constexpr_math.hpp"
|
||||
#include "omath/projection/camera.hpp"
|
||||
|
||||
namespace omath::unity_engine
|
||||
@@ -18,8 +17,8 @@ namespace omath::unity_engine
|
||||
{
|
||||
const auto direction = (look_at - cam_origin).normalized();
|
||||
|
||||
return {PitchAngle::from_radians(-internal::asin(direction.y)),
|
||||
YawAngle::from_radians(internal::atan2(direction.x, direction.z)), RollAngle::from_radians(0.f)};
|
||||
return {-PitchAngle::from_asin(direction.y), YawAngle::from_atan2(direction.x, direction.z),
|
||||
RollAngle::from_radians(0.f)};
|
||||
}
|
||||
|
||||
[[nodiscard("view matrix result should not be discarded")]]
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
#pragma once
|
||||
#include "omath/engines/unreal_engine/formulas.hpp"
|
||||
#include "omath/internal/constexpr_math.hpp"
|
||||
#include "omath/projection/camera.hpp"
|
||||
|
||||
namespace omath::unreal_engine
|
||||
@@ -18,8 +17,8 @@ namespace omath::unreal_engine
|
||||
{
|
||||
const auto direction = (look_at - cam_origin).normalized();
|
||||
|
||||
return {PitchAngle::from_radians(internal::asin(direction.z)),
|
||||
YawAngle::from_radians(internal::atan2(direction.y, direction.x)), RollAngle::from_radians(0.f)};
|
||||
return {PitchAngle::from_asin(direction.z), YawAngle::from_atan2(direction.y, direction.x),
|
||||
RollAngle::from_radians(0.f)};
|
||||
}
|
||||
|
||||
[[nodiscard("view matrix result should not be discarded")]]
|
||||
|
||||
@@ -30,6 +30,9 @@ namespace omath::hud
|
||||
EntityOverlay& add_2d_box(const Color& box_color, const Color& fill_color = Color{0.f, 0.f, 0.f, 0.f},
|
||||
const Color& outline_color = Color{0.f, 0.f, 0.f, 0.f}, float thickness = 1.f);
|
||||
|
||||
EntityOverlay& add_2d_box(const Color& box_color, const Gradient& fill_gradient,
|
||||
const Color& outline_color = Color{0.f, 0.f, 0.f, 0.f}, float thickness = 1.f);
|
||||
|
||||
EntityOverlay& add_cornered_2d_box(const Color& box_color, const Color& fill_color = Color{0.f, 0.f, 0.f, 0.f},
|
||||
const Color& outline_color = Color{0.f, 0.f, 0.f, 0.f},
|
||||
float corner_ratio_len = 0.2f, float thickness = 1.f);
|
||||
@@ -38,17 +41,21 @@ namespace omath::hud
|
||||
float thickness = 1.f);
|
||||
|
||||
// ── Bars ─────────────────────────────────────────────────────────
|
||||
EntityOverlay& add_right_bar(const Color& color, const Color& outline_color, const Color& bg_color, float width,
|
||||
float ratio, float offset = 5.f);
|
||||
EntityOverlay& add_right_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color,
|
||||
float width, float ratio, float offset = 5.f,
|
||||
const std::optional<widget::Glow>& glow = std::nullopt);
|
||||
|
||||
EntityOverlay& add_left_bar(const Color& color, const Color& outline_color, const Color& bg_color, float width,
|
||||
float ratio, float offset = 5.f);
|
||||
EntityOverlay& add_left_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color,
|
||||
float width, float ratio, float offset = 5.f,
|
||||
const std::optional<widget::Glow>& glow = std::nullopt);
|
||||
|
||||
EntityOverlay& add_top_bar(const Color& color, const Color& outline_color, const Color& bg_color, float height,
|
||||
float ratio, float offset = 5.f);
|
||||
EntityOverlay& add_top_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color,
|
||||
float height, float ratio, float offset = 5.f,
|
||||
const std::optional<widget::Glow>& glow = std::nullopt);
|
||||
|
||||
EntityOverlay& add_bottom_bar(const Color& color, const Color& outline_color, const Color& bg_color,
|
||||
float height, float ratio, float offset = 5.f);
|
||||
EntityOverlay& add_bottom_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color,
|
||||
float height, float ratio, float offset = 5.f,
|
||||
const std::optional<widget::Glow>& glow = std::nullopt);
|
||||
|
||||
EntityOverlay& add_right_dashed_bar(const Color& color, const Color& outline_color, const Color& bg_color,
|
||||
float width, float ratio, float dash_len, float gap_len,
|
||||
@@ -65,26 +72,31 @@ namespace omath::hud
|
||||
float offset = 5.f);
|
||||
|
||||
// ── Labels ───────────────────────────────────────────────────────
|
||||
EntityOverlay& add_right_label(const Color& color, float offset, widget::Outlined outlined,
|
||||
const std::string_view& text);
|
||||
EntityOverlay& add_right_label(const widget::Paint& color, float offset, widget::Outlined outlined,
|
||||
const std::string_view& text,
|
||||
const std::optional<widget::Glow>& glow = std::nullopt);
|
||||
|
||||
EntityOverlay& add_left_label(const Color& color, float offset, widget::Outlined outlined,
|
||||
const std::string_view& text);
|
||||
EntityOverlay& add_left_label(const widget::Paint& color, float offset, widget::Outlined outlined,
|
||||
const std::string_view& text,
|
||||
const std::optional<widget::Glow>& glow = std::nullopt);
|
||||
|
||||
EntityOverlay& add_top_label(const Color& color, float offset, widget::Outlined outlined,
|
||||
std::string_view text);
|
||||
EntityOverlay& add_top_label(const widget::Paint& color, float offset, widget::Outlined outlined,
|
||||
std::string_view text, const std::optional<widget::Glow>& glow = std::nullopt);
|
||||
|
||||
EntityOverlay& add_bottom_label(const Color& color, float offset, widget::Outlined outlined,
|
||||
std::string_view text);
|
||||
EntityOverlay& add_bottom_label(const widget::Paint& color, float offset, widget::Outlined outlined,
|
||||
std::string_view text, const std::optional<widget::Glow>& glow = std::nullopt);
|
||||
|
||||
EntityOverlay& add_centered_top_label(const Color& color, float offset, widget::Outlined outlined,
|
||||
const std::string_view& text);
|
||||
EntityOverlay& add_centered_top_label(const widget::Paint& color, float offset, widget::Outlined outlined,
|
||||
const std::string_view& text,
|
||||
const std::optional<widget::Glow>& glow = std::nullopt);
|
||||
|
||||
EntityOverlay& add_centered_bottom_label(const Color& color, float offset, widget::Outlined outlined,
|
||||
const std::string_view& text);
|
||||
EntityOverlay& add_centered_bottom_label(const widget::Paint& color, float offset, widget::Outlined outlined,
|
||||
const std::string_view& text,
|
||||
const std::optional<widget::Glow>& glow = std::nullopt);
|
||||
|
||||
template<typename... Args>
|
||||
EntityOverlay& add_right_label(const Color& color, const float offset, const widget::Outlined outlined,
|
||||
requires(sizeof...(Args) > 0)
|
||||
EntityOverlay& add_right_label(const widget::Paint& color, const float offset, const widget::Outlined outlined,
|
||||
std::format_string<Args...> fmt, Args&&... args)
|
||||
{
|
||||
return add_right_label(color, offset, outlined,
|
||||
@@ -92,7 +104,8 @@ namespace omath::hud
|
||||
}
|
||||
|
||||
template<typename... Args>
|
||||
EntityOverlay& add_left_label(const Color& color, const float offset, const widget::Outlined outlined,
|
||||
requires(sizeof...(Args) > 0)
|
||||
EntityOverlay& add_left_label(const widget::Paint& color, const float offset, const widget::Outlined outlined,
|
||||
std::format_string<Args...> fmt, Args&&... args)
|
||||
{
|
||||
return add_left_label(color, offset, outlined,
|
||||
@@ -100,7 +113,8 @@ namespace omath::hud
|
||||
}
|
||||
|
||||
template<typename... Args>
|
||||
EntityOverlay& add_top_label(const Color& color, const float offset, const widget::Outlined outlined,
|
||||
requires(sizeof...(Args) > 0)
|
||||
EntityOverlay& add_top_label(const widget::Paint& color, const float offset, const widget::Outlined outlined,
|
||||
std::format_string<Args...> fmt, Args&&... args)
|
||||
{
|
||||
return add_top_label(color, offset, outlined,
|
||||
@@ -108,7 +122,8 @@ namespace omath::hud
|
||||
}
|
||||
|
||||
template<typename... Args>
|
||||
EntityOverlay& add_bottom_label(const Color& color, const float offset, const widget::Outlined outlined,
|
||||
requires(sizeof...(Args) > 0)
|
||||
EntityOverlay& add_bottom_label(const widget::Paint& color, const float offset, const widget::Outlined outlined,
|
||||
std::format_string<Args...> fmt, Args&&... args)
|
||||
{
|
||||
return add_bottom_label(color, offset, outlined,
|
||||
@@ -116,15 +131,18 @@ namespace omath::hud
|
||||
}
|
||||
|
||||
template<typename... Args>
|
||||
EntityOverlay& add_centered_top_label(const Color& color, const float offset, const widget::Outlined outlined,
|
||||
std::format_string<Args...> fmt, Args&&... args)
|
||||
requires(sizeof...(Args) > 0)
|
||||
EntityOverlay& add_centered_top_label(const widget::Paint& color, const float offset,
|
||||
const widget::Outlined outlined, std::format_string<Args...> fmt,
|
||||
Args&&... args)
|
||||
{
|
||||
return add_centered_top_label(color, offset, outlined,
|
||||
std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))});
|
||||
}
|
||||
|
||||
template<typename... Args>
|
||||
EntityOverlay& add_centered_bottom_label(const Color& color, const float offset,
|
||||
requires(sizeof...(Args) > 0)
|
||||
EntityOverlay& add_centered_bottom_label(const widget::Paint& color, const float offset,
|
||||
const widget::Outlined outlined, std::format_string<Args...> fmt,
|
||||
Args&&... args)
|
||||
{
|
||||
@@ -166,6 +184,7 @@ namespace omath::hud
|
||||
EntityOverlay& add_snap_line(const Vector2<float>& start_pos, const Color& color, float width);
|
||||
|
||||
EntityOverlay& add_skeleton(const Color& color, float thickness = 1.f);
|
||||
EntityOverlay& add_skeleton(std::span<const widget::Bone> bones, const Color& color, float thickness = 1.f);
|
||||
|
||||
// ── Declarative interface ─────────────────────────────────────────
|
||||
/// Pass any combination of widget:: descriptor structs (and std::optional<W>
|
||||
@@ -230,6 +249,7 @@ namespace omath::hud
|
||||
}
|
||||
|
||||
void dispatch(const widget::Box& box);
|
||||
void dispatch(const widget::CanvasGlow& canvas_glow);
|
||||
void dispatch(const widget::CorneredBox& cornered_box);
|
||||
void dispatch(const widget::DashedBox& dashed_box);
|
||||
void dispatch(const widget::RightSide& right_side);
|
||||
@@ -242,7 +262,19 @@ namespace omath::hud
|
||||
void dispatch(const widget::AimDot& aim_dot);
|
||||
void dispatch(const widget::ProjectileAim& proj_widget);
|
||||
void draw_progress_ring(const Vector2<float>& center, const widget::ProgressRing& ring);
|
||||
void draw_outlined_text(const Vector2<float>& position, const Color& color, const std::string_view& text);
|
||||
void draw_label(const Vector2<float>& position, const widget::Paint& paint, widget::Outlined outlined,
|
||||
const std::string_view& text, const std::optional<widget::Glow>& glow);
|
||||
void draw_glow_polyline(const std::span<const Vector2<float>>& points, const widget::Glow& glow,
|
||||
float thickness) const;
|
||||
void draw_glow_line(const Vector2<float>& from, const Vector2<float>& to, const widget::Glow& glow,
|
||||
float thickness) const;
|
||||
void draw_glow_rectangle(const Vector2<float>& min, const Vector2<float>& max,
|
||||
const std::optional<widget::Glow>& glow) const;
|
||||
void draw_canvas_glow(const widget::CanvasGlow& canvas_glow) const;
|
||||
void draw_filled_rectangle(const Vector2<float>& min, const Vector2<float>& max,
|
||||
const widget::Paint& paint) const;
|
||||
[[nodiscard]]
|
||||
static widget::Paint resolve_bar_paint(const widget::BarPaint& paint, float ratio, bool vertical);
|
||||
void draw_dashed_line(const Vector2<float>& from, const Vector2<float>& to, const Color& color, float dash_len,
|
||||
float gap_len, float thickness) const;
|
||||
void draw_dashed_fill(const Vector2<float>& origin, const Vector2<float>& step_dir,
|
||||
|
||||
@@ -2,16 +2,57 @@
|
||||
// Created by orange on 15.03.2026.
|
||||
//
|
||||
#pragma once
|
||||
#include "gradient.hpp"
|
||||
#include "omath/linear_algebra/vector2.hpp"
|
||||
#include "omath/utility/color.hpp"
|
||||
#include <any>
|
||||
#include <array>
|
||||
#include <initializer_list>
|
||||
#include <optional>
|
||||
#include <span>
|
||||
#include <string_view>
|
||||
#include <type_traits>
|
||||
#include <variant>
|
||||
#include <vector>
|
||||
|
||||
namespace omath::hud::widget
|
||||
{
|
||||
struct Paint : std::variant<Color, Gradient>
|
||||
{
|
||||
using std::variant<Color, Gradient>::variant;
|
||||
|
||||
constexpr Paint(const float red, const float green, const float blue, const float alpha)
|
||||
: std::variant<Color, Gradient>(Color{red, green, blue, alpha})
|
||||
{
|
||||
}
|
||||
};
|
||||
|
||||
struct BarGradient
|
||||
{
|
||||
Color empty_color;
|
||||
Color full_color;
|
||||
};
|
||||
|
||||
struct BarPaint : std::variant<Color, Gradient, BarGradient>
|
||||
{
|
||||
using std::variant<Color, Gradient, BarGradient>::variant;
|
||||
|
||||
constexpr BarPaint(const float red, const float green, const float blue, const float alpha)
|
||||
: std::variant<Color, Gradient, BarGradient>(Color{red, green, blue, alpha})
|
||||
{
|
||||
}
|
||||
|
||||
BarPaint(const Paint& paint)
|
||||
{
|
||||
std::visit(
|
||||
[this](const auto& value)
|
||||
{
|
||||
this->template emplace<std::decay_t<decltype(value)>>(value);
|
||||
},
|
||||
paint);
|
||||
}
|
||||
};
|
||||
|
||||
// ── Overloaded helper for std::visit ──────────────────────────────────────
|
||||
template<typename... Ts>
|
||||
struct Overloaded : Ts...
|
||||
@@ -21,13 +62,28 @@ namespace omath::hud::widget
|
||||
template<typename... Ts>
|
||||
Overloaded(Ts...) -> Overloaded<Ts...>;
|
||||
|
||||
struct Glow
|
||||
{
|
||||
Color color;
|
||||
float radius = 4.f;
|
||||
float intensity = 1.f;
|
||||
};
|
||||
|
||||
struct CanvasGlow
|
||||
{
|
||||
Glow glow;
|
||||
int layers = 64;
|
||||
float rounding = 20.f;
|
||||
};
|
||||
|
||||
// ── Standalone widgets ────────────────────────────────────────────────────
|
||||
struct Box
|
||||
{
|
||||
Color color;
|
||||
Color fill{0.f, 0.f, 0.f, 0.f};
|
||||
Paint fill{Color{0.f, 0.f, 0.f, 0.f}};
|
||||
Color outline{0.f, 0.f, 0.f, 0.f};
|
||||
float thickness = 1.f;
|
||||
std::optional<Glow> glow = std::nullopt;
|
||||
};
|
||||
|
||||
enum class Outlined
|
||||
@@ -42,6 +98,7 @@ namespace omath::hud::widget
|
||||
Color outline{0.f, 0.f, 0.f, 0.f};
|
||||
float corner_ratio = 0.2f;
|
||||
float thickness = 1.f;
|
||||
std::optional<Glow> glow = std::nullopt;
|
||||
};
|
||||
|
||||
struct DashedBox
|
||||
@@ -52,10 +109,37 @@ namespace omath::hud::widget
|
||||
float thickness = 1.f;
|
||||
};
|
||||
|
||||
struct Bone
|
||||
{
|
||||
Vector2<float> start;
|
||||
Vector2<float> end;
|
||||
};
|
||||
|
||||
struct Skeleton
|
||||
{
|
||||
std::vector<Bone> bones;
|
||||
Color color;
|
||||
float thickness = 1.f;
|
||||
|
||||
Skeleton(const Color& color, const float thickness = 1.f): color(color), thickness(thickness)
|
||||
{
|
||||
}
|
||||
|
||||
Skeleton(const std::span<const Bone> bones, const Color& color, const float thickness = 1.f)
|
||||
: bones(bones.begin(), bones.end()), color(color), thickness(thickness)
|
||||
{
|
||||
}
|
||||
|
||||
Skeleton(const std::initializer_list<Bone> bones, const Color& color, const float thickness = 1.f)
|
||||
: bones(bones), color(color), thickness(thickness)
|
||||
{
|
||||
}
|
||||
|
||||
template<std::size_t Size>
|
||||
Skeleton(const std::array<Bone, Size>& bones, const Color& color, const float thickness = 1.f)
|
||||
: Skeleton(std::span<const Bone>{bones}, color, thickness)
|
||||
{
|
||||
}
|
||||
};
|
||||
struct SnapLine
|
||||
{
|
||||
@@ -92,18 +176,18 @@ namespace omath::hud::widget
|
||||
Figure figure = Figure::SQUARE;
|
||||
};
|
||||
|
||||
|
||||
// ── Side-agnostic widgets (used inside XxxSide containers) ────────────────
|
||||
|
||||
/// A filled bar. `size` is width for left/right sides, height for top/bottom.
|
||||
struct Bar
|
||||
{
|
||||
Color color;
|
||||
BarPaint color;
|
||||
Color outline;
|
||||
Color bg;
|
||||
float size;
|
||||
float ratio;
|
||||
float offset = 5.f;
|
||||
std::optional<Glow> glow = std::nullopt;
|
||||
};
|
||||
|
||||
/// A dashed bar. Same field semantics as Bar plus dash parameters.
|
||||
@@ -121,10 +205,11 @@ namespace omath::hud::widget
|
||||
|
||||
struct Label
|
||||
{
|
||||
Color color;
|
||||
Paint color;
|
||||
float offset;
|
||||
Outlined outlined;
|
||||
std::string_view text;
|
||||
std::optional<Glow> glow = std::nullopt;
|
||||
};
|
||||
|
||||
/// Wraps a Label to request horizontal centering (only applied in TopSide / BottomSide).
|
||||
@@ -172,8 +257,8 @@ namespace omath::hud::widget
|
||||
struct None
|
||||
{
|
||||
}; ///< No-op placeholder — used by widget::when for disabled elements.
|
||||
using SideWidget =
|
||||
std::variant<None, Bar, DashedBar, Label, Centered<Label>, SpaceVertical, SpaceHorizontal, ProgressRing, Icon>;
|
||||
using SideWidget = std::variant<None, Bar, DashedBar, Label, Centered<Label>, SpaceVertical, SpaceHorizontal,
|
||||
ProgressRing, Icon>;
|
||||
|
||||
// ── Side containers ───────────────────────────────────────────────────────
|
||||
// Storing std::initializer_list<SideWidget> is safe here: the backing array
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
#pragma once
|
||||
#include "omath/utility/color.hpp"
|
||||
|
||||
namespace omath::hud
|
||||
{
|
||||
enum class GradientDirection
|
||||
{
|
||||
RightToLeft,
|
||||
LeftToRight,
|
||||
};
|
||||
|
||||
struct Gradient final
|
||||
{
|
||||
Color top_left;
|
||||
Color top_right;
|
||||
Color bottom_right;
|
||||
Color bottom_left;
|
||||
bool animated = false;
|
||||
float animation_speed = 4.f;
|
||||
float animation_spread = 0.7f;
|
||||
GradientDirection direction = GradientDirection::RightToLeft;
|
||||
};
|
||||
} // namespace omath::hud
|
||||
@@ -2,6 +2,7 @@
|
||||
// Created by orange on 13.03.2026.
|
||||
//
|
||||
#pragma once
|
||||
#include "gradient.hpp"
|
||||
#include "omath/linear_algebra/vector2.hpp"
|
||||
#include "omath/utility/color.hpp"
|
||||
#include <any>
|
||||
@@ -19,12 +20,24 @@ namespace omath::hud
|
||||
virtual void add_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color,
|
||||
float thickness) = 0;
|
||||
|
||||
virtual void add_polyline_clipped(const std::span<const Vector2<float>>& vertexes, const Vector2<float>&,
|
||||
const Vector2<float>&, const Color& color, float thickness)
|
||||
{
|
||||
add_polyline(vertexes, color, thickness);
|
||||
}
|
||||
|
||||
virtual void add_filled_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color) = 0;
|
||||
|
||||
virtual void add_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color) = 0;
|
||||
|
||||
virtual void add_filled_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color) = 0;
|
||||
|
||||
virtual void add_gradient_rectangle(const Vector2<float>& min, const Vector2<float>& max,
|
||||
const Gradient& gradient)
|
||||
{
|
||||
add_filled_rectangle(min, max, gradient.top_left);
|
||||
}
|
||||
|
||||
virtual void add_circle(const Vector2<float>& center, float radius, const Color& color, float thickness,
|
||||
int segments = 0) = 0;
|
||||
|
||||
@@ -41,6 +54,12 @@ namespace omath::hud
|
||||
|
||||
virtual void add_text(const Vector2<float>& position, const Color& color, const std::string_view& text) = 0;
|
||||
|
||||
virtual void add_gradient_text(const Vector2<float>& position, const Gradient& gradient,
|
||||
const std::string_view& text)
|
||||
{
|
||||
add_text(position, gradient.top_left, text);
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
virtual Vector2<float> calc_text_size(const std::string_view& text) = 0;
|
||||
};
|
||||
|
||||
@@ -13,10 +13,15 @@ namespace omath::hud
|
||||
~ImguiHudRenderer() override;
|
||||
void add_line(const Vector2<float>& line_start, const Vector2<float>& line_end, const Color& color,
|
||||
float thickness) override;
|
||||
void add_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color, float thickness) override;
|
||||
void add_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color,
|
||||
float thickness) override;
|
||||
void add_polyline_clipped(const std::span<const Vector2<float>>& vertexes, const Vector2<float>& clip_min,
|
||||
const Vector2<float>& clip_max, const Color& color, float thickness) override;
|
||||
void add_filled_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color) override;
|
||||
void add_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color) override;
|
||||
void add_filled_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color) override;
|
||||
void add_gradient_rectangle(const Vector2<float>& min, const Vector2<float>& max,
|
||||
const Gradient& gradient) override;
|
||||
void add_circle(const Vector2<float>& center, float radius, const Color& color, float thickness,
|
||||
int segments = 0) override;
|
||||
void add_filled_circle(const Vector2<float>& center, float radius, const Color& color,
|
||||
@@ -26,6 +31,8 @@ namespace omath::hud
|
||||
void add_image(const std::any& texture_id, const Vector2<float>& min, const Vector2<float>& max,
|
||||
const Color& tint = Color{1.f, 1.f, 1.f, 1.f}) override;
|
||||
void add_text(const Vector2<float>& position, const Color& color, const std::string_view& text) override;
|
||||
void add_gradient_text(const Vector2<float>& position, const Gradient& gradient,
|
||||
const std::string_view& text) override;
|
||||
[[nodiscard]]
|
||||
Vector2<float> calc_text_size(const std::string_view& text) override;
|
||||
};
|
||||
|
||||
@@ -186,7 +186,14 @@ namespace omath
|
||||
else if constexpr (StoreType == MatStoreType::COLUMN_MAJOR)
|
||||
return cache_friendly_multiply_col_major(other);
|
||||
}
|
||||
if constexpr (StoreType == MatStoreType::ROW_MAJOR)
|
||||
if constexpr (!std::is_same_v<Type, float> && !std::is_same_v<Type, double>)
|
||||
{
|
||||
if constexpr (StoreType == MatStoreType::ROW_MAJOR)
|
||||
return cache_friendly_multiply_row_major(other);
|
||||
else if constexpr (StoreType == MatStoreType::COLUMN_MAJOR)
|
||||
return cache_friendly_multiply_col_major(other);
|
||||
}
|
||||
else if constexpr (StoreType == MatStoreType::ROW_MAJOR)
|
||||
return avx_multiply_row_major(other);
|
||||
else if constexpr (StoreType == MatStoreType::COLUMN_MAJOR)
|
||||
return avx_multiply_col_major(other);
|
||||
@@ -429,13 +436,22 @@ namespace omath
|
||||
cache_friendly_multiply_row_major(const Mat<Columns, OtherColumns, Type, MatStoreType::ROW_MAJOR>& other) const
|
||||
{
|
||||
Mat<Rows, OtherColumns, Type, MatStoreType::ROW_MAJOR> result;
|
||||
const Type* left_data = m_data.data();
|
||||
const Type* right_data = other.raw_array().data();
|
||||
Type* result_data = result.raw_array().data();
|
||||
|
||||
for (std::size_t row_index = 0; row_index < Rows; ++row_index)
|
||||
{
|
||||
const Type* left_row = left_data + row_index * Columns;
|
||||
Type* result_row = result_data + row_index * OtherColumns;
|
||||
for (std::size_t column_index = 0; column_index < Columns; ++column_index)
|
||||
{
|
||||
const Type& current_number = at(row_index, column_index);
|
||||
const Type current_number = left_row[column_index];
|
||||
const Type* right_row = right_data + column_index * OtherColumns;
|
||||
for (std::size_t other_column = 0; other_column < OtherColumns; ++other_column)
|
||||
result.at(row_index, other_column) += current_number * other.at(column_index, other_column);
|
||||
result_row[other_column] += current_number * right_row[other_column];
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -444,13 +460,22 @@ namespace omath
|
||||
const Mat<Columns, OtherColumns, Type, MatStoreType::COLUMN_MAJOR>& other) const
|
||||
{
|
||||
Mat<Rows, OtherColumns, Type, MatStoreType::COLUMN_MAJOR> result;
|
||||
const Type* left_data = m_data.data();
|
||||
const Type* right_data = other.raw_array().data();
|
||||
Type* result_data = result.raw_array().data();
|
||||
|
||||
for (std::size_t other_column = 0; other_column < OtherColumns; ++other_column)
|
||||
{
|
||||
const Type* right_column = right_data + other_column * Columns;
|
||||
Type* result_column = result_data + other_column * Rows;
|
||||
for (std::size_t column_index = 0; column_index < Columns; ++column_index)
|
||||
{
|
||||
const Type& current_number = other.at(column_index, other_column);
|
||||
const Type current_number = right_column[column_index];
|
||||
const Type* left_column = left_data + column_index * Rows;
|
||||
for (std::size_t row_index = 0; row_index < Rows; ++row_index)
|
||||
result.at(row_index, other_column) += at(row_index, column_index) * current_number;
|
||||
result_column[row_index] += left_column[row_index] * current_number;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
#ifdef OMATH_USE_AVX2
|
||||
@@ -466,56 +491,92 @@ namespace omath
|
||||
|
||||
if constexpr (std::is_same_v<Type, float>)
|
||||
{
|
||||
// ReSharper disable once CppTooWideScopeInitStatement
|
||||
constexpr std::size_t vector_size = 8;
|
||||
constexpr std::size_t block_size = vector_size * 4;
|
||||
for (std::size_t j = 0; j < OtherColumns; ++j)
|
||||
{
|
||||
auto* c_col = reinterpret_cast<float*>(result_mat_data + j * Rows);
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
std::size_t i = 0;
|
||||
for (; i + block_size <= Rows; i += block_size)
|
||||
{
|
||||
const float bkj = reinterpret_cast<const float*>(other_mat_data)[k + j * Columns];
|
||||
const __m256 bkj_vec = _mm256_set1_ps(bkj);
|
||||
|
||||
const auto* a_col_k = reinterpret_cast<const float*>(this_mat_data + k * Rows);
|
||||
|
||||
std::size_t i = 0;
|
||||
for (; i + vector_size <= Rows; i += vector_size)
|
||||
__m256 cvec0 = _mm256_setzero_ps();
|
||||
__m256 cvec1 = _mm256_setzero_ps();
|
||||
__m256 cvec2 = _mm256_setzero_ps();
|
||||
__m256 cvec3 = _mm256_setzero_ps();
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
{
|
||||
__m256 cvec = _mm256_loadu_ps(c_col + i);
|
||||
const __m256 bkj_vec = _mm256_set1_ps(other_mat_data[k + j * Columns]);
|
||||
const auto* a_col_k = this_mat_data + k * Rows + i;
|
||||
cvec0 = _mm256_fmadd_ps(_mm256_loadu_ps(a_col_k), bkj_vec, cvec0);
|
||||
cvec1 = _mm256_fmadd_ps(_mm256_loadu_ps(a_col_k + vector_size), bkj_vec, cvec1);
|
||||
cvec2 = _mm256_fmadd_ps(_mm256_loadu_ps(a_col_k + vector_size * 2), bkj_vec, cvec2);
|
||||
cvec3 = _mm256_fmadd_ps(_mm256_loadu_ps(a_col_k + vector_size * 3), bkj_vec, cvec3);
|
||||
}
|
||||
_mm256_storeu_ps(c_col + i, cvec0);
|
||||
_mm256_storeu_ps(c_col + i + vector_size, cvec1);
|
||||
_mm256_storeu_ps(c_col + i + vector_size * 2, cvec2);
|
||||
_mm256_storeu_ps(c_col + i + vector_size * 3, cvec3);
|
||||
}
|
||||
for (; i + vector_size <= Rows; i += vector_size)
|
||||
{
|
||||
__m256 cvec = _mm256_setzero_ps();
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
{
|
||||
const __m256 bkj_vec = _mm256_set1_ps(other_mat_data[k + j * Columns]);
|
||||
const auto* a_col_k = this_mat_data + k * Rows;
|
||||
const __m256 a_vec = _mm256_loadu_ps(a_col_k + i);
|
||||
cvec = _mm256_fmadd_ps(a_vec, bkj_vec, cvec);
|
||||
_mm256_storeu_ps(c_col + i, cvec);
|
||||
}
|
||||
for (; i < Rows; ++i)
|
||||
c_col[i] += a_col_k[i] * bkj;
|
||||
_mm256_storeu_ps(c_col + i, cvec);
|
||||
}
|
||||
for (; i < Rows; ++i)
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
c_col[i] += this_mat_data[i + k * Rows] * other_mat_data[k + j * Columns];
|
||||
}
|
||||
}
|
||||
else if (std::is_same_v<Type, double>)
|
||||
{ // double
|
||||
// ReSharper disable once CppTooWideScopeInitStatement
|
||||
{
|
||||
constexpr std::size_t vector_size = 4;
|
||||
constexpr std::size_t block_size = vector_size * 4;
|
||||
for (std::size_t j = 0; j < OtherColumns; ++j)
|
||||
{
|
||||
auto* c_col = reinterpret_cast<double*>(result_mat_data + j * Rows);
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
std::size_t i = 0;
|
||||
for (; i + block_size <= Rows; i += block_size)
|
||||
{
|
||||
const double bkj = reinterpret_cast<const double*>(other_mat_data)[k + j * Columns];
|
||||
const __m256d bkj_vec = _mm256_set1_pd(bkj);
|
||||
|
||||
const auto* a_col_k = reinterpret_cast<const double*>(this_mat_data + k * Rows);
|
||||
|
||||
std::size_t i = 0;
|
||||
for (; i + vector_size <= Rows; i += vector_size)
|
||||
__m256d cvec0 = _mm256_setzero_pd();
|
||||
__m256d cvec1 = _mm256_setzero_pd();
|
||||
__m256d cvec2 = _mm256_setzero_pd();
|
||||
__m256d cvec3 = _mm256_setzero_pd();
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
{
|
||||
__m256d cvec = _mm256_loadu_pd(c_col + i);
|
||||
const __m256d bkj_vec = _mm256_set1_pd(other_mat_data[k + j * Columns]);
|
||||
const auto* a_col_k = this_mat_data + k * Rows + i;
|
||||
cvec0 = _mm256_fmadd_pd(_mm256_loadu_pd(a_col_k), bkj_vec, cvec0);
|
||||
cvec1 = _mm256_fmadd_pd(_mm256_loadu_pd(a_col_k + vector_size), bkj_vec, cvec1);
|
||||
cvec2 = _mm256_fmadd_pd(_mm256_loadu_pd(a_col_k + vector_size * 2), bkj_vec, cvec2);
|
||||
cvec3 = _mm256_fmadd_pd(_mm256_loadu_pd(a_col_k + vector_size * 3), bkj_vec, cvec3);
|
||||
}
|
||||
_mm256_storeu_pd(c_col + i, cvec0);
|
||||
_mm256_storeu_pd(c_col + i + vector_size, cvec1);
|
||||
_mm256_storeu_pd(c_col + i + vector_size * 2, cvec2);
|
||||
_mm256_storeu_pd(c_col + i + vector_size * 3, cvec3);
|
||||
}
|
||||
for (; i + vector_size <= Rows; i += vector_size)
|
||||
{
|
||||
__m256d cvec = _mm256_setzero_pd();
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
{
|
||||
const __m256d bkj_vec = _mm256_set1_pd(other_mat_data[k + j * Columns]);
|
||||
const auto* a_col_k = this_mat_data + k * Rows;
|
||||
const __m256d a_vec = _mm256_loadu_pd(a_col_k + i);
|
||||
cvec = _mm256_fmadd_pd(a_vec, bkj_vec, cvec);
|
||||
_mm256_storeu_pd(c_col + i, cvec);
|
||||
}
|
||||
for (; i < Rows; ++i)
|
||||
c_col[i] += a_col_k[i] * bkj;
|
||||
_mm256_storeu_pd(c_col + i, cvec);
|
||||
}
|
||||
for (; i < Rows; ++i)
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
c_col[i] += this_mat_data[i + k * Rows] * other_mat_data[k + j * Columns];
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -536,56 +597,92 @@ namespace omath
|
||||
|
||||
if constexpr (std::is_same_v<Type, float>)
|
||||
{
|
||||
// ReSharper disable once CppTooWideScopeInitStatement
|
||||
constexpr std::size_t vector_size = 8;
|
||||
constexpr std::size_t block_size = vector_size * 4;
|
||||
for (std::size_t i = 0; i < Rows; ++i)
|
||||
{
|
||||
Type* c_row = result_mat_data + i * OtherColumns;
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
auto* c_row = reinterpret_cast<float*>(result_mat_data + i * OtherColumns);
|
||||
std::size_t j = 0;
|
||||
for (; j + block_size <= OtherColumns; j += block_size)
|
||||
{
|
||||
const auto aik = static_cast<float>(this_mat_data[i * Columns + k]);
|
||||
const __m256 aik_vec = _mm256_set1_ps(aik);
|
||||
const auto* b_row = reinterpret_cast<const float*>(other_mat_data + k * OtherColumns);
|
||||
|
||||
std::size_t j = 0;
|
||||
for (; j + vector_size <= OtherColumns; j += vector_size)
|
||||
__m256 cvec0 = _mm256_setzero_ps();
|
||||
__m256 cvec1 = _mm256_setzero_ps();
|
||||
__m256 cvec2 = _mm256_setzero_ps();
|
||||
__m256 cvec3 = _mm256_setzero_ps();
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
{
|
||||
__m256 cvec = _mm256_loadu_ps(c_row + j);
|
||||
const __m256 aik_vec = _mm256_set1_ps(this_mat_data[i * Columns + k]);
|
||||
const auto* b_row = other_mat_data + k * OtherColumns + j;
|
||||
cvec0 = _mm256_fmadd_ps(_mm256_loadu_ps(b_row), aik_vec, cvec0);
|
||||
cvec1 = _mm256_fmadd_ps(_mm256_loadu_ps(b_row + vector_size), aik_vec, cvec1);
|
||||
cvec2 = _mm256_fmadd_ps(_mm256_loadu_ps(b_row + vector_size * 2), aik_vec, cvec2);
|
||||
cvec3 = _mm256_fmadd_ps(_mm256_loadu_ps(b_row + vector_size * 3), aik_vec, cvec3);
|
||||
}
|
||||
_mm256_storeu_ps(c_row + j, cvec0);
|
||||
_mm256_storeu_ps(c_row + j + vector_size, cvec1);
|
||||
_mm256_storeu_ps(c_row + j + vector_size * 2, cvec2);
|
||||
_mm256_storeu_ps(c_row + j + vector_size * 3, cvec3);
|
||||
}
|
||||
for (; j + vector_size <= OtherColumns; j += vector_size)
|
||||
{
|
||||
__m256 cvec = _mm256_setzero_ps();
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
{
|
||||
const __m256 aik_vec = _mm256_set1_ps(this_mat_data[i * Columns + k]);
|
||||
const auto* b_row = other_mat_data + k * OtherColumns;
|
||||
const __m256 b_vec = _mm256_loadu_ps(b_row + j);
|
||||
cvec = _mm256_fmadd_ps(b_vec, aik_vec, cvec);
|
||||
|
||||
_mm256_storeu_ps(c_row + j, cvec);
|
||||
}
|
||||
for (; j < OtherColumns; ++j)
|
||||
c_row[j] += aik * b_row[j];
|
||||
_mm256_storeu_ps(c_row + j, cvec);
|
||||
}
|
||||
for (; j < OtherColumns; ++j)
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
c_row[j] += this_mat_data[i * Columns + k] * other_mat_data[k * OtherColumns + j];
|
||||
}
|
||||
}
|
||||
else if (std::is_same_v<Type, double>)
|
||||
{ // double
|
||||
// ReSharper disable once CppTooWideScopeInitStatement
|
||||
{
|
||||
constexpr std::size_t vector_size = 4;
|
||||
constexpr std::size_t block_size = vector_size * 4;
|
||||
for (std::size_t i = 0; i < Rows; ++i)
|
||||
{
|
||||
Type* c_row = result_mat_data + i * OtherColumns;
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
auto* c_row = reinterpret_cast<double*>(result_mat_data + i * OtherColumns);
|
||||
std::size_t j = 0;
|
||||
for (; j + block_size <= OtherColumns; j += block_size)
|
||||
{
|
||||
const auto aik = static_cast<double>(this_mat_data[i * Columns + k]);
|
||||
const __m256d aik_vec = _mm256_set1_pd(aik);
|
||||
const auto* b_row = reinterpret_cast<const double*>(other_mat_data + k * OtherColumns);
|
||||
|
||||
std::size_t j = 0;
|
||||
for (; j + vector_size <= OtherColumns; j += vector_size)
|
||||
__m256d cvec0 = _mm256_setzero_pd();
|
||||
__m256d cvec1 = _mm256_setzero_pd();
|
||||
__m256d cvec2 = _mm256_setzero_pd();
|
||||
__m256d cvec3 = _mm256_setzero_pd();
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
{
|
||||
__m256d cvec = _mm256_loadu_pd(c_row + j);
|
||||
const __m256d aik_vec = _mm256_set1_pd(this_mat_data[i * Columns + k]);
|
||||
const auto* b_row = other_mat_data + k * OtherColumns + j;
|
||||
cvec0 = _mm256_fmadd_pd(_mm256_loadu_pd(b_row), aik_vec, cvec0);
|
||||
cvec1 = _mm256_fmadd_pd(_mm256_loadu_pd(b_row + vector_size), aik_vec, cvec1);
|
||||
cvec2 = _mm256_fmadd_pd(_mm256_loadu_pd(b_row + vector_size * 2), aik_vec, cvec2);
|
||||
cvec3 = _mm256_fmadd_pd(_mm256_loadu_pd(b_row + vector_size * 3), aik_vec, cvec3);
|
||||
}
|
||||
_mm256_storeu_pd(c_row + j, cvec0);
|
||||
_mm256_storeu_pd(c_row + j + vector_size, cvec1);
|
||||
_mm256_storeu_pd(c_row + j + vector_size * 2, cvec2);
|
||||
_mm256_storeu_pd(c_row + j + vector_size * 3, cvec3);
|
||||
}
|
||||
for (; j + vector_size <= OtherColumns; j += vector_size)
|
||||
{
|
||||
__m256d cvec = _mm256_setzero_pd();
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
{
|
||||
const __m256d aik_vec = _mm256_set1_pd(this_mat_data[i * Columns + k]);
|
||||
const auto* b_row = other_mat_data + k * OtherColumns;
|
||||
const __m256d b_vec = _mm256_loadu_pd(b_row + j);
|
||||
cvec = _mm256_fmadd_pd(b_vec, aik_vec, cvec);
|
||||
|
||||
_mm256_storeu_pd(c_row + j, cvec);
|
||||
}
|
||||
for (; j < OtherColumns; ++j)
|
||||
c_row[j] += aik * b_row[j];
|
||||
_mm256_storeu_pd(c_row + j, cvec);
|
||||
}
|
||||
for (; j < OtherColumns; ++j)
|
||||
for (std::size_t k = 0; k < Columns; ++k)
|
||||
c_row[j] += this_mat_data[i * Columns + k] * other_mat_data[k * OtherColumns + j];
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "omath/projectile_prediction/proj_pred_engine.hpp"
|
||||
#include "omath/projectile_prediction/projectile.hpp"
|
||||
#include "omath/projectile_prediction/target.hpp"
|
||||
#include <cmath>
|
||||
#include <optional>
|
||||
|
||||
namespace omath::projectile_prediction
|
||||
@@ -17,9 +18,8 @@ namespace omath::projectile_prediction
|
||||
concept PredEngineConcept =
|
||||
requires(const Projectile<ArithmeticType>& projectile, const Target<ArithmeticType>& target,
|
||||
const Vector3<ArithmeticType>& vec_a, const Vector3<ArithmeticType>& vec_b,
|
||||
Vector3<ArithmeticType> v3,
|
||||
ArithmeticType pitch, ArithmeticType yaw, ArithmeticType time, ArithmeticType gravity,
|
||||
std::optional<ArithmeticType> maybe_pitch) {
|
||||
Vector3<ArithmeticType> v3, ArithmeticType pitch, ArithmeticType yaw, ArithmeticType time,
|
||||
ArithmeticType gravity, std::optional<ArithmeticType> maybe_pitch) {
|
||||
{
|
||||
T::predict_projectile_position(projectile, pitch, yaw, time, gravity)
|
||||
} -> std::same_as<Vector3<ArithmeticType>>;
|
||||
@@ -44,8 +44,7 @@ namespace omath::projectile_prediction
|
||||
class ProjPredEngineLegacy final : public ProjPredEngineInterface<ArithmeticType>
|
||||
{
|
||||
public:
|
||||
explicit ProjPredEngineLegacy(const ArithmeticType gravity_constant,
|
||||
const ArithmeticType simulation_time_step,
|
||||
explicit ProjPredEngineLegacy(const ArithmeticType gravity_constant, const ArithmeticType simulation_time_step,
|
||||
const ArithmeticType maximum_simulation_time,
|
||||
const ArithmeticType distance_tolerance)
|
||||
: m_gravity_constant(gravity_constant), m_simulation_time_step(simulation_time_step),
|
||||
@@ -54,8 +53,9 @@ namespace omath::projectile_prediction
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
std::optional<Vector3<ArithmeticType>> maybe_calculate_aim_point(
|
||||
const Projectile<ArithmeticType>& projectile, const Target<ArithmeticType>& target) const override
|
||||
std::optional<Vector3<ArithmeticType>>
|
||||
maybe_calculate_aim_point(const Projectile<ArithmeticType>& projectile,
|
||||
const Target<ArithmeticType>& target) const override
|
||||
{
|
||||
const auto solution = find_solution(projectile, target);
|
||||
if (!solution)
|
||||
@@ -66,15 +66,16 @@ namespace omath::projectile_prediction
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
std::optional<AimAngles<ArithmeticType>> maybe_calculate_aim_angles(
|
||||
const Projectile<ArithmeticType>& projectile, const Target<ArithmeticType>& target) const override
|
||||
std::optional<AimAngles<ArithmeticType>>
|
||||
maybe_calculate_aim_angles(const Projectile<ArithmeticType>& projectile,
|
||||
const Target<ArithmeticType>& target) const override
|
||||
{
|
||||
const auto solution = find_solution(projectile, target);
|
||||
if (!solution)
|
||||
return std::nullopt;
|
||||
|
||||
const auto yaw = EngineTrait::calc_direct_yaw_angle(
|
||||
projectile.m_origin + projectile.m_launch_offset, solution->predicted_target_position);
|
||||
const auto yaw = EngineTrait::calc_direct_yaw_angle(projectile.m_origin + projectile.m_launch_offset,
|
||||
solution->predicted_target_position);
|
||||
return AimAngles<ArithmeticType>{solution->pitch, yaw};
|
||||
}
|
||||
|
||||
@@ -89,23 +90,39 @@ namespace omath::projectile_prediction
|
||||
std::optional<Solution> find_solution(const Projectile<ArithmeticType>& projectile,
|
||||
const Target<ArithmeticType>& target) const
|
||||
{
|
||||
for (ArithmeticType time = ArithmeticType{0}; time < m_maximum_simulation_time;
|
||||
time += m_simulation_time_step)
|
||||
if (!std::isfinite(m_simulation_time_step) || m_simulation_time_step <= ArithmeticType{0}
|
||||
|| !std::isfinite(m_maximum_simulation_time) || m_maximum_simulation_time < ArithmeticType{0}
|
||||
|| !std::isfinite(projectile.m_launch_speed) || projectile.m_launch_speed <= ArithmeticType{0}
|
||||
|| !(m_distance_tolerance >= ArithmeticType{0})) [[unlikely]]
|
||||
return std::nullopt;
|
||||
|
||||
for (ArithmeticType time = ArithmeticType{0}; time <= m_maximum_simulation_time;)
|
||||
{
|
||||
const auto predicted_target_position =
|
||||
EngineTrait::predict_target_position(target, time, m_gravity_constant);
|
||||
|
||||
const auto projectile_pitch =
|
||||
maybe_calculate_projectile_launch_pitch_angle(projectile, predicted_target_position);
|
||||
if (is_target_potentially_reachable(projectile, predicted_target_position, time))
|
||||
{
|
||||
const auto projectile_pitch =
|
||||
maybe_calculate_projectile_launch_pitch_angle(projectile, predicted_target_position);
|
||||
|
||||
if (!projectile_pitch.has_value()) [[unlikely]]
|
||||
continue;
|
||||
if (projectile_pitch.has_value()) [[likely]]
|
||||
{
|
||||
const auto yaw = EngineTrait::calc_direct_yaw_angle(
|
||||
projectile.m_origin + projectile.m_launch_offset, predicted_target_position);
|
||||
|
||||
if (!is_projectile_reached_target(predicted_target_position, projectile, projectile_pitch.value(),
|
||||
time))
|
||||
continue;
|
||||
if (is_projectile_reached_target(predicted_target_position, projectile,
|
||||
projectile_pitch.value(), yaw, time))
|
||||
return Solution{predicted_target_position, projectile_pitch.value()};
|
||||
}
|
||||
}
|
||||
|
||||
return Solution{predicted_target_position, projectile_pitch.value()};
|
||||
if (time == m_maximum_simulation_time)
|
||||
break;
|
||||
const auto next_time = time + m_simulation_time_step;
|
||||
if (!(next_time > time)) [[unlikely]]
|
||||
break;
|
||||
time = next_time < m_maximum_simulation_time ? next_time : m_maximum_simulation_time;
|
||||
}
|
||||
return std::nullopt;
|
||||
}
|
||||
@@ -144,29 +161,46 @@ namespace omath::projectile_prediction
|
||||
const auto distance2d = EngineTrait::calc_vector_2d_distance(delta);
|
||||
const auto distance2d_sqr = distance2d * distance2d;
|
||||
const auto launch_speed_sqr = projectile.m_launch_speed * projectile.m_launch_speed;
|
||||
const auto ballistic_term =
|
||||
bullet_gravity * distance2d_sqr
|
||||
+ ArithmeticType{2} * EngineTrait::get_vector_height_coordinate(delta) * launch_speed_sqr;
|
||||
|
||||
ArithmeticType root = launch_speed_sqr * launch_speed_sqr
|
||||
- bullet_gravity
|
||||
* (bullet_gravity * distance2d_sqr
|
||||
+ ArithmeticType{2} * EngineTrait::get_vector_height_coordinate(delta)
|
||||
* launch_speed_sqr);
|
||||
ArithmeticType root = launch_speed_sqr * launch_speed_sqr - bullet_gravity * ballistic_term;
|
||||
|
||||
if (root < ArithmeticType{0}) [[unlikely]]
|
||||
return std::nullopt;
|
||||
|
||||
root = std::sqrt(root);
|
||||
const ArithmeticType angle = std::atan((launch_speed_sqr - root) / (bullet_gravity * distance2d));
|
||||
// This rationalized form avoids cancellation in launch_speed_sqr - root for low-angle shots.
|
||||
const ArithmeticType angle = std::atan2(ballistic_term, distance2d * (launch_speed_sqr + root));
|
||||
|
||||
return angles::radians_to_degrees(angle);
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
bool is_projectile_reached_target(const Vector3<ArithmeticType>& target_position,
|
||||
const Projectile<ArithmeticType>& projectile,
|
||||
const ArithmeticType pitch, const ArithmeticType time) const noexcept
|
||||
bool is_target_potentially_reachable(const Projectile<ArithmeticType>& projectile,
|
||||
const Vector3<ArithmeticType>& target_position,
|
||||
const ArithmeticType time) const noexcept
|
||||
{
|
||||
if constexpr (requires {
|
||||
{
|
||||
EngineTrait::can_projectile_reach_target_at_time(
|
||||
projectile, target_position, time, m_gravity_constant, m_distance_tolerance)
|
||||
} -> std::same_as<bool>;
|
||||
requires noexcept(EngineTrait::can_projectile_reach_target_at_time(
|
||||
projectile, target_position, time, m_gravity_constant, m_distance_tolerance));
|
||||
})
|
||||
return EngineTrait::can_projectile_reach_target_at_time(projectile, target_position, time,
|
||||
m_gravity_constant, m_distance_tolerance);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
bool is_projectile_reached_target(const Vector3<ArithmeticType>& target_position,
|
||||
const Projectile<ArithmeticType>& projectile, const ArithmeticType pitch,
|
||||
const ArithmeticType yaw, const ArithmeticType time) const noexcept
|
||||
{
|
||||
const auto yaw = EngineTrait::calc_direct_yaw_angle(
|
||||
projectile.m_origin + projectile.m_launch_offset, target_position);
|
||||
const auto projectile_position =
|
||||
EngineTrait::predict_projectile_position(projectile, pitch, yaw, time, m_gravity_constant);
|
||||
|
||||
|
||||
@@ -6,7 +6,9 @@
|
||||
#include "omath/internal/constexpr_math.hpp"
|
||||
#include "omath/trigonometry/angles.hpp"
|
||||
#include <algorithm>
|
||||
#include <compare>
|
||||
#include <format>
|
||||
#include <type_traits>
|
||||
#include <utility>
|
||||
|
||||
namespace omath
|
||||
@@ -18,7 +20,7 @@ namespace omath
|
||||
};
|
||||
|
||||
template<class Type = float, Type min = Type(0), Type max = Type(360), AngleFlags flags = AngleFlags::Normalized>
|
||||
requires std::is_arithmetic_v<Type>
|
||||
requires std::is_floating_point_v<Type>
|
||||
class Angle
|
||||
{
|
||||
Type m_angle;
|
||||
@@ -43,7 +45,7 @@ namespace omath
|
||||
{
|
||||
return Angle{degrees};
|
||||
}
|
||||
constexpr Angle() noexcept: m_angle(0)
|
||||
constexpr Angle() noexcept: Angle(Type{0})
|
||||
{
|
||||
}
|
||||
[[nodiscard]]
|
||||
@@ -52,6 +54,30 @@ namespace omath
|
||||
return Angle{angles::radians_to_degrees<Type>(degrees)};
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr static Angle from_asin(const Type& value) noexcept
|
||||
{
|
||||
return from_radians(internal::asin(value));
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr static Angle from_acos(const Type& value) noexcept
|
||||
{
|
||||
return from_radians(internal::acos(value));
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr static Angle from_atan(const Type& value) noexcept
|
||||
{
|
||||
return from_radians(internal::atan(value));
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr static Angle from_atan2(const Type& y, const Type& x) noexcept
|
||||
{
|
||||
return from_radians(internal::atan2(y, x));
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr const Type& operator*() const noexcept
|
||||
{
|
||||
@@ -88,12 +114,6 @@ namespace omath
|
||||
return internal::tan(as_radians());
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr Type atan() const noexcept
|
||||
{
|
||||
return internal::atan(as_radians());
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
constexpr Type cot() const noexcept
|
||||
{
|
||||
@@ -121,7 +141,8 @@ namespace omath
|
||||
|
||||
constexpr Angle& operator-=(const Angle& other) noexcept
|
||||
{
|
||||
return operator+=(-other);
|
||||
*this = Angle{m_angle - other.m_angle};
|
||||
return *this;
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
@@ -142,7 +163,7 @@ namespace omath
|
||||
[[nodiscard]]
|
||||
constexpr Angle operator-(const Angle& other) const noexcept
|
||||
{
|
||||
return operator+(-other);
|
||||
return Angle{m_angle - other.m_angle};
|
||||
}
|
||||
|
||||
[[nodiscard]]
|
||||
@@ -172,7 +193,6 @@ struct std::formatter<omath::Angle<T, MinV, MaxV, F>, char> final // NOLINT(*-dc
|
||||
return std::format_to(ctx.out(), "{}deg", a.as_degrees());
|
||||
}
|
||||
};
|
||||
|
||||
// wchar_t formatter
|
||||
template<class T, T MinV, T MaxV, omath::AngleFlags F>
|
||||
struct std::formatter<omath::Angle<T, MinV, MaxV, F>, wchar_t> final // NOLINT(*-dcl58-cpp)
|
||||
@@ -193,24 +213,3 @@ struct std::formatter<omath::Angle<T, MinV, MaxV, F>, wchar_t> final // NOLINT(*
|
||||
return std::format_to(ctx.out(), L"{}deg", a.as_degrees());
|
||||
}
|
||||
};
|
||||
|
||||
// wchar_t formatter
|
||||
template<class T, T MinV, T MaxV, omath::AngleFlags F>
|
||||
struct std::formatter<omath::Angle<T, MinV, MaxV, F>, char8_t> final // NOLINT(*-dcl58-cpp)
|
||||
{
|
||||
using AngleT = omath::Angle<T, MinV, MaxV, F>;
|
||||
|
||||
[[nodiscard]]
|
||||
static constexpr auto parse(std::wformat_parse_context& ctx)
|
||||
{
|
||||
return ctx.begin();
|
||||
}
|
||||
|
||||
template<class FormatContext>
|
||||
[[nodiscard]]
|
||||
auto format(const AngleT& a, FormatContext& ctx) const
|
||||
{
|
||||
static_assert(std::is_same_v<typename FormatContext::char_type, char8_t>);
|
||||
return std::format_to(ctx.out(), u8"{}deg", a.as_degrees());
|
||||
}
|
||||
};
|
||||
|
||||
@@ -48,10 +48,10 @@ namespace omath::angles
|
||||
}
|
||||
|
||||
template<class Type>
|
||||
requires std::is_arithmetic_v<Type>
|
||||
requires std::is_floating_point_v<Type>
|
||||
[[nodiscard]] constexpr Type wrap_angle(const Type& angle, const Type& min, const Type& max) noexcept
|
||||
{
|
||||
if (angle <= max && angle >= min)
|
||||
if (angle < max && angle >= min)
|
||||
return angle;
|
||||
|
||||
const Type range = max - min;
|
||||
|
||||
@@ -54,9 +54,6 @@ namespace omath
|
||||
return {value, Length - 1};
|
||||
}
|
||||
};
|
||||
template<std::size_t N>
|
||||
ConstevalPattern(const char (&)[N]) -> ConstevalPattern<N>;
|
||||
|
||||
[[nodiscard]]
|
||||
static std::span<std::byte>::iterator scan_for_pattern(const std::span<std::byte>& range,
|
||||
const std::string_view& pattern);
|
||||
|
||||
@@ -177,9 +177,7 @@ if command -v genhtml >/dev/null 2>&1; then
|
||||
--title "Omath Coverage Report" \
|
||||
--show-details \
|
||||
--legend \
|
||||
--demangle-cpp \
|
||||
--num-spaces 4 \
|
||||
--sort \
|
||||
--function-coverage \
|
||||
--branch-coverage
|
||||
|
||||
|
||||
+331
-86
@@ -2,6 +2,7 @@
|
||||
// Created by orange on 13.03.2026.
|
||||
//
|
||||
#include "omath/hud/entity_overlay.hpp"
|
||||
#include <limits>
|
||||
|
||||
namespace omath::hud
|
||||
{
|
||||
@@ -20,6 +21,20 @@ namespace omath::hud
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
EntityOverlay& EntityOverlay::add_2d_box(const Color& box_color, const Gradient& fill_gradient,
|
||||
const Color& outline_color, const float thickness)
|
||||
{
|
||||
const auto points = m_canvas.as_array();
|
||||
|
||||
if (outline_color.value().w > 0.f)
|
||||
m_renderer->add_polyline({points.data(), points.size()}, outline_color, thickness + 2.f);
|
||||
|
||||
m_renderer->add_polyline({points.data(), points.size()}, box_color, thickness);
|
||||
m_renderer->add_gradient_rectangle(m_canvas.top_left_corner, m_canvas.bottom_right_corner, fill_gradient);
|
||||
|
||||
return *this;
|
||||
}
|
||||
EntityOverlay& EntityOverlay::add_cornered_2d_box(const Color& box_color, const Color& fill_color,
|
||||
const Color& outline_color, const float corner_ratio_len,
|
||||
const float thickness)
|
||||
@@ -38,11 +53,9 @@ namespace omath::hud
|
||||
};
|
||||
|
||||
// Left Side
|
||||
draw_corner_line(m_canvas.top_left_corner,
|
||||
m_canvas.top_left_corner + Vector2<float>{corner_line_length, 0.f});
|
||||
draw_corner_line(m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2<float>{corner_line_length, 0.f});
|
||||
|
||||
draw_corner_line(m_canvas.top_left_corner,
|
||||
m_canvas.top_left_corner + Vector2<float>{0.f, corner_line_length});
|
||||
draw_corner_line(m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2<float>{0.f, corner_line_length});
|
||||
|
||||
draw_corner_line(m_canvas.bottom_left_corner,
|
||||
m_canvas.bottom_left_corner - Vector2<float>{0.f, corner_line_length});
|
||||
@@ -64,76 +77,84 @@ namespace omath::hud
|
||||
|
||||
return *this;
|
||||
}
|
||||
EntityOverlay& EntityOverlay::add_right_bar(const Color& color, const Color& outline_color, const Color& bg_color,
|
||||
const float width, float ratio, const float offset)
|
||||
EntityOverlay& EntityOverlay::add_right_bar(const widget::BarPaint& color, const Color& outline_color,
|
||||
const Color& bg_color, const float width, float ratio,
|
||||
const float offset, const std::optional<widget::Glow>& glow)
|
||||
{
|
||||
ratio = std::clamp(ratio, 0.f, 1.f);
|
||||
const auto max_bar_height = std::abs(m_canvas.top_right_corner.y - m_canvas.bottom_right_corner.y);
|
||||
|
||||
const auto bar_start = Vector2<float>{m_text_cursor_right.x + offset, m_canvas.bottom_right_corner.y};
|
||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(width, -max_bar_height), bg_color);
|
||||
const auto bar_min = bar_start - Vector2<float>{0.f, max_bar_height};
|
||||
const auto bar_max = bar_start + Vector2<float>{width, 0.f};
|
||||
const auto fill_min = bar_start - Vector2<float>{0.f, max_bar_height * ratio};
|
||||
m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color);
|
||||
|
||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(width, -max_bar_height * ratio), color);
|
||||
m_renderer->add_rectangle(bar_start - Vector2<float>(1.f, 0.f),
|
||||
bar_start + Vector2<float>(width, -max_bar_height), outline_color);
|
||||
draw_glow_rectangle(fill_min, bar_max, glow);
|
||||
draw_filled_rectangle(fill_min, bar_max, resolve_bar_paint(color, ratio, true));
|
||||
m_renderer->add_rectangle(bar_min, bar_max, outline_color);
|
||||
|
||||
m_text_cursor_right.x += offset + width;
|
||||
|
||||
return *this;
|
||||
}
|
||||
EntityOverlay& EntityOverlay::add_left_bar(const Color& color, const Color& outline_color, const Color& bg_color,
|
||||
const float width, float ratio, const float offset)
|
||||
EntityOverlay& EntityOverlay::add_left_bar(const widget::BarPaint& color, const Color& outline_color,
|
||||
const Color& bg_color, const float width, float ratio,
|
||||
const float offset, const std::optional<widget::Glow>& glow)
|
||||
{
|
||||
ratio = std::clamp(ratio, 0.f, 1.f);
|
||||
const auto max_bar_height = std::abs(m_canvas.top_left_corner.y - m_canvas.bottom_right_corner.y);
|
||||
|
||||
const auto bar_start = Vector2<float>{m_text_cursor_left.x - (offset + width), m_canvas.bottom_left_corner.y};
|
||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(width, -max_bar_height), bg_color);
|
||||
const auto bar_min = bar_start - Vector2<float>{0.f, max_bar_height};
|
||||
const auto bar_max = bar_start + Vector2<float>{width, 0.f};
|
||||
const auto fill_min = bar_start - Vector2<float>{0.f, max_bar_height * ratio};
|
||||
m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color);
|
||||
|
||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(width, -max_bar_height * ratio), color);
|
||||
m_renderer->add_rectangle(bar_start - Vector2<float>(1.f, 0.f),
|
||||
bar_start + Vector2<float>(width, -max_bar_height), outline_color);
|
||||
draw_glow_rectangle(fill_min, bar_max, glow);
|
||||
draw_filled_rectangle(fill_min, bar_max, resolve_bar_paint(color, ratio, true));
|
||||
m_renderer->add_rectangle(bar_min, bar_max, outline_color);
|
||||
|
||||
m_text_cursor_left.x -= offset + width;
|
||||
|
||||
return *this;
|
||||
}
|
||||
EntityOverlay& EntityOverlay::add_right_label(const Color& color, const float offset,
|
||||
const widget::Outlined outlined,
|
||||
const std::string_view& text)
|
||||
EntityOverlay& EntityOverlay::add_right_label(const widget::Paint& color, const float offset,
|
||||
const widget::Outlined outlined, const std::string_view& text,
|
||||
const std::optional<widget::Glow>& glow)
|
||||
{
|
||||
if (outlined == widget::Outlined::On)
|
||||
draw_outlined_text(m_text_cursor_right + Vector2<float>{offset, 0.f}, color, text);
|
||||
else
|
||||
m_renderer->add_text(m_text_cursor_right + Vector2<float>{offset, 0.f}, color, text.data());
|
||||
draw_label(m_text_cursor_right + Vector2<float>{offset, 0.f}, color, outlined, text, glow);
|
||||
|
||||
m_text_cursor_right.y += m_renderer->calc_text_size(text.data()).y;
|
||||
|
||||
return *this;
|
||||
}
|
||||
EntityOverlay& EntityOverlay::add_top_label(const Color& color, const float offset, const widget::Outlined outlined,
|
||||
const std::string_view text)
|
||||
EntityOverlay& EntityOverlay::add_top_label(const widget::Paint& color, const float offset,
|
||||
const widget::Outlined outlined, const std::string_view text,
|
||||
const std::optional<widget::Glow>& glow)
|
||||
{
|
||||
m_text_cursor_top.y -= m_renderer->calc_text_size(text.data()).y;
|
||||
|
||||
if (outlined == widget::Outlined::On)
|
||||
draw_outlined_text(m_text_cursor_top + Vector2<float>{0.f, -offset}, color, text);
|
||||
else
|
||||
m_renderer->add_text(m_text_cursor_top + Vector2<float>{0.f, -offset}, color, text.data());
|
||||
draw_label(m_text_cursor_top + Vector2<float>{0.f, -offset}, color, outlined, text, glow);
|
||||
|
||||
return *this;
|
||||
}
|
||||
EntityOverlay& EntityOverlay::add_top_bar(const Color& color, const Color& outline_color, const Color& bg_color,
|
||||
const float height, float ratio, const float offset)
|
||||
EntityOverlay& EntityOverlay::add_top_bar(const widget::BarPaint& color, const Color& outline_color,
|
||||
const Color& bg_color, const float height, float ratio,
|
||||
const float offset, const std::optional<widget::Glow>& glow)
|
||||
{
|
||||
ratio = std::clamp(ratio, 0.f, 1.f);
|
||||
const auto max_bar_width = std::abs(m_canvas.top_left_corner.x - m_canvas.bottom_right_corner.x);
|
||||
|
||||
const auto bar_start = Vector2<float>{m_canvas.top_left_corner.x, m_text_cursor_top.y - offset};
|
||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, -height), bg_color);
|
||||
const auto bar_min = bar_start - Vector2<float>{0.f, height};
|
||||
const auto bar_max = bar_start + Vector2<float>{max_bar_width, 0.f};
|
||||
const auto fill_max = Vector2<float>{bar_start.x + max_bar_width * ratio, bar_start.y};
|
||||
m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color);
|
||||
|
||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width * ratio, -height), color);
|
||||
m_renderer->add_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, -height), outline_color);
|
||||
draw_glow_rectangle(bar_min, fill_max, glow);
|
||||
draw_filled_rectangle(bar_min, fill_max, resolve_bar_paint(color, ratio, false));
|
||||
m_renderer->add_rectangle(bar_min, bar_max, outline_color);
|
||||
|
||||
m_text_cursor_top.y -= offset + height;
|
||||
|
||||
@@ -316,6 +337,14 @@ namespace omath::hud
|
||||
return *this;
|
||||
}
|
||||
|
||||
EntityOverlay& EntityOverlay::add_skeleton(const std::span<const widget::Bone> bones, const Color& color,
|
||||
const float thickness)
|
||||
{
|
||||
for (const auto& bone : bones)
|
||||
m_renderer->add_line(bone.start, bone.end, color, thickness);
|
||||
return *this;
|
||||
}
|
||||
|
||||
void EntityOverlay::draw_dashed_line(const Vector2<float>& from, const Vector2<float>& to, const Color& color,
|
||||
const float dash_len, const float gap_len, const float thickness) const
|
||||
{
|
||||
@@ -366,84 +395,265 @@ namespace omath::hud
|
||||
return *this;
|
||||
}
|
||||
|
||||
void EntityOverlay::draw_outlined_text(const Vector2<float>& position, const Color& color,
|
||||
const std::string_view& text)
|
||||
void EntityOverlay::draw_label(const Vector2<float>& position, const widget::Paint& paint,
|
||||
const widget::Outlined outlined, const std::string_view& text,
|
||||
const std::optional<widget::Glow>& glow)
|
||||
{
|
||||
static constexpr std::array outline_offsets = {
|
||||
Vector2<float>{-1, -1}, Vector2<float>{-1, 0}, Vector2<float>{-1, 1}, Vector2<float>{0, -1},
|
||||
Vector2<float>{0, 1}, Vector2<float>{1, -1}, Vector2<float>{1, 0}, Vector2<float>{1, 1}};
|
||||
if (glow)
|
||||
{
|
||||
const int radius = static_cast<int>(std::ceil(std::max(glow->radius, 0.f)));
|
||||
for (int layer = radius; layer > 0; --layer)
|
||||
{
|
||||
const float alpha = glow->color.value().w * std::max(glow->intensity, 0.f)
|
||||
* (1.f - static_cast<float>(layer - 1) / static_cast<float>(radius + 1));
|
||||
const auto value = glow->color.value();
|
||||
const Color color{value.x, value.y, value.z, alpha / static_cast<float>(radius)};
|
||||
for (int x = -layer; x <= layer; ++x)
|
||||
{
|
||||
m_renderer->add_text(position + Vector2<float>{static_cast<float>(x), static_cast<float>(-layer)},
|
||||
color, text);
|
||||
m_renderer->add_text(position + Vector2<float>{static_cast<float>(x), static_cast<float>(layer)},
|
||||
color, text);
|
||||
}
|
||||
for (int y = -layer + 1; y < layer; ++y)
|
||||
{
|
||||
m_renderer->add_text(position + Vector2<float>{static_cast<float>(-layer), static_cast<float>(y)},
|
||||
color, text);
|
||||
m_renderer->add_text(position + Vector2<float>{static_cast<float>(layer), static_cast<float>(y)},
|
||||
color, text);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (const auto& outline_offset : outline_offsets)
|
||||
m_renderer->add_text(position + outline_offset, Color{0.f, 0.f, 0.f, 1.f}, text.data());
|
||||
m_renderer->add_text(position, color, text.data());
|
||||
if (outlined == widget::Outlined::On)
|
||||
{
|
||||
static constexpr std::array outline_offsets = {
|
||||
Vector2<float>{-1, -1}, Vector2<float>{-1, 0}, Vector2<float>{-1, 1}, Vector2<float>{0, -1},
|
||||
Vector2<float>{0, 1}, Vector2<float>{1, -1}, Vector2<float>{1, 0}, Vector2<float>{1, 1}};
|
||||
|
||||
for (const auto& outline_offset : outline_offsets)
|
||||
m_renderer->add_text(position + outline_offset, Color{0.f, 0.f, 0.f, 1.f}, text);
|
||||
}
|
||||
|
||||
std::visit(
|
||||
widget::Overloaded{
|
||||
[&](const Color& color)
|
||||
{
|
||||
m_renderer->add_text(position, color, text);
|
||||
},
|
||||
[&](const Gradient& gradient)
|
||||
{
|
||||
m_renderer->add_gradient_text(position, gradient, text);
|
||||
},
|
||||
},
|
||||
paint);
|
||||
}
|
||||
EntityOverlay& EntityOverlay::add_bottom_bar(const Color& color, const Color& outline_color, const Color& bg_color,
|
||||
const float height, float ratio, const float offset)
|
||||
|
||||
void EntityOverlay::draw_glow_polyline(const std::span<const Vector2<float>>& points, const widget::Glow& glow,
|
||||
const float thickness) const
|
||||
{
|
||||
const int radius = static_cast<int>(std::ceil(std::max(glow.radius, 0.f)));
|
||||
const auto value = glow.color.value();
|
||||
for (int layer = radius; layer > 0; --layer)
|
||||
{
|
||||
const float falloff = 1.f - static_cast<float>(layer - 1) / static_cast<float>(radius + 1);
|
||||
const Color color{value.x, value.y, value.z,
|
||||
value.w * std::max(glow.intensity, 0.f) * falloff / static_cast<float>(radius)};
|
||||
m_renderer->add_polyline(points, color, thickness + static_cast<float>(layer) * 2.f);
|
||||
}
|
||||
}
|
||||
|
||||
void EntityOverlay::draw_glow_line(const Vector2<float>& from, const Vector2<float>& to, const widget::Glow& glow,
|
||||
const float thickness) const
|
||||
{
|
||||
const int radius = static_cast<int>(std::ceil(std::max(glow.radius, 0.f)));
|
||||
const auto value = glow.color.value();
|
||||
for (int layer = radius; layer > 0; --layer)
|
||||
{
|
||||
const float falloff = 1.f - static_cast<float>(layer - 1) / static_cast<float>(radius + 1);
|
||||
const Color color{value.x, value.y, value.z,
|
||||
value.w * std::max(glow.intensity, 0.f) * falloff / static_cast<float>(radius)};
|
||||
m_renderer->add_line(from, to, color, thickness + static_cast<float>(layer) * 2.f);
|
||||
}
|
||||
}
|
||||
|
||||
void EntityOverlay::draw_glow_rectangle(const Vector2<float>& min, const Vector2<float>& max,
|
||||
const std::optional<widget::Glow>& glow) const
|
||||
{
|
||||
if (!glow || glow->radius <= 0.f)
|
||||
return;
|
||||
|
||||
const std::array points = {
|
||||
Vector2<float>{std::min(min.x, max.x), std::min(min.y, max.y)},
|
||||
Vector2<float>{std::max(min.x, max.x), std::min(min.y, max.y)},
|
||||
Vector2<float>{std::max(min.x, max.x), std::max(min.y, max.y)},
|
||||
Vector2<float>{std::min(min.x, max.x), std::max(min.y, max.y)},
|
||||
};
|
||||
draw_glow_polyline(points, *glow, 1.f);
|
||||
}
|
||||
|
||||
void EntityOverlay::draw_canvas_glow(const widget::CanvasGlow& canvas_glow) const
|
||||
{
|
||||
const int layers = std::max(canvas_glow.layers, 2);
|
||||
const auto min = m_canvas.top_left_corner;
|
||||
const auto max = m_canvas.bottom_right_corner;
|
||||
const auto value = canvas_glow.glow.color.value();
|
||||
const float intensity = std::max(canvas_glow.glow.intensity, 0.f);
|
||||
|
||||
constexpr int corner_segments = 12;
|
||||
const float max_rounding = std::min(std::abs(max.x - min.x), std::abs(max.y - min.y)) * 0.5f;
|
||||
const float rounding = std::clamp(canvas_glow.rounding, 0.f, max_rounding);
|
||||
const float extent = std::max(canvas_glow.glow.radius, 0.f);
|
||||
const float stroke = std::max(extent / static_cast<float>(layers - 1) * 2.f, 1.f);
|
||||
for (int layer = 0; layer < layers; ++layer)
|
||||
{
|
||||
const float progress = static_cast<float>(layer) / static_cast<float>(layers - 1);
|
||||
const float expansion = extent * (1.f - progress);
|
||||
const float falloff = progress * progress * (3.f - 2.f * progress);
|
||||
const Color color{value.x, value.y, value.z, value.w * intensity * falloff * 0.35f};
|
||||
const auto expanded_min = min - Vector2<float>{expansion, expansion};
|
||||
const auto expanded_max = max + Vector2<float>{expansion, expansion};
|
||||
const float expanded_rounding = rounding + expansion;
|
||||
const std::array corner_centers = {
|
||||
expanded_min + Vector2<float>{expanded_rounding, expanded_rounding},
|
||||
Vector2<float>{expanded_max.x - expanded_rounding, expanded_min.y + expanded_rounding},
|
||||
expanded_max - Vector2<float>{expanded_rounding, expanded_rounding},
|
||||
Vector2<float>{expanded_min.x + expanded_rounding, expanded_max.y - expanded_rounding},
|
||||
};
|
||||
std::array<Vector2<float>, corner_segments * 4> points;
|
||||
for (int corner = 0; corner < 4; ++corner)
|
||||
{
|
||||
const float start_angle =
|
||||
std::numbers::pi_v<float> + static_cast<float>(corner) * std::numbers::pi_v<float> * 0.5f;
|
||||
for (int segment = 0; segment < corner_segments; ++segment)
|
||||
{
|
||||
const float arc_progress = static_cast<float>(segment) / static_cast<float>(corner_segments - 1);
|
||||
const float angle = start_angle + arc_progress * std::numbers::pi_v<float> * 0.5f;
|
||||
points[corner * corner_segments + segment] =
|
||||
corner_centers[corner]
|
||||
+ Vector2<float>{std::cos(angle) * expanded_rounding, std::sin(angle) * expanded_rounding};
|
||||
}
|
||||
}
|
||||
constexpr float clip_extent = std::numeric_limits<float>::max() * 0.25f;
|
||||
m_renderer->add_polyline_clipped(points, {-clip_extent, -clip_extent}, {clip_extent, min.y}, color, stroke);
|
||||
m_renderer->add_polyline_clipped(points, {-clip_extent, max.y}, {clip_extent, clip_extent}, color, stroke);
|
||||
m_renderer->add_polyline_clipped(points, {-clip_extent, min.y}, {min.x, max.y}, color, stroke);
|
||||
m_renderer->add_polyline_clipped(points, {max.x, min.y}, {clip_extent, max.y}, color, stroke);
|
||||
}
|
||||
}
|
||||
|
||||
void EntityOverlay::draw_filled_rectangle(const Vector2<float>& min, const Vector2<float>& max,
|
||||
const widget::Paint& paint) const
|
||||
{
|
||||
const Vector2<float> top_left{std::min(min.x, max.x), std::min(min.y, max.y)};
|
||||
const Vector2<float> bottom_right{std::max(min.x, max.x), std::max(min.y, max.y)};
|
||||
std::visit(
|
||||
widget::Overloaded{
|
||||
[&](const Color& color)
|
||||
{
|
||||
m_renderer->add_filled_rectangle(top_left, bottom_right, color);
|
||||
},
|
||||
[&](const Gradient& gradient)
|
||||
{
|
||||
m_renderer->add_gradient_rectangle(top_left, bottom_right, gradient);
|
||||
},
|
||||
},
|
||||
paint);
|
||||
}
|
||||
|
||||
widget::Paint EntityOverlay::resolve_bar_paint(const widget::BarPaint& paint, const float ratio,
|
||||
const bool vertical)
|
||||
{
|
||||
return std::visit(
|
||||
widget::Overloaded{
|
||||
[](const Color& color) -> widget::Paint
|
||||
{
|
||||
return color;
|
||||
},
|
||||
[](const Gradient& gradient) -> widget::Paint
|
||||
{
|
||||
return gradient;
|
||||
},
|
||||
[&](const widget::BarGradient& gradient) -> widget::Paint
|
||||
{
|
||||
const float value = std::clamp(ratio, 0.f, 1.f);
|
||||
const auto current = Color{gradient.empty_color.value() * (1.f - value)
|
||||
+ gradient.full_color.value() * value};
|
||||
if (vertical)
|
||||
return Gradient{current, current, gradient.empty_color, gradient.empty_color};
|
||||
return Gradient{gradient.empty_color, current, current, gradient.empty_color};
|
||||
},
|
||||
},
|
||||
paint);
|
||||
}
|
||||
EntityOverlay& EntityOverlay::add_bottom_bar(const widget::BarPaint& color, const Color& outline_color,
|
||||
const Color& bg_color, const float height, float ratio,
|
||||
const float offset, const std::optional<widget::Glow>& glow)
|
||||
{
|
||||
ratio = std::clamp(ratio, 0.f, 1.f);
|
||||
const auto max_bar_width = std::abs(m_canvas.bottom_right_corner.x - m_canvas.bottom_left_corner.x);
|
||||
|
||||
const auto bar_start = Vector2<float>{m_canvas.bottom_left_corner.x, m_text_cursor_bottom.y + offset};
|
||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, height), bg_color);
|
||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width * ratio, height), color);
|
||||
m_renderer->add_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, height), outline_color);
|
||||
const auto bar_min = bar_start;
|
||||
const auto bar_max = bar_start + Vector2<float>{max_bar_width, height};
|
||||
const auto fill_max = bar_start + Vector2<float>{max_bar_width * ratio, height};
|
||||
m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color);
|
||||
draw_glow_rectangle(bar_min, fill_max, glow);
|
||||
draw_filled_rectangle(bar_min, fill_max, resolve_bar_paint(color, ratio, false));
|
||||
m_renderer->add_rectangle(bar_min, bar_max, outline_color);
|
||||
|
||||
m_text_cursor_bottom.y += offset + height;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
EntityOverlay& EntityOverlay::add_bottom_label(const Color& color, const float offset, const widget::Outlined outlined,
|
||||
const std::string_view text)
|
||||
EntityOverlay& EntityOverlay::add_bottom_label(const widget::Paint& color, const float offset,
|
||||
const widget::Outlined outlined, const std::string_view text,
|
||||
const std::optional<widget::Glow>& glow)
|
||||
{
|
||||
const auto text_size = m_renderer->calc_text_size(text);
|
||||
|
||||
if (outlined == widget::Outlined::On)
|
||||
draw_outlined_text(m_text_cursor_bottom + Vector2<float>{0.f, offset}, color, text);
|
||||
else
|
||||
m_renderer->add_text(m_text_cursor_bottom + Vector2<float>{0.f, offset}, color, text);
|
||||
draw_label(m_text_cursor_bottom + Vector2<float>{0.f, offset}, color, outlined, text, glow);
|
||||
|
||||
m_text_cursor_bottom.y += text_size.y;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
EntityOverlay& EntityOverlay::add_left_label(const Color& color, const float offset, const widget::Outlined outlined,
|
||||
const std::string_view& text)
|
||||
EntityOverlay& EntityOverlay::add_left_label(const widget::Paint& color, const float offset,
|
||||
const widget::Outlined outlined, const std::string_view& text,
|
||||
const std::optional<widget::Glow>& glow)
|
||||
{
|
||||
const auto text_size = m_renderer->calc_text_size(text);
|
||||
const auto pos = m_text_cursor_left + Vector2<float>{-(offset + text_size.x), 0.f};
|
||||
|
||||
if (outlined == widget::Outlined::On)
|
||||
draw_outlined_text(pos, color, text);
|
||||
else
|
||||
m_renderer->add_text(pos, color, text);
|
||||
draw_label(pos, color, outlined, text, glow);
|
||||
|
||||
m_text_cursor_left.y += text_size.y;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
EntityOverlay& EntityOverlay::add_centered_bottom_label(const Color& color, const float offset, const widget::Outlined outlined,
|
||||
const std::string_view& text)
|
||||
EntityOverlay& EntityOverlay::add_centered_bottom_label(const widget::Paint& color, const float offset,
|
||||
const widget::Outlined outlined,
|
||||
const std::string_view& text,
|
||||
const std::optional<widget::Glow>& glow)
|
||||
{
|
||||
const auto text_size = m_renderer->calc_text_size(text);
|
||||
const auto box_center_x =
|
||||
m_canvas.bottom_left_corner.x + (m_canvas.bottom_right_corner.x - m_canvas.bottom_left_corner.x) / 2.f;
|
||||
const auto pos = Vector2<float>{box_center_x - text_size.x / 2.f, m_text_cursor_bottom.y + offset};
|
||||
|
||||
if (outlined == widget::Outlined::On)
|
||||
draw_outlined_text(pos, color, text);
|
||||
else
|
||||
m_renderer->add_text(pos, color, text);
|
||||
draw_label(pos, color, outlined, text, glow);
|
||||
|
||||
m_text_cursor_bottom.y += text_size.y;
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
EntityOverlay& EntityOverlay::add_centered_top_label(const Color& color, const float offset, const widget::Outlined outlined,
|
||||
const std::string_view& text)
|
||||
EntityOverlay& EntityOverlay::add_centered_top_label(const widget::Paint& color, const float offset,
|
||||
const widget::Outlined outlined, const std::string_view& text,
|
||||
const std::optional<widget::Glow>& glow)
|
||||
{
|
||||
const auto text_size = m_renderer->calc_text_size(text);
|
||||
const auto box_center_x =
|
||||
@@ -452,10 +662,7 @@ namespace omath::hud
|
||||
m_text_cursor_top.y -= text_size.y;
|
||||
const auto pos = Vector2<float>{box_center_x - text_size.x / 2.f, m_text_cursor_top.y - offset};
|
||||
|
||||
if (outlined == widget::Outlined::On)
|
||||
draw_outlined_text(pos, color, text);
|
||||
else
|
||||
m_renderer->add_text(pos, color, text);
|
||||
draw_label(pos, color, outlined, text, glow);
|
||||
|
||||
return *this;
|
||||
}
|
||||
@@ -601,11 +808,43 @@ namespace omath::hud
|
||||
// ── widget dispatch ───────────────────────────────────────────────────────
|
||||
void EntityOverlay::dispatch(const widget::Box& box)
|
||||
{
|
||||
add_2d_box(box.color, box.fill, box.outline, box.thickness);
|
||||
if (box.glow)
|
||||
{
|
||||
const auto points = m_canvas.as_array();
|
||||
draw_glow_polyline(points, *box.glow, box.thickness);
|
||||
}
|
||||
std::visit(
|
||||
[&](const auto& fill)
|
||||
{
|
||||
add_2d_box(box.color, fill, box.outline, box.thickness);
|
||||
},
|
||||
box.fill);
|
||||
}
|
||||
|
||||
void EntityOverlay::dispatch(const widget::CanvasGlow& canvas_glow)
|
||||
{
|
||||
draw_canvas_glow(canvas_glow);
|
||||
}
|
||||
|
||||
void EntityOverlay::dispatch(const widget::CorneredBox& cornered_box)
|
||||
{
|
||||
if (cornered_box.glow)
|
||||
{
|
||||
const float length =
|
||||
std::abs(m_canvas.top_left_corner.x - m_canvas.top_right_corner.x) * cornered_box.corner_ratio;
|
||||
const std::array lines = {
|
||||
std::pair{m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2<float>{length, 0.f}},
|
||||
std::pair{m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2<float>{0.f, length}},
|
||||
std::pair{m_canvas.bottom_left_corner, m_canvas.bottom_left_corner - Vector2<float>{0.f, length}},
|
||||
std::pair{m_canvas.bottom_left_corner, m_canvas.bottom_left_corner + Vector2<float>{length, 0.f}},
|
||||
std::pair{m_canvas.top_right_corner, m_canvas.top_right_corner - Vector2<float>{length, 0.f}},
|
||||
std::pair{m_canvas.top_right_corner, m_canvas.top_right_corner + Vector2<float>{0.f, length}},
|
||||
std::pair{m_canvas.bottom_right_corner, m_canvas.bottom_right_corner - Vector2<float>{0.f, length}},
|
||||
std::pair{m_canvas.bottom_right_corner, m_canvas.bottom_right_corner - Vector2<float>{length, 0.f}},
|
||||
};
|
||||
for (const auto& [from, to] : lines)
|
||||
draw_glow_line(from, to, *cornered_box.glow, cornered_box.thickness);
|
||||
}
|
||||
add_cornered_2d_box(cornered_box.color, cornered_box.fill, cornered_box.outline, cornered_box.corner_ratio,
|
||||
cornered_box.thickness);
|
||||
}
|
||||
@@ -617,7 +856,10 @@ namespace omath::hud
|
||||
|
||||
void EntityOverlay::dispatch(const widget::Skeleton& skeleton)
|
||||
{
|
||||
add_skeleton(skeleton.color, skeleton.thickness);
|
||||
if (skeleton.bones.empty())
|
||||
add_skeleton(skeleton.color, skeleton.thickness);
|
||||
else
|
||||
add_skeleton(skeleton.bones, skeleton.color, skeleton.thickness);
|
||||
}
|
||||
|
||||
void EntityOverlay::dispatch(const widget::SnapLine& snap_line)
|
||||
@@ -704,7 +946,7 @@ namespace omath::hud
|
||||
},
|
||||
[this](const widget::Bar& w)
|
||||
{
|
||||
add_right_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset);
|
||||
add_right_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset, w.glow);
|
||||
},
|
||||
[this](const widget::DashedBar& w)
|
||||
{
|
||||
@@ -713,11 +955,12 @@ namespace omath::hud
|
||||
},
|
||||
[this](const widget::Label& w)
|
||||
{
|
||||
add_right_label(w.color, w.offset, w.outlined, w.text);
|
||||
add_right_label(w.color, w.offset, w.outlined, w.text, w.glow);
|
||||
},
|
||||
[this](const widget::Centered<widget::Label>& w)
|
||||
{
|
||||
add_right_label(w.child.color, w.child.offset, w.child.outlined, w.child.text);
|
||||
add_right_label(w.child.color, w.child.offset, w.child.outlined, w.child.text,
|
||||
w.child.glow);
|
||||
},
|
||||
[this](const widget::SpaceVertical& w)
|
||||
{
|
||||
@@ -750,7 +993,7 @@ namespace omath::hud
|
||||
},
|
||||
[this](const widget::Bar& w)
|
||||
{
|
||||
add_left_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset);
|
||||
add_left_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset, w.glow);
|
||||
},
|
||||
[this](const widget::DashedBar& w)
|
||||
{
|
||||
@@ -759,11 +1002,12 @@ namespace omath::hud
|
||||
},
|
||||
[this](const widget::Label& w)
|
||||
{
|
||||
add_left_label(w.color, w.offset, w.outlined, w.text);
|
||||
add_left_label(w.color, w.offset, w.outlined, w.text, w.glow);
|
||||
},
|
||||
[this](const widget::Centered<widget::Label>& w)
|
||||
{
|
||||
add_left_label(w.child.color, w.child.offset, w.child.outlined, w.child.text);
|
||||
add_left_label(w.child.color, w.child.offset, w.child.outlined, w.child.text,
|
||||
w.child.glow);
|
||||
},
|
||||
[this](const widget::SpaceVertical& w)
|
||||
{
|
||||
@@ -796,7 +1040,7 @@ namespace omath::hud
|
||||
},
|
||||
[this](const widget::Bar& w)
|
||||
{
|
||||
add_top_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset);
|
||||
add_top_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset, w.glow);
|
||||
},
|
||||
[this](const widget::DashedBar& w)
|
||||
{
|
||||
@@ -805,11 +1049,12 @@ namespace omath::hud
|
||||
},
|
||||
[this](const widget::Label& w)
|
||||
{
|
||||
add_top_label(w.color, w.offset, w.outlined, w.text);
|
||||
add_top_label(w.color, w.offset, w.outlined, w.text, w.glow);
|
||||
},
|
||||
[this](const widget::Centered<widget::Label>& w)
|
||||
{
|
||||
add_centered_top_label(w.child.color, w.child.offset, w.child.outlined, w.child.text);
|
||||
add_centered_top_label(w.child.color, w.child.offset, w.child.outlined, w.child.text,
|
||||
w.child.glow);
|
||||
},
|
||||
[this](const widget::SpaceVertical& w)
|
||||
{
|
||||
@@ -841,7 +1086,7 @@ namespace omath::hud
|
||||
},
|
||||
[this](const widget::Bar& w)
|
||||
{
|
||||
add_bottom_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset);
|
||||
add_bottom_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset, w.glow);
|
||||
},
|
||||
[this](const widget::DashedBar& w)
|
||||
{
|
||||
@@ -850,12 +1095,12 @@ namespace omath::hud
|
||||
},
|
||||
[this](const widget::Label& w)
|
||||
{
|
||||
add_bottom_label(w.color, w.offset, w.outlined, w.text);
|
||||
add_bottom_label(w.color, w.offset, w.outlined, w.text, w.glow);
|
||||
},
|
||||
[this](const widget::Centered<widget::Label>& w)
|
||||
{
|
||||
add_centered_bottom_label(w.child.color, w.child.offset, w.child.outlined,
|
||||
w.child.text);
|
||||
add_centered_bottom_label(w.child.color, w.child.offset, w.child.outlined, w.child.text,
|
||||
w.child.glow);
|
||||
},
|
||||
[this](const widget::SpaceVertical& w)
|
||||
{
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
#include "omath/hud/renderer_realizations/imgui_renderer.hpp"
|
||||
|
||||
#ifdef OMATH_IMGUI_INTEGRATION
|
||||
#include <cmath>
|
||||
#include <imgui.h>
|
||||
#include <imgui_internal.h>
|
||||
|
||||
namespace omath::hud
|
||||
{
|
||||
@@ -25,10 +27,21 @@ namespace omath::hud
|
||||
ImDrawFlags_Closed, thickness);
|
||||
}
|
||||
|
||||
void ImguiHudRenderer::add_polyline_clipped(const std::span<const Vector2<float>>& vertexes,
|
||||
const Vector2<float>& clip_min, const Vector2<float>& clip_max,
|
||||
const Color& color, const float thickness)
|
||||
{
|
||||
auto* draw_list = ImGui::GetBackgroundDrawList();
|
||||
draw_list->PushClipRect(clip_min.to_im_vec2(), clip_max.to_im_vec2(), true);
|
||||
draw_list->AddPolyline(reinterpret_cast<const ImVec2*>(vertexes.data()), static_cast<int>(vertexes.size()),
|
||||
color.to_im_color(), ImDrawFlags_Closed, thickness);
|
||||
draw_list->PopClipRect();
|
||||
}
|
||||
|
||||
void ImguiHudRenderer::add_filled_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color)
|
||||
{
|
||||
ImGui::GetBackgroundDrawList()->AddConvexPolyFilled(reinterpret_cast<const ImVec2*>(vertexes.data()),
|
||||
static_cast<int>(vertexes.size()), color.to_im_color());
|
||||
static_cast<int>(vertexes.size()), color.to_im_color());
|
||||
}
|
||||
|
||||
void ImguiHudRenderer::add_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color)
|
||||
@@ -42,30 +55,39 @@ namespace omath::hud
|
||||
ImGui::GetBackgroundDrawList()->AddRectFilled(min.to_im_vec2(), max.to_im_vec2(), color.to_im_color());
|
||||
}
|
||||
|
||||
void ImguiHudRenderer::add_circle(const Vector2<float>& center, const float radius, const Color& color,
|
||||
const float thickness, const int segments)
|
||||
void ImguiHudRenderer::add_gradient_rectangle(const Vector2<float>& min, const Vector2<float>& max,
|
||||
const Gradient& gradient)
|
||||
{
|
||||
ImGui::GetBackgroundDrawList()->AddCircle(center.to_im_vec2(), radius, color.to_im_color(), segments, thickness);
|
||||
ImGui::GetBackgroundDrawList()->AddRectFilledMultiColor(
|
||||
min.to_im_vec2(), max.to_im_vec2(), gradient.top_left.to_im_color(), gradient.top_right.to_im_color(),
|
||||
gradient.bottom_right.to_im_color(), gradient.bottom_left.to_im_color());
|
||||
}
|
||||
|
||||
void ImguiHudRenderer::add_circle(const Vector2<float>& center, const float radius, const Color& color,
|
||||
const float thickness, const int segments)
|
||||
{
|
||||
ImGui::GetBackgroundDrawList()->AddCircle(center.to_im_vec2(), radius, color.to_im_color(), segments,
|
||||
thickness);
|
||||
}
|
||||
|
||||
void ImguiHudRenderer::add_filled_circle(const Vector2<float>& center, const float radius, const Color& color,
|
||||
const int segments)
|
||||
const int segments)
|
||||
{
|
||||
ImGui::GetBackgroundDrawList()->AddCircleFilled(center.to_im_vec2(), radius, color.to_im_color(), segments);
|
||||
}
|
||||
|
||||
void ImguiHudRenderer::add_arc(const Vector2<float>& center, const float radius, const float a_min, const float a_max,
|
||||
const Color& color, const float thickness, const int segments)
|
||||
void ImguiHudRenderer::add_arc(const Vector2<float>& center, const float radius, const float a_min,
|
||||
const float a_max, const Color& color, const float thickness, const int segments)
|
||||
{
|
||||
ImGui::GetBackgroundDrawList()->PathArcTo(center.to_im_vec2(), radius, a_min, a_max, segments);
|
||||
ImGui::GetBackgroundDrawList()->PathStroke(color.to_im_color(), ImDrawFlags_None, thickness);
|
||||
}
|
||||
|
||||
void ImguiHudRenderer::add_image(const std::any& texture_id, const Vector2<float>& min, const Vector2<float>& max,
|
||||
const Color& tint)
|
||||
const Color& tint)
|
||||
{
|
||||
ImGui::GetBackgroundDrawList()->AddImage(std::any_cast<ImTextureID>(texture_id), min.to_im_vec2(),
|
||||
max.to_im_vec2(), {0, 0}, {1, 1}, tint.to_im_color());
|
||||
max.to_im_vec2(), {0, 0}, {1, 1}, tint.to_im_color());
|
||||
}
|
||||
|
||||
void ImguiHudRenderer::add_text(const Vector2<float>& position, const Color& color, const std::string_view& text)
|
||||
@@ -73,6 +95,61 @@ namespace omath::hud
|
||||
ImGui::GetBackgroundDrawList()->AddText(position.to_im_vec2(), color.to_im_color(), text.data(),
|
||||
text.data() + text.size());
|
||||
}
|
||||
|
||||
void ImguiHudRenderer::add_gradient_text(const Vector2<float>& position, const Gradient& gradient,
|
||||
const std::string_view& text)
|
||||
{
|
||||
auto* draw_list = ImGui::GetBackgroundDrawList();
|
||||
if (gradient.animated)
|
||||
{
|
||||
const float animation_offset = static_cast<float>(ImGui::GetTime()) * gradient.animation_speed;
|
||||
const float direction = gradient.direction == GradientDirection::RightToLeft ? 1.f : -1.f;
|
||||
float cursor_x = position.x;
|
||||
const char* glyph_start = text.data();
|
||||
const char* const text_end = text.data() + text.size();
|
||||
int glyph_index = 0;
|
||||
while (glyph_start < text_end)
|
||||
{
|
||||
unsigned int codepoint;
|
||||
const int glyph_size = ImTextCharFromUtf8(&codepoint, glyph_start, text_end);
|
||||
if (glyph_size <= 0)
|
||||
break;
|
||||
static_cast<void>(codepoint);
|
||||
|
||||
const char* const glyph_end = glyph_start + glyph_size;
|
||||
const float blend =
|
||||
(std::sin(animation_offset + direction * static_cast<float>(glyph_index)
|
||||
* gradient.animation_spread)
|
||||
+ 1.f)
|
||||
* 0.5f;
|
||||
const auto color = gradient.top_left.value() * (1.f - blend) + gradient.top_right.value() * blend;
|
||||
draw_list->AddText({cursor_x, position.y}, Color{color}.to_im_color(), glyph_start, glyph_end);
|
||||
cursor_x += ImGui::CalcTextSize(glyph_start, glyph_end).x;
|
||||
glyph_start = glyph_end;
|
||||
++glyph_index;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const int vertex_start = draw_list->VtxBuffer.Size;
|
||||
draw_list->AddText(position.to_im_vec2(), IM_COL32_WHITE, text.data(), text.data() + text.size());
|
||||
|
||||
const auto size = calc_text_size(text);
|
||||
const float width = std::max(size.x, 1.f);
|
||||
const float height = std::max(size.y, 1.f);
|
||||
for (int i = vertex_start; i < draw_list->VtxBuffer.Size; ++i)
|
||||
{
|
||||
auto& vertex = draw_list->VtxBuffer[i];
|
||||
const float x = std::clamp((vertex.pos.x - position.x) / width, 0.f, 1.f);
|
||||
const float y = std::clamp((vertex.pos.y - position.y) / height, 0.f, 1.f);
|
||||
const auto top = gradient.top_left.value() * (1.f - x) + gradient.top_right.value() * x;
|
||||
const auto bottom = gradient.bottom_left.value() * (1.f - x) + gradient.bottom_right.value() * x;
|
||||
const auto color = top * (1.f - y) + bottom * y;
|
||||
const auto alpha = static_cast<int>(((vertex.col >> IM_COL32_A_SHIFT) & 0xff) * color.w);
|
||||
vertex.col = IM_COL32(static_cast<int>(color.x * 255.f), static_cast<int>(color.y * 255.f),
|
||||
static_cast<int>(color.z * 255.f), alpha);
|
||||
}
|
||||
}
|
||||
[[nodiscard]]
|
||||
Vector2<float> ImguiHudRenderer::calc_text_size(const std::string_view& text)
|
||||
{
|
||||
|
||||
@@ -14,9 +14,14 @@ namespace
|
||||
|
||||
// Handy aliases (defaults: Type=float, [0,360], Normalized)
|
||||
using Deg = Angle<float, static_cast<float>(0), static_cast<float>(360), AngleFlags::Normalized>;
|
||||
using Fov = Angle<float, static_cast<float>(0), static_cast<float>(180), AngleFlags::Clamped>;
|
||||
using Offset = Angle<float, static_cast<float>(10), static_cast<float>(20), AngleFlags::Clamped>;
|
||||
using Pitch = Angle<float, static_cast<float>(-90), static_cast<float>(90), AngleFlags::Clamped>;
|
||||
using Turn = Angle<float, static_cast<float>(-180), static_cast<float>(180), AngleFlags::Normalized>;
|
||||
|
||||
template<class Type>
|
||||
concept SupportedAngleType = requires { typename Angle<Type>; };
|
||||
|
||||
constexpr float k_eps = 1e-5f;
|
||||
|
||||
constexpr bool close_to(const float actual, const float expected, const float epsilon)
|
||||
@@ -36,6 +41,12 @@ TEST(UnitTestAngle, DefaultConstructor_IsZeroDegrees)
|
||||
EXPECT_FLOAT_EQ(a.as_degrees(), 0.0f);
|
||||
}
|
||||
|
||||
TEST(UnitTestAngle, DefaultConstructor_AppliesRangePolicy)
|
||||
{
|
||||
constexpr Offset a;
|
||||
EXPECT_FLOAT_EQ(a.as_degrees(), 10.0f);
|
||||
}
|
||||
|
||||
TEST(UnitTestAngle, FromDegrees_Normalized_WrapsAboveMax)
|
||||
{
|
||||
const Deg a = Deg::from_degrees(370.0f);
|
||||
@@ -66,6 +77,14 @@ TEST(UnitTestAngle, FromRadians_And_AsRadians)
|
||||
EXPECT_NEAR(b.as_radians(), std::numbers::pi_v<float>, 1e-6f);
|
||||
}
|
||||
|
||||
TEST(UnitTestAngle, FromInverseTrigonometricFunctions)
|
||||
{
|
||||
EXPECT_NEAR(Pitch::from_asin(0.5f).as_degrees(), 30.0f, k_eps);
|
||||
EXPECT_NEAR(Pitch::from_acos(0.5f).as_degrees(), 60.0f, k_eps);
|
||||
EXPECT_NEAR(Pitch::from_atan(1.0f).as_degrees(), 45.0f, k_eps);
|
||||
EXPECT_NEAR(Turn::from_atan2(-1.0f, -1.0f).as_degrees(), -135.0f, k_eps);
|
||||
}
|
||||
|
||||
// ---------- Unary minus & deref ----------
|
||||
|
||||
TEST(UnitTestAngle, UnaryMinus_Normalized)
|
||||
@@ -101,17 +120,6 @@ TEST(UnitTestAngle, SinCosTanCot_BasicCases)
|
||||
EXPECT_NEAR(a90.cos(), 0.0f, 1e-4f);
|
||||
}
|
||||
|
||||
TEST(UnitTestAngle, Atan_IsAtanOfRadians)
|
||||
{
|
||||
// atan(as_radians). For 0° -> atan(0)=0.
|
||||
const Deg a0 = Deg::from_degrees(0.0f);
|
||||
EXPECT_NEAR(a0.atan(), 0.0f, k_eps);
|
||||
|
||||
const Deg a45 = Deg::from_degrees(45.0f);
|
||||
// atan(pi/4) ≈ 0.665773...
|
||||
EXPECT_NEAR(a45.atan(), 0.66577375f, 1e-6f);
|
||||
}
|
||||
|
||||
// ---------- Compound arithmetic ----------
|
||||
|
||||
TEST(UnitTestAngle, PlusEquals_Normalized_Wraps)
|
||||
@@ -142,6 +150,16 @@ TEST(UnitTestAngle, MinusEquals_Clamped_Clamps)
|
||||
EXPECT_FLOAT_EQ(p.as_degrees(), -90.0f);
|
||||
}
|
||||
|
||||
TEST(UnitTestAngle, Subtraction_ClampedNonSymmetricRange)
|
||||
{
|
||||
Fov compound = Fov::from_degrees(90.0f);
|
||||
compound -= Fov::from_degrees(10.0f);
|
||||
EXPECT_FLOAT_EQ(compound.as_degrees(), 80.0f);
|
||||
|
||||
const Fov binary = Fov::from_degrees(90.0f) - Fov::from_degrees(10.0f);
|
||||
EXPECT_FLOAT_EQ(binary.as_degrees(), 80.0f);
|
||||
}
|
||||
|
||||
// ---------- Alternative ranges ----------
|
||||
|
||||
TEST(UnitTestAngle, NormalizedRange_Neg180To180)
|
||||
@@ -205,5 +223,12 @@ static_assert(close_to(Pitch::from_degrees(45.0f).tan(), 1.0f, 1e-4f),
|
||||
"Tan should be constexpr with embedded constexpr math");
|
||||
static_assert(close_to(Pitch::from_degrees(45.0f).cot(), 1.0f, 1e-4f),
|
||||
"Cot should be constexpr with embedded constexpr math");
|
||||
static_assert(close_to(Pitch::from_degrees(45.0f).atan(), 0.66577375f, 1e-6f),
|
||||
"Atan should be constexpr with embedded constexpr math");
|
||||
static_assert(close_to(Pitch::from_asin(0.5f).as_degrees(), 30.0f, k_eps),
|
||||
"From asin should be constexpr with embedded constexpr math");
|
||||
static_assert(close_to(Pitch::from_acos(0.5f).as_degrees(), 60.0f, k_eps),
|
||||
"From acos should be constexpr with embedded constexpr math");
|
||||
static_assert(close_to(Pitch::from_atan(1.0f).as_degrees(), 45.0f, k_eps),
|
||||
"From atan should be constexpr with embedded constexpr math");
|
||||
static_assert(close_to(Turn::from_atan2(-1.0f, -1.0f).as_degrees(), -135.0f, k_eps),
|
||||
"From atan2 should be constexpr with embedded constexpr math");
|
||||
static_assert(!SupportedAngleType<int>, "Angle should only accept floating-point types");
|
||||
|
||||
@@ -47,3 +47,10 @@ TEST(unit_test_angles, wrap_angle_negative_range)
|
||||
|
||||
EXPECT_NEAR(wrapped, 270.f, 0.01f);
|
||||
}
|
||||
|
||||
TEST(unit_test_angles, wrap_angle_maximum_maps_to_minimum)
|
||||
{
|
||||
const float wrapped = omath::angles::wrap_angle(360.f, 0.f, 360.f);
|
||||
|
||||
EXPECT_FLOAT_EQ(wrapped, 0.f);
|
||||
}
|
||||
|
||||
@@ -16,6 +16,21 @@ namespace
|
||||
const float diff = actual - expected;
|
||||
return (diff < 0.0f ? -diff : diff) <= epsilon;
|
||||
}
|
||||
|
||||
template<size_t Rows, size_t Columns, size_t OtherColumns, class Type, MatStoreType StoreType>
|
||||
void expect_multiplication_matches_scalar_reference(const Mat<Rows, Columns, Type, StoreType>& left,
|
||||
const Mat<Columns, OtherColumns, Type, StoreType>& right)
|
||||
{
|
||||
const auto result = left * right;
|
||||
for (size_t row = 0; row < Rows; ++row)
|
||||
for (size_t column = 0; column < OtherColumns; ++column)
|
||||
{
|
||||
Type expected{};
|
||||
for (size_t shared_index = 0; shared_index < Columns; ++shared_index)
|
||||
expected += left.at(row, shared_index) * right.at(shared_index, column);
|
||||
EXPECT_EQ(result.at(row, column), expected);
|
||||
}
|
||||
}
|
||||
} // namespace
|
||||
|
||||
class UnitTestMat : public ::testing::Test
|
||||
@@ -92,6 +107,45 @@ TEST_F(UnitTestMat, Operator_Multiplication_Matrix)
|
||||
EXPECT_FLOAT_EQ(m3.at(1, 1), 22.0f);
|
||||
}
|
||||
|
||||
TEST(UnitTestMatStandalone, Operator_Multiplication_RowMajorSimdAndTail)
|
||||
{
|
||||
Mat<3, 5, float, MatStoreType::ROW_MAJOR> left;
|
||||
Mat<5, 33, float, MatStoreType::ROW_MAJOR> right;
|
||||
for (size_t row = 0; row < left.row_count(); ++row)
|
||||
for (size_t column = 0; column < left.columns_count(); ++column)
|
||||
left.at(row, column) = static_cast<float>(row * 3 + column + 1);
|
||||
for (size_t row = 0; row < right.row_count(); ++row)
|
||||
for (size_t column = 0; column < right.columns_count(); ++column)
|
||||
right.at(row, column) = static_cast<float>((row + 1) * (column % 5 + 1));
|
||||
|
||||
expect_multiplication_matches_scalar_reference(left, right);
|
||||
}
|
||||
|
||||
TEST(UnitTestMatStandalone, Operator_Multiplication_ColumnMajorSimdAndTail)
|
||||
{
|
||||
Mat<17, 5, double, MatStoreType::COLUMN_MAJOR> left;
|
||||
Mat<5, 3, double, MatStoreType::COLUMN_MAJOR> right;
|
||||
for (size_t row = 0; row < left.row_count(); ++row)
|
||||
for (size_t column = 0; column < left.columns_count(); ++column)
|
||||
left.at(row, column) = static_cast<double>(row * 3 + column + 1);
|
||||
for (size_t row = 0; row < right.row_count(); ++row)
|
||||
for (size_t column = 0; column < right.columns_count(); ++column)
|
||||
right.at(row, column) = static_cast<double>((row + 1) * (column + 1));
|
||||
|
||||
expect_multiplication_matches_scalar_reference(left, right);
|
||||
}
|
||||
|
||||
TEST(UnitTestMatStandalone, Operator_Multiplication_IntegerFallsBackFromAvx)
|
||||
{
|
||||
constexpr Mat<2, 3, int> left{{1, 2, 3}, {4, 5, 6}};
|
||||
constexpr Mat<3, 2, int> right{{7, 8}, {9, 10}, {11, 12}};
|
||||
constexpr auto result = left * right;
|
||||
static_assert(result.at(0, 0) == 58);
|
||||
static_assert(result.at(1, 1) == 154);
|
||||
|
||||
expect_multiplication_matches_scalar_reference(left, right);
|
||||
}
|
||||
|
||||
TEST_F(UnitTestMat, Operator_Multiplication_Scalar)
|
||||
{
|
||||
Mat<2, 2> m3 = m2 * 2.0f;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
// Tests for PredEngineTrait
|
||||
#include <array>
|
||||
#include <gtest/gtest.h>
|
||||
#include <omath/engines/source_engine/traits/pred_engine_trait.hpp>
|
||||
#include <omath/projectile_prediction/projectile.hpp>
|
||||
@@ -77,6 +78,77 @@ TEST(PredEngineTrait, PredictProjectilePositionWithLaunchOffset)
|
||||
EXPECT_NEAR(pos_t1.z, -2.f - 9.81f * 0.5f, 1e-3f);
|
||||
}
|
||||
|
||||
TEST(PredEngineTrait, PredictProjectilePositionMatchesRotationMatrix)
|
||||
{
|
||||
constexpr Projectile projectile{
|
||||
.m_origin = {10.f, -20.f, 30.f},
|
||||
.m_launch_offset = {2.f, 3.f, -4.f},
|
||||
.m_launch_speed = 750.f,
|
||||
.m_gravity_scale = 0.6f,
|
||||
};
|
||||
struct TestCase
|
||||
{
|
||||
float pitch;
|
||||
float yaw;
|
||||
float time;
|
||||
};
|
||||
constexpr std::array test_cases{
|
||||
TestCase{0.f, 0.f, 0.f},
|
||||
TestCase{25.f, 45.f, 0.25f},
|
||||
TestCase{-60.f, -135.f, 1.5f},
|
||||
TestCase{120.f, 540.f, 2.f},
|
||||
};
|
||||
constexpr float gravity = 9.81f;
|
||||
|
||||
for (const auto& test_case : test_cases)
|
||||
{
|
||||
const auto launch_position = projectile.m_origin + projectile.m_launch_offset;
|
||||
auto expected_position = launch_position
|
||||
+ forward_vector({PitchAngle::from_degrees(-test_case.pitch),
|
||||
YawAngle::from_degrees(test_case.yaw), RollAngle::from_degrees(0.f)})
|
||||
* projectile.m_launch_speed * test_case.time;
|
||||
expected_position.z -= gravity * projectile.m_gravity_scale * test_case.time * test_case.time * 0.5f;
|
||||
|
||||
const auto actual_position = PredEngineTrait::predict_projectile_position(
|
||||
projectile, test_case.pitch, test_case.yaw, test_case.time, gravity);
|
||||
|
||||
EXPECT_NEAR(actual_position.x, expected_position.x, 1e-5f);
|
||||
EXPECT_NEAR(actual_position.y, expected_position.y, 1e-5f);
|
||||
EXPECT_NEAR(actual_position.z, expected_position.z, 1e-5f);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(PredEngineTrait, ReachabilityCheckUsesDistanceTolerance)
|
||||
{
|
||||
constexpr Projectile projectile{
|
||||
.m_origin = {0.f, 0.f, 0.f},
|
||||
.m_launch_speed = 100.f,
|
||||
.m_gravity_scale = 0.f,
|
||||
};
|
||||
|
||||
EXPECT_FALSE(PredEngineTrait::can_projectile_reach_target_at_time(projectile, {100.f, 0.f, 0.f}, 0.5f, 9.81f, 0.f));
|
||||
EXPECT_TRUE(PredEngineTrait::can_projectile_reach_target_at_time(projectile, {100.f, 0.f, 0.f}, 1.f, 9.81f, 0.f));
|
||||
EXPECT_TRUE(PredEngineTrait::can_projectile_reach_target_at_time(projectile, {101.f, 0.f, 0.f}, 1.f, 9.81f, 1.f));
|
||||
EXPECT_TRUE(PredEngineTrait::can_projectile_reach_target_at_time(projectile, {99.f, 0.f, 0.f}, 1.f, 9.81f, 1.f));
|
||||
EXPECT_FALSE(PredEngineTrait::can_projectile_reach_target_at_time(projectile, {101.f, 0.f, 0.f}, 1.f, 9.81f, 0.f));
|
||||
EXPECT_FALSE(PredEngineTrait::can_projectile_reach_target_at_time(projectile, {98.f, 0.f, 0.f}, 1.f, 9.81f, 1.f));
|
||||
}
|
||||
|
||||
TEST(PredEngineTrait, ReachabilityCheckIncludesFloatingPointError)
|
||||
{
|
||||
constexpr Projectile projectile{
|
||||
.m_origin = {1.f, 2.f, 3.f},
|
||||
.m_launch_offset = {0.1f, -0.2f, 0.3f},
|
||||
.m_launch_speed = 100.f,
|
||||
.m_gravity_scale = 1.f,
|
||||
};
|
||||
constexpr float gravity = 9.81f;
|
||||
constexpr float time = 0.3f;
|
||||
const auto target_position = PredEngineTrait::predict_projectile_position(projectile, 25.f, 45.f, time, gravity);
|
||||
|
||||
EXPECT_TRUE(PredEngineTrait::can_projectile_reach_target_at_time(projectile, target_position, time, gravity, 0.f));
|
||||
}
|
||||
|
||||
TEST(PredEngineTrait, ZeroLaunchOffsetMatchesOriginalBehavior)
|
||||
{
|
||||
Projectile p;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include <gtest/gtest.h>
|
||||
#include <limits>
|
||||
#include <omath/projectile_prediction/proj_pred_engine_legacy.hpp>
|
||||
#include <omath/projectile_prediction/projectile.hpp>
|
||||
#include <omath/projectile_prediction/target.hpp>
|
||||
@@ -15,25 +16,45 @@ struct FakeEngineZeroGravity
|
||||
{
|
||||
return t.m_origin;
|
||||
}
|
||||
static Vector3<float> predict_projectile_position(const Projectile& /*p*/, float /*pitch*/, float /*yaw*/, float /*time*/, float /*gravity*/) noexcept
|
||||
static Vector3<float> predict_projectile_position(const Projectile& /*p*/, float /*pitch*/, float /*yaw*/,
|
||||
float /*time*/, float /*gravity*/) noexcept
|
||||
{
|
||||
// Return a fixed point matching typical target used in the test
|
||||
return Vector3<float>{100.f, 0.f, 0.f};
|
||||
}
|
||||
static float calc_vector_2d_distance(const Vector3<float>& v) noexcept { return std::hypot(v.x, v.y); }
|
||||
static float get_vector_height_coordinate(const Vector3<float>& v) noexcept { return v.z; }
|
||||
static Vector3<float> calc_viewpoint_from_angles(const Projectile& /*p*/, Vector3<float> /*v*/, std::optional<float> /*maybe_pitch*/) noexcept
|
||||
static float calc_vector_2d_distance(const Vector3<float>& v) noexcept
|
||||
{
|
||||
return std::hypot(v.x, v.y);
|
||||
}
|
||||
static float get_vector_height_coordinate(const Vector3<float>& v) noexcept
|
||||
{
|
||||
return v.z;
|
||||
}
|
||||
static Vector3<float> calc_viewpoint_from_angles(const Projectile& /*p*/, Vector3<float> /*v*/,
|
||||
std::optional<float> /*maybe_pitch*/) noexcept
|
||||
{
|
||||
return Vector3<float>{1.f, 2.f, 3.f};
|
||||
}
|
||||
static float calc_direct_pitch_angle(const Vector3<float>& /*a*/, const Vector3<float>& /*b*/) noexcept { return 12.5f; }
|
||||
static float calc_direct_yaw_angle(const Vector3<float>& /*a*/, const Vector3<float>& /*b*/) noexcept { return 0.f; }
|
||||
static float calc_direct_pitch_angle(const Vector3<float>& /*a*/, const Vector3<float>& /*b*/) noexcept
|
||||
{
|
||||
return 12.5f;
|
||||
}
|
||||
static float calc_direct_yaw_angle(const Vector3<float>& /*a*/, const Vector3<float>& /*b*/) noexcept
|
||||
{
|
||||
return 0.f;
|
||||
}
|
||||
static bool can_projectile_reach_target_at_time(const Projectile& /*projectile*/,
|
||||
const Vector3<float>& /*target_position*/, float /*time*/,
|
||||
float /*gravity*/, float /*distance_tolerance*/)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
TEST(ProjPredLegacyMore, ZeroGravityUsesDirectPitchAndReturnsViewpoint)
|
||||
{
|
||||
constexpr Projectile proj{ .m_origin = {0.f, 0.f, 0.f}, .m_launch_speed = 10.f, .m_gravity_scale = 0.f };
|
||||
constexpr Target target{ .m_origin = {100.f, 0.f, 0.f}, .m_velocity = {0.f,0.f,0.f}, .m_is_airborne = false };
|
||||
constexpr Projectile proj{.m_origin = {0.f, 0.f, 0.f}, .m_launch_speed = 10.f, .m_gravity_scale = 0.f};
|
||||
constexpr Target target{.m_origin = {100.f, 0.f, 0.f}, .m_velocity = {0.f, 0.f, 0.f}, .m_is_airborne = false};
|
||||
|
||||
using Engine = omath::projectile_prediction::ProjPredEngineLegacy<FakeEngineZeroGravity>;
|
||||
const Engine engine(9.8f, 0.1f, 5.f, 1e-3f);
|
||||
@@ -117,3 +138,77 @@ TEST(ProjPredLegacyMore, AngleComputedButMissReturnsNullopt)
|
||||
const auto res = engine.maybe_calculate_aim_point(proj, target);
|
||||
EXPECT_FALSE(res.has_value());
|
||||
}
|
||||
|
||||
TEST(ProjPredLegacyMore, IncludesMaximumSimulationTime)
|
||||
{
|
||||
constexpr Projectile projectile{.m_origin = {0.f, 0.f, 0.f}, .m_launch_speed = 10.f, .m_gravity_scale = 0.f};
|
||||
constexpr Target target{.m_origin = {10.f, 0.f, 0.f}, .m_velocity = {0.f, 0.f, 0.f}, .m_is_airborne = false};
|
||||
const omath::projectile_prediction::ProjPredEngineLegacy<> engine(0.f, 0.1f, 1.f, 0.f);
|
||||
|
||||
const auto result = engine.maybe_calculate_aim_point(projectile, target);
|
||||
|
||||
ASSERT_TRUE(result.has_value());
|
||||
EXPECT_NEAR(result->x, target.m_origin.x, 1e-6f);
|
||||
EXPECT_NEAR(result->y, target.m_origin.y, 1e-6f);
|
||||
EXPECT_NEAR(result->z, target.m_origin.z, 1e-6f);
|
||||
}
|
||||
|
||||
TEST(ProjPredLegacyMore, RejectsInvalidSimulationSteps)
|
||||
{
|
||||
constexpr Projectile projectile{.m_origin = {0.f, 0.f, 0.f}, .m_launch_speed = 10.f, .m_gravity_scale = 0.f};
|
||||
constexpr Target target{.m_origin = {10.f, 0.f, 0.f}, .m_velocity = {0.f, 0.f, 0.f}, .m_is_airborne = false};
|
||||
|
||||
EXPECT_FALSE(omath::projectile_prediction::ProjPredEngineLegacy<>(0.f, 0.f, 1.f, 1.f)
|
||||
.maybe_calculate_aim_point(projectile, target));
|
||||
EXPECT_FALSE(omath::projectile_prediction::ProjPredEngineLegacy<>(0.f, -0.1f, 1.f, 1.f)
|
||||
.maybe_calculate_aim_point(projectile, target));
|
||||
EXPECT_FALSE(
|
||||
omath::projectile_prediction::ProjPredEngineLegacy<>(0.f, std::numeric_limits<float>::infinity(), 1.f, 1.f)
|
||||
.maybe_calculate_aim_point(projectile, target));
|
||||
}
|
||||
|
||||
TEST(ProjPredLegacyMore, RejectsInvalidProjectileSpeedAndTolerance)
|
||||
{
|
||||
constexpr Target target{.m_origin = {1.f, 0.f, 0.f}, .m_velocity = {0.f, 0.f, 0.f}, .m_is_airborne = false};
|
||||
constexpr Projectile stopped_projectile{.m_origin = {0.f, 0.f, 0.f}, .m_launch_speed = 0.f, .m_gravity_scale = 0.f};
|
||||
constexpr Projectile moving_projectile{.m_origin = {0.f, 0.f, 0.f}, .m_launch_speed = 10.f, .m_gravity_scale = 0.f};
|
||||
|
||||
EXPECT_FALSE(omath::projectile_prediction::ProjPredEngineLegacy<>(0.f, 0.1f, 1.f, 2.f)
|
||||
.maybe_calculate_aim_point(stopped_projectile, target));
|
||||
EXPECT_FALSE(omath::projectile_prediction::ProjPredEngineLegacy<>(0.f, 0.1f, 1.f, -1.f)
|
||||
.maybe_calculate_aim_point(moving_projectile, target));
|
||||
}
|
||||
|
||||
TEST(ProjPredLegacyMore, StablePitchFindsHighSpeedLowArc)
|
||||
{
|
||||
constexpr Projectile projectile{.m_origin = {0.f, 0.f, 0.f}, .m_launch_speed = 10'000.f, .m_gravity_scale = 1.f};
|
||||
constexpr Target target{.m_origin = {100.f, 0.f, 0.f}, .m_velocity = {0.f, 0.f, 0.f}, .m_is_airborne = false};
|
||||
const omath::projectile_prediction::ProjPredEngineLegacy<> engine(9.81f, 0.01f, 0.02f, 0.0001f);
|
||||
|
||||
const auto result = engine.maybe_calculate_aim_angles(projectile, target);
|
||||
|
||||
ASSERT_TRUE(result.has_value());
|
||||
EXPECT_GT(result->pitch, 0.f);
|
||||
EXPECT_NEAR(result->yaw, 0.f, 1e-6f);
|
||||
}
|
||||
|
||||
TEST(ProjPredLegacyMore, CoincidentTargetReturnsLaunchOrigin)
|
||||
{
|
||||
constexpr Projectile projectile{.m_origin = {5.f, 4.f, 3.f}, .m_launch_speed = 100.f, .m_gravity_scale = 1.f};
|
||||
constexpr Target target{.m_origin = projectile.m_origin, .m_velocity = {0.f, 0.f, 0.f}, .m_is_airborne = false};
|
||||
const omath::projectile_prediction::ProjPredEngineLegacy<> engine(9.81f, 0.01f, 0.01f, 0.f);
|
||||
|
||||
const auto result = engine.maybe_calculate_aim_point(projectile, target);
|
||||
|
||||
ASSERT_TRUE(result.has_value());
|
||||
EXPECT_EQ(result.value(), projectile.m_origin);
|
||||
}
|
||||
|
||||
TEST(ProjPredLegacyMore, TinyDistanceDoesNotUnderflowToAHit)
|
||||
{
|
||||
constexpr Projectile projectile{.m_origin = {0.f, 0.f, 0.f}, .m_launch_speed = 1.f, .m_gravity_scale = 0.f};
|
||||
constexpr Target target{.m_origin = {1e-30f, 0.f, 0.f}, .m_velocity = {0.f, 0.f, 0.f}, .m_is_airborne = false};
|
||||
const omath::projectile_prediction::ProjPredEngineLegacy<> engine(0.f, 0.1f, 0.f, 0.f);
|
||||
|
||||
EXPECT_FALSE(engine.maybe_calculate_aim_point(projectile, target));
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
//
|
||||
// Created by Vlad on 27.08.2024.
|
||||
//
|
||||
#include "omath/algorithm/radar.hpp"
|
||||
#include "omath/engines/unity_engine/camera.hpp"
|
||||
#include <complex>
|
||||
#include <gtest/gtest.h>
|
||||
@@ -1283,8 +1284,9 @@ TEST(UnitTestProjection, TriangleFarToSideCulled)
|
||||
TEST(UnitTestProjection, TriangleStraddlingFrustumNotCulled)
|
||||
{
|
||||
constexpr auto fov = omath::projection::FieldOfView::from_degrees(90.f);
|
||||
const auto cam = omath::source_engine::Camera({0.f, 0.f, 0.f}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
|
||||
constexpr auto cam = omath::source_engine::Camera({0.f, 0.f, 0.f}, {}, {1920.f, 1080.f}, fov, 0.01f, 1000.f);
|
||||
|
||||
constexpr auto position = omath::algorithm::world_to_radar(cam, {-1.f, 0.f, 0.f}, 0.1f);
|
||||
// Large triangle with vertices on both sides of the frustum — should not be culled
|
||||
const omath::Triangle<omath::Vector3<float>> tri{{100.f, 0.f, 0.f}, {100.f, 5000.f, 0.f}, {100.f, 0.f, 5000.f}};
|
||||
EXPECT_FALSE(cam.is_culled_by_frustum(tri));
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"default-registry": {
|
||||
"kind": "git",
|
||||
"baseline": "b1b19307e2d2ec1eefbdb7ea069de7d4bcd31f01",
|
||||
"baseline": "0878b5224d4a4968940ee296a2e7fae2d3b62983",
|
||||
"repository": "https://github.com/microsoft/vcpkg"
|
||||
},
|
||||
"registries": [
|
||||
|
||||
+18
-4
@@ -21,7 +21,11 @@
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "omath",
|
||||
"features": ["imgui", "lua", "hooking"]
|
||||
"features": [
|
||||
"imgui",
|
||||
"lua",
|
||||
"hooking"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -50,16 +54,26 @@
|
||||
"opengl",
|
||||
{
|
||||
"name": "omath",
|
||||
"features": ["hooking"],
|
||||
"features": [
|
||||
"hooking"
|
||||
],
|
||||
"platform": "windows & !arm & !uwp"
|
||||
},
|
||||
{
|
||||
"name": "imgui",
|
||||
"features": ["glfw-binding", "opengl3-binding"]
|
||||
"features": [
|
||||
"glfw-binding",
|
||||
"opengl3-binding"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "imgui",
|
||||
"features": ["dx9-binding", "dx11-binding", "dx12-binding", "win32-binding"],
|
||||
"features": [
|
||||
"dx9-binding",
|
||||
"dx11-binding",
|
||||
"dx12-binding",
|
||||
"win32-binding"
|
||||
],
|
||||
"platform": "windows & !arm & !uwp"
|
||||
}
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user