mirror of
https://github.com/orange-cpp/omath.git
synced 2026-08-08 05:52:07 +00:00
Compare commits
12 Commits
v5.5.0
...
20f99d85fc
| Author | SHA1 | Date | |
|---|---|---|---|
| 20f99d85fc | |||
| de5e1e8200 | |||
| c068e3e0d8 | |||
| 078e00db0d | |||
| b3c8438bf1 | |||
| 335096d0c8 | |||
| 9f4cc99790 | |||
| f2ff761823 | |||
| 4cd5e8f829 | |||
| eac3adba2a | |||
| 4e413d977a | |||
| d4c86dacc7 |
@@ -245,72 +245,37 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
./out/Debug/unit_tests.exe
|
./out/Debug/unit_tests.exe
|
||||||
|
|
||||||
- name: Process Coverage (llvm-profdata & llvm-cov)
|
- name: Process and render coverage
|
||||||
if: ${{ matrix.triplet == 'x64-windows' }}
|
if: ${{ matrix.triplet == 'x64-windows' }}
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
run: |
|
run: |
|
||||||
$BUILD_DIR = "cmake-build/build/${{ matrix.preset }}"
|
$buildDir = "cmake-build/build/${{ matrix.preset }}"
|
||||||
$EXE_PATH = "./out/Debug/unit_tests.exe"
|
$exePath = "./out/Debug/unit_tests.exe"
|
||||||
|
$profile = "$buildDir/unit_tests.profdata"
|
||||||
# 1. Merge raw profile data (essential step)
|
$htmlDir = "$buildDir/coverage-html"
|
||||||
|
|
||||||
& "C:/Program Files/LLVM/bin/llvm-profdata.exe" merge `
|
& "C:/Program Files/LLVM/bin/llvm-profdata.exe" merge `
|
||||||
-sparse "$BUILD_DIR/unit_tests.profraw" `
|
-sparse "$buildDir/unit_tests.profraw" `
|
||||||
-o "$BUILD_DIR/unit_tests.profdata"
|
-o $profile
|
||||||
|
|
||||||
# 2. Export to LCOV format
|
if ($LASTEXITCODE -ne 0) {
|
||||||
# NOTE: We explicitly ignore vcpkg_installed and system headers
|
exit $LASTEXITCODE
|
||||||
& "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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- name: Install LCOV (for genhtml)
|
& "C:/Program Files/LLVM/bin/llvm-cov.exe" show $exePath `
|
||||||
if: ${{ matrix.triplet == 'x64-windows' }}
|
"-instr-profile=$profile" `
|
||||||
run: choco install lcov -y
|
"-format=html" `
|
||||||
|
"-output-dir=$htmlDir" `
|
||||||
|
"-ignore-filename-regex=vcpkg_installed|external|tests" `
|
||||||
|
"-show-branches=count"
|
||||||
|
|
||||||
- name: Generate HTML Report
|
if ($LASTEXITCODE -ne 0) {
|
||||||
if: ${{ matrix.triplet == 'x64-windows' }}
|
exit $LASTEXITCODE
|
||||||
shell: bash
|
}
|
||||||
run: |
|
|
||||||
BUILD_DIR="cmake-build/build/${{ matrix.preset }}"
|
|
||||||
LCOV_INFO="${BUILD_DIR}/lcov.info"
|
|
||||||
HTML_DIR="${BUILD_DIR}/coverage-html"
|
|
||||||
|
|
||||||
# Fix paths for genhtml (Perl hates backslashes)
|
if (-not (Test-Path "$htmlDir/index.html")) {
|
||||||
sed -i 's|\\|/|g' "${LCOV_INFO}"
|
throw "LLVM coverage report was not generated"
|
||||||
|
}
|
||||||
# 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"
|
|
||||||
|
|
||||||
- name: Upload Coverage (HTML Report)
|
- name: Upload Coverage (HTML Report)
|
||||||
if: ${{ matrix.triplet == 'x64-windows' }}
|
if: ${{ matrix.triplet == 'x64-windows' }}
|
||||||
|
|||||||
+21
-11
@@ -2,11 +2,9 @@
|
|||||||
// Created by Vlad on 9/17/2025.
|
// Created by Vlad on 9/17/2025.
|
||||||
//
|
//
|
||||||
#include <benchmark/benchmark.h>
|
#include <benchmark/benchmark.h>
|
||||||
|
|
||||||
#include <omath/omath.hpp>
|
#include <omath/omath.hpp>
|
||||||
using namespace omath;
|
using namespace omath;
|
||||||
|
|
||||||
|
|
||||||
void mat_float_multiplication_col_major(benchmark::State& state)
|
void mat_float_multiplication_col_major(benchmark::State& state)
|
||||||
{
|
{
|
||||||
using MatType = Mat<128, 128, float, MatStoreType::COLUMN_MAJOR>;
|
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);
|
a.set(3.f);
|
||||||
b.set(7.f);
|
b.set(7.f);
|
||||||
|
|
||||||
|
|
||||||
for ([[maybe_unused]] const auto _ : state)
|
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)
|
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);
|
a.set(3.f);
|
||||||
b.set(7.f);
|
b.set(7.f);
|
||||||
|
|
||||||
|
|
||||||
for ([[maybe_unused]] const auto _ : state)
|
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)
|
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);
|
a.set(3.f);
|
||||||
b.set(7.f);
|
b.set(7.f);
|
||||||
|
|
||||||
|
|
||||||
for ([[maybe_unused]] const auto _ : state)
|
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)
|
void mat_double_multiplication_col_major(benchmark::State& state)
|
||||||
@@ -53,13 +60,16 @@ void mat_double_multiplication_col_major(benchmark::State& state)
|
|||||||
a.set(3.f);
|
a.set(3.f);
|
||||||
b.set(7.f);
|
b.set(7.f);
|
||||||
|
|
||||||
|
|
||||||
for ([[maybe_unused]] const auto _ : state)
|
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);
|
BENCHMARK(mat_float_multiplication_col_major)->Iterations(5000);
|
||||||
BENCHMARK(mat_float_multiplication_row_major)->Iterations(5000);
|
BENCHMARK(mat_float_multiplication_row_major)->Iterations(5000);
|
||||||
|
|
||||||
BENCHMARK(mat_double_multiplication_col_major)->Iterations(5000);
|
BENCHMARK(mat_double_multiplication_col_major)->Iterations(5000);
|
||||||
BENCHMARK(mat_double_multiplication_row_major)->Iterations(5000);
|
BENCHMARK(mat_double_multiplication_row_major)->Iterations(5000);
|
||||||
|
|||||||
@@ -2,22 +2,105 @@
|
|||||||
// Created by Vlad on 9/18/2025.
|
// Created by Vlad on 9/18/2025.
|
||||||
//
|
//
|
||||||
#include <benchmark/benchmark.h>
|
#include <benchmark/benchmark.h>
|
||||||
#include <omath/omath.hpp>
|
#include <omath/projectile_prediction/proj_pred_engine_legacy.hpp>
|
||||||
using namespace omath;
|
|
||||||
|
|
||||||
using namespace omath::projectile_prediction;
|
namespace
|
||||||
|
|
||||||
constexpr float simulation_time_step = 1.f / 1000.f;
|
|
||||||
constexpr float hit_distance_tolerance = 5.f;
|
|
||||||
|
|
||||||
void source_engine_projectile_prediction(benchmark::State& state)
|
|
||||||
{
|
{
|
||||||
constexpr Target<float> target{.m_origin = {100, 0, 90}, .m_velocity = {0, 0, 0}, .m_is_airborne = false};
|
using Engine = omath::projectile_prediction::ProjPredEngineLegacy<>;
|
||||||
constexpr Projectile<float> projectile = {.m_origin = {3, 2, 1}, .m_launch_speed = 5000.f, .m_gravity_scale = 0.4f};
|
using Projectile = omath::projectile_prediction::Projectile<float>;
|
||||||
|
using Target = omath::projectile_prediction::Target<float>;
|
||||||
|
|
||||||
for ([[maybe_unused]] const auto _: state)
|
struct PredictionScenario
|
||||||
std::ignore = ProjPredEngineLegacy<>(400.f, simulation_time_step, 50.f, hit_distance_tolerance)
|
{
|
||||||
.maybe_calculate_aim_point(projectile, target);
|
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)
|
find_dependency(imgui CONFIG)
|
||||||
endif()
|
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
|
# Load the targets for the omath library
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/omathTargets.cmake")
|
include("${CMAKE_CURRENT_LIST_DIR}/omathTargets.cmake")
|
||||||
check_required_components(omath)
|
check_required_components(omath)
|
||||||
|
|||||||
@@ -161,6 +161,12 @@ namespace imgui_desktop::gui
|
|||||||
ImGuiColorEditFlags_NoInputs);
|
ImGuiColorEditFlags_NoInputs);
|
||||||
ImGui::ColorEdit4("Gradient right##lbl", reinterpret_cast<float*>(&m_label_gradient_right),
|
ImGui::ColorEdit4("Gradient right##lbl", reinterpret_cast<float*>(&m_label_gradient_right),
|
||||||
ImGuiColorEditFlags_NoInputs);
|
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::SliderFloat("Offset##lbl", &m_label_offset, 0.f, 15.f);
|
||||||
ImGui::Checkbox("Right##lbl", &m_show_right_labels);
|
ImGui::Checkbox("Right##lbl", &m_show_right_labels);
|
||||||
@@ -309,7 +315,8 @@ namespace imgui_desktop::gui
|
|||||||
const Paint centered_label_color =
|
const Paint centered_label_color =
|
||||||
m_gradient_label ? Paint{omath::hud::Gradient{m_label_gradient_left, m_label_gradient_right,
|
m_gradient_label ? Paint{omath::hud::Gradient{m_label_gradient_left, m_label_gradient_right,
|
||||||
m_label_gradient_right, m_label_gradient_left,
|
m_label_gradient_right, m_label_gradient_left,
|
||||||
m_animate_gradients}}
|
m_animate_gradients, 4.f, 0.7f,
|
||||||
|
m_label_gradient_direction}}
|
||||||
: Paint{omath::Color::from_rgba(255, 255, 255, 255)};
|
: Paint{omath::Color::from_rgba(255, 255, 255, 255)};
|
||||||
|
|
||||||
auto outline_helper = [](const bool is_outline) -> Outlined
|
auto outline_helper = [](const bool is_outline) -> Outlined
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ namespace imgui_desktop::gui
|
|||||||
omath::Color m_label_gradient_right{1.f, 0.2f, 0.7f, 1.f};
|
omath::Color m_label_gradient_right{1.f, 0.2f, 0.7f, 1.f};
|
||||||
bool m_outlined = true;
|
bool m_outlined = true;
|
||||||
bool m_gradient_label = 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_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;
|
bool m_show_centered_top = true, m_show_centered_bottom = true;
|
||||||
|
|||||||
@@ -6,6 +6,8 @@
|
|||||||
#include "omath/engines/source_engine/formulas.hpp"
|
#include "omath/engines/source_engine/formulas.hpp"
|
||||||
#include "omath/projectile_prediction/projectile.hpp"
|
#include "omath/projectile_prediction/projectile.hpp"
|
||||||
#include "omath/projectile_prediction/target.hpp"
|
#include "omath/projectile_prediction/target.hpp"
|
||||||
|
#include <cmath>
|
||||||
|
#include <limits>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
|
||||||
namespace omath::source_engine
|
namespace omath::source_engine
|
||||||
@@ -14,19 +16,58 @@ namespace omath::source_engine
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard("projectile position result should not be discarded")]]
|
[[nodiscard("projectile position result should not be discarded")]]
|
||||||
constexpr static Vector3<float> predict_projectile_position(const projectile_prediction::Projectile<float>& projectile,
|
constexpr static Vector3<float>
|
||||||
const float pitch, const float yaw,
|
predict_projectile_position(const projectile_prediction::Projectile<float>& projectile, const float pitch,
|
||||||
const float time, const float gravity) noexcept
|
const float yaw, const float time, const float gravity) noexcept
|
||||||
{
|
{
|
||||||
const auto launch_pos = projectile.m_origin + projectile.m_launch_offset;
|
const auto launch_pos = projectile.m_origin + projectile.m_launch_offset;
|
||||||
auto current_pos = launch_pos
|
const auto pitch_angle = PitchAngle::from_degrees(-pitch);
|
||||||
+ forward_vector({PitchAngle::from_degrees(-pitch), YawAngle::from_degrees(yaw),
|
const auto yaw_angle = YawAngle::from_degrees(yaw);
|
||||||
RollAngle::from_degrees(0)})
|
const auto pitch_cos = pitch_angle.cos();
|
||||||
* projectile.m_launch_speed * time;
|
// 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;
|
current_pos.z -= (gravity * projectile.m_gravity_scale) * (time * time) * 0.5f;
|
||||||
|
|
||||||
return current_pos;
|
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")]]
|
[[nodiscard("target position result should not be discarded")]]
|
||||||
static constexpr Vector3<float> predict_target_position(const projectile_prediction::Target<float>& target,
|
static constexpr Vector3<float> predict_target_position(const projectile_prediction::Target<float>& target,
|
||||||
const float time, const float gravity) noexcept
|
const float time, const float gravity) noexcept
|
||||||
@@ -78,4 +119,4 @@ namespace omath::source_engine
|
|||||||
return angles::radians_to_degrees(std::atan2(delta.y, delta.x));
|
return angles::radians_to_degrees(std::atan2(delta.y, delta.x));
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
} // namespace omath::source_engine
|
} // namespace omath::source_engine
|
||||||
|
|||||||
@@ -3,7 +3,13 @@
|
|||||||
|
|
||||||
namespace omath::hud
|
namespace omath::hud
|
||||||
{
|
{
|
||||||
struct Gradient
|
enum class GradientDirection
|
||||||
|
{
|
||||||
|
RightToLeft,
|
||||||
|
LeftToRight,
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Gradient final
|
||||||
{
|
{
|
||||||
Color top_left;
|
Color top_left;
|
||||||
Color top_right;
|
Color top_right;
|
||||||
@@ -12,5 +18,6 @@ namespace omath::hud
|
|||||||
bool animated = false;
|
bool animated = false;
|
||||||
float animation_speed = 4.f;
|
float animation_speed = 4.f;
|
||||||
float animation_spread = 0.7f;
|
float animation_spread = 0.7f;
|
||||||
|
GradientDirection direction = GradientDirection::RightToLeft;
|
||||||
};
|
};
|
||||||
} // namespace omath::hud
|
} // namespace omath::hud
|
||||||
|
|||||||
@@ -186,7 +186,14 @@ namespace omath
|
|||||||
else if constexpr (StoreType == MatStoreType::COLUMN_MAJOR)
|
else if constexpr (StoreType == MatStoreType::COLUMN_MAJOR)
|
||||||
return cache_friendly_multiply_col_major(other);
|
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);
|
return avx_multiply_row_major(other);
|
||||||
else if constexpr (StoreType == MatStoreType::COLUMN_MAJOR)
|
else if constexpr (StoreType == MatStoreType::COLUMN_MAJOR)
|
||||||
return avx_multiply_col_major(other);
|
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
|
cache_friendly_multiply_row_major(const Mat<Columns, OtherColumns, Type, MatStoreType::ROW_MAJOR>& other) const
|
||||||
{
|
{
|
||||||
Mat<Rows, OtherColumns, Type, MatStoreType::ROW_MAJOR> result;
|
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)
|
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)
|
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)
|
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;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -444,13 +460,22 @@ namespace omath
|
|||||||
const Mat<Columns, OtherColumns, Type, MatStoreType::COLUMN_MAJOR>& other) const
|
const Mat<Columns, OtherColumns, Type, MatStoreType::COLUMN_MAJOR>& other) const
|
||||||
{
|
{
|
||||||
Mat<Rows, OtherColumns, Type, MatStoreType::COLUMN_MAJOR> result;
|
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)
|
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)
|
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)
|
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;
|
return result;
|
||||||
}
|
}
|
||||||
#ifdef OMATH_USE_AVX2
|
#ifdef OMATH_USE_AVX2
|
||||||
@@ -466,56 +491,92 @@ namespace omath
|
|||||||
|
|
||||||
if constexpr (std::is_same_v<Type, float>)
|
if constexpr (std::is_same_v<Type, float>)
|
||||||
{
|
{
|
||||||
// ReSharper disable once CppTooWideScopeInitStatement
|
|
||||||
constexpr std::size_t vector_size = 8;
|
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)
|
for (std::size_t j = 0; j < OtherColumns; ++j)
|
||||||
{
|
{
|
||||||
auto* c_col = reinterpret_cast<float*>(result_mat_data + j * Rows);
|
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];
|
__m256 cvec0 = _mm256_setzero_ps();
|
||||||
const __m256 bkj_vec = _mm256_set1_ps(bkj);
|
__m256 cvec1 = _mm256_setzero_ps();
|
||||||
|
__m256 cvec2 = _mm256_setzero_ps();
|
||||||
const auto* a_col_k = reinterpret_cast<const float*>(this_mat_data + k * Rows);
|
__m256 cvec3 = _mm256_setzero_ps();
|
||||||
|
for (std::size_t k = 0; k < Columns; ++k)
|
||||||
std::size_t i = 0;
|
|
||||||
for (; i + vector_size <= Rows; i += vector_size)
|
|
||||||
{
|
{
|
||||||
__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);
|
const __m256 a_vec = _mm256_loadu_ps(a_col_k + i);
|
||||||
cvec = _mm256_fmadd_ps(a_vec, bkj_vec, cvec);
|
cvec = _mm256_fmadd_ps(a_vec, bkj_vec, cvec);
|
||||||
_mm256_storeu_ps(c_col + i, cvec);
|
|
||||||
}
|
}
|
||||||
for (; i < Rows; ++i)
|
_mm256_storeu_ps(c_col + i, cvec);
|
||||||
c_col[i] += a_col_k[i] * bkj;
|
|
||||||
}
|
}
|
||||||
|
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>)
|
else if (std::is_same_v<Type, double>)
|
||||||
{ // double
|
{
|
||||||
// ReSharper disable once CppTooWideScopeInitStatement
|
|
||||||
constexpr std::size_t vector_size = 4;
|
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)
|
for (std::size_t j = 0; j < OtherColumns; ++j)
|
||||||
{
|
{
|
||||||
auto* c_col = reinterpret_cast<double*>(result_mat_data + j * Rows);
|
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];
|
__m256d cvec0 = _mm256_setzero_pd();
|
||||||
const __m256d bkj_vec = _mm256_set1_pd(bkj);
|
__m256d cvec1 = _mm256_setzero_pd();
|
||||||
|
__m256d cvec2 = _mm256_setzero_pd();
|
||||||
const auto* a_col_k = reinterpret_cast<const double*>(this_mat_data + k * Rows);
|
__m256d cvec3 = _mm256_setzero_pd();
|
||||||
|
for (std::size_t k = 0; k < Columns; ++k)
|
||||||
std::size_t i = 0;
|
|
||||||
for (; i + vector_size <= Rows; i += vector_size)
|
|
||||||
{
|
{
|
||||||
__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);
|
const __m256d a_vec = _mm256_loadu_pd(a_col_k + i);
|
||||||
cvec = _mm256_fmadd_pd(a_vec, bkj_vec, cvec);
|
cvec = _mm256_fmadd_pd(a_vec, bkj_vec, cvec);
|
||||||
_mm256_storeu_pd(c_col + i, cvec);
|
|
||||||
}
|
}
|
||||||
for (; i < Rows; ++i)
|
_mm256_storeu_pd(c_col + i, cvec);
|
||||||
c_col[i] += a_col_k[i] * bkj;
|
|
||||||
}
|
}
|
||||||
|
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
|
else
|
||||||
@@ -536,56 +597,92 @@ namespace omath
|
|||||||
|
|
||||||
if constexpr (std::is_same_v<Type, float>)
|
if constexpr (std::is_same_v<Type, float>)
|
||||||
{
|
{
|
||||||
// ReSharper disable once CppTooWideScopeInitStatement
|
|
||||||
constexpr std::size_t vector_size = 8;
|
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)
|
for (std::size_t i = 0; i < Rows; ++i)
|
||||||
{
|
{
|
||||||
Type* c_row = result_mat_data + i * OtherColumns;
|
auto* c_row = reinterpret_cast<float*>(result_mat_data + i * OtherColumns);
|
||||||
for (std::size_t k = 0; k < Columns; ++k)
|
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]);
|
__m256 cvec0 = _mm256_setzero_ps();
|
||||||
const __m256 aik_vec = _mm256_set1_ps(aik);
|
__m256 cvec1 = _mm256_setzero_ps();
|
||||||
const auto* b_row = reinterpret_cast<const float*>(other_mat_data + k * OtherColumns);
|
__m256 cvec2 = _mm256_setzero_ps();
|
||||||
|
__m256 cvec3 = _mm256_setzero_ps();
|
||||||
std::size_t j = 0;
|
for (std::size_t k = 0; k < Columns; ++k)
|
||||||
for (; j + vector_size <= OtherColumns; j += vector_size)
|
|
||||||
{
|
{
|
||||||
__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);
|
const __m256 b_vec = _mm256_loadu_ps(b_row + j);
|
||||||
cvec = _mm256_fmadd_ps(b_vec, aik_vec, cvec);
|
cvec = _mm256_fmadd_ps(b_vec, aik_vec, cvec);
|
||||||
|
|
||||||
_mm256_storeu_ps(c_row + j, cvec);
|
|
||||||
}
|
}
|
||||||
for (; j < OtherColumns; ++j)
|
_mm256_storeu_ps(c_row + j, cvec);
|
||||||
c_row[j] += aik * b_row[j];
|
|
||||||
}
|
}
|
||||||
|
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>)
|
else if (std::is_same_v<Type, double>)
|
||||||
{ // double
|
{
|
||||||
// ReSharper disable once CppTooWideScopeInitStatement
|
|
||||||
constexpr std::size_t vector_size = 4;
|
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)
|
for (std::size_t i = 0; i < Rows; ++i)
|
||||||
{
|
{
|
||||||
Type* c_row = result_mat_data + i * OtherColumns;
|
auto* c_row = reinterpret_cast<double*>(result_mat_data + i * OtherColumns);
|
||||||
for (std::size_t k = 0; k < Columns; ++k)
|
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]);
|
__m256d cvec0 = _mm256_setzero_pd();
|
||||||
const __m256d aik_vec = _mm256_set1_pd(aik);
|
__m256d cvec1 = _mm256_setzero_pd();
|
||||||
const auto* b_row = reinterpret_cast<const double*>(other_mat_data + k * OtherColumns);
|
__m256d cvec2 = _mm256_setzero_pd();
|
||||||
|
__m256d cvec3 = _mm256_setzero_pd();
|
||||||
std::size_t j = 0;
|
for (std::size_t k = 0; k < Columns; ++k)
|
||||||
for (; j + vector_size <= OtherColumns; j += vector_size)
|
|
||||||
{
|
{
|
||||||
__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);
|
const __m256d b_vec = _mm256_loadu_pd(b_row + j);
|
||||||
cvec = _mm256_fmadd_pd(b_vec, aik_vec, cvec);
|
cvec = _mm256_fmadd_pd(b_vec, aik_vec, cvec);
|
||||||
|
|
||||||
_mm256_storeu_pd(c_row + j, cvec);
|
|
||||||
}
|
}
|
||||||
for (; j < OtherColumns; ++j)
|
_mm256_storeu_pd(c_row + j, cvec);
|
||||||
c_row[j] += aik * b_row[j];
|
|
||||||
}
|
}
|
||||||
|
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
|
else
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
#include "omath/projectile_prediction/proj_pred_engine.hpp"
|
#include "omath/projectile_prediction/proj_pred_engine.hpp"
|
||||||
#include "omath/projectile_prediction/projectile.hpp"
|
#include "omath/projectile_prediction/projectile.hpp"
|
||||||
#include "omath/projectile_prediction/target.hpp"
|
#include "omath/projectile_prediction/target.hpp"
|
||||||
|
#include <cmath>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
|
||||||
namespace omath::projectile_prediction
|
namespace omath::projectile_prediction
|
||||||
@@ -17,9 +18,8 @@ namespace omath::projectile_prediction
|
|||||||
concept PredEngineConcept =
|
concept PredEngineConcept =
|
||||||
requires(const Projectile<ArithmeticType>& projectile, const Target<ArithmeticType>& target,
|
requires(const Projectile<ArithmeticType>& projectile, const Target<ArithmeticType>& target,
|
||||||
const Vector3<ArithmeticType>& vec_a, const Vector3<ArithmeticType>& vec_b,
|
const Vector3<ArithmeticType>& vec_a, const Vector3<ArithmeticType>& vec_b,
|
||||||
Vector3<ArithmeticType> v3,
|
Vector3<ArithmeticType> v3, ArithmeticType pitch, ArithmeticType yaw, ArithmeticType time,
|
||||||
ArithmeticType pitch, ArithmeticType yaw, ArithmeticType time, ArithmeticType gravity,
|
ArithmeticType gravity, std::optional<ArithmeticType> maybe_pitch) {
|
||||||
std::optional<ArithmeticType> maybe_pitch) {
|
|
||||||
{
|
{
|
||||||
T::predict_projectile_position(projectile, pitch, yaw, time, gravity)
|
T::predict_projectile_position(projectile, pitch, yaw, time, gravity)
|
||||||
} -> std::same_as<Vector3<ArithmeticType>>;
|
} -> std::same_as<Vector3<ArithmeticType>>;
|
||||||
@@ -44,8 +44,7 @@ namespace omath::projectile_prediction
|
|||||||
class ProjPredEngineLegacy final : public ProjPredEngineInterface<ArithmeticType>
|
class ProjPredEngineLegacy final : public ProjPredEngineInterface<ArithmeticType>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit ProjPredEngineLegacy(const ArithmeticType gravity_constant,
|
explicit ProjPredEngineLegacy(const ArithmeticType gravity_constant, const ArithmeticType simulation_time_step,
|
||||||
const ArithmeticType simulation_time_step,
|
|
||||||
const ArithmeticType maximum_simulation_time,
|
const ArithmeticType maximum_simulation_time,
|
||||||
const ArithmeticType distance_tolerance)
|
const ArithmeticType distance_tolerance)
|
||||||
: m_gravity_constant(gravity_constant), m_simulation_time_step(simulation_time_step),
|
: m_gravity_constant(gravity_constant), m_simulation_time_step(simulation_time_step),
|
||||||
@@ -54,8 +53,9 @@ namespace omath::projectile_prediction
|
|||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
std::optional<Vector3<ArithmeticType>> maybe_calculate_aim_point(
|
std::optional<Vector3<ArithmeticType>>
|
||||||
const Projectile<ArithmeticType>& projectile, const Target<ArithmeticType>& target) const override
|
maybe_calculate_aim_point(const Projectile<ArithmeticType>& projectile,
|
||||||
|
const Target<ArithmeticType>& target) const override
|
||||||
{
|
{
|
||||||
const auto solution = find_solution(projectile, target);
|
const auto solution = find_solution(projectile, target);
|
||||||
if (!solution)
|
if (!solution)
|
||||||
@@ -66,15 +66,16 @@ namespace omath::projectile_prediction
|
|||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
std::optional<AimAngles<ArithmeticType>> maybe_calculate_aim_angles(
|
std::optional<AimAngles<ArithmeticType>>
|
||||||
const Projectile<ArithmeticType>& projectile, const Target<ArithmeticType>& target) const override
|
maybe_calculate_aim_angles(const Projectile<ArithmeticType>& projectile,
|
||||||
|
const Target<ArithmeticType>& target) const override
|
||||||
{
|
{
|
||||||
const auto solution = find_solution(projectile, target);
|
const auto solution = find_solution(projectile, target);
|
||||||
if (!solution)
|
if (!solution)
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
|
|
||||||
const auto yaw = EngineTrait::calc_direct_yaw_angle(
|
const auto yaw = EngineTrait::calc_direct_yaw_angle(projectile.m_origin + projectile.m_launch_offset,
|
||||||
projectile.m_origin + projectile.m_launch_offset, solution->predicted_target_position);
|
solution->predicted_target_position);
|
||||||
return AimAngles<ArithmeticType>{solution->pitch, yaw};
|
return AimAngles<ArithmeticType>{solution->pitch, yaw};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -89,23 +90,39 @@ namespace omath::projectile_prediction
|
|||||||
std::optional<Solution> find_solution(const Projectile<ArithmeticType>& projectile,
|
std::optional<Solution> find_solution(const Projectile<ArithmeticType>& projectile,
|
||||||
const Target<ArithmeticType>& target) const
|
const Target<ArithmeticType>& target) const
|
||||||
{
|
{
|
||||||
for (ArithmeticType time = ArithmeticType{0}; time < m_maximum_simulation_time;
|
if (!std::isfinite(m_simulation_time_step) || m_simulation_time_step <= ArithmeticType{0}
|
||||||
time += m_simulation_time_step)
|
|| !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 =
|
const auto predicted_target_position =
|
||||||
EngineTrait::predict_target_position(target, time, m_gravity_constant);
|
EngineTrait::predict_target_position(target, time, m_gravity_constant);
|
||||||
|
|
||||||
const auto projectile_pitch =
|
if (is_target_potentially_reachable(projectile, predicted_target_position, time))
|
||||||
maybe_calculate_projectile_launch_pitch_angle(projectile, predicted_target_position);
|
{
|
||||||
|
const auto projectile_pitch =
|
||||||
|
maybe_calculate_projectile_launch_pitch_angle(projectile, predicted_target_position);
|
||||||
|
|
||||||
if (!projectile_pitch.has_value()) [[unlikely]]
|
if (projectile_pitch.has_value()) [[likely]]
|
||||||
continue;
|
{
|
||||||
|
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(),
|
if (is_projectile_reached_target(predicted_target_position, projectile,
|
||||||
time))
|
projectile_pitch.value(), yaw, time))
|
||||||
continue;
|
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;
|
return std::nullopt;
|
||||||
}
|
}
|
||||||
@@ -144,29 +161,46 @@ namespace omath::projectile_prediction
|
|||||||
const auto distance2d = EngineTrait::calc_vector_2d_distance(delta);
|
const auto distance2d = EngineTrait::calc_vector_2d_distance(delta);
|
||||||
const auto distance2d_sqr = distance2d * distance2d;
|
const auto distance2d_sqr = distance2d * distance2d;
|
||||||
const auto launch_speed_sqr = projectile.m_launch_speed * projectile.m_launch_speed;
|
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
|
ArithmeticType root = launch_speed_sqr * launch_speed_sqr - bullet_gravity * ballistic_term;
|
||||||
- bullet_gravity
|
|
||||||
* (bullet_gravity * distance2d_sqr
|
|
||||||
+ ArithmeticType{2} * EngineTrait::get_vector_height_coordinate(delta)
|
|
||||||
* launch_speed_sqr);
|
|
||||||
|
|
||||||
if (root < ArithmeticType{0}) [[unlikely]]
|
if (root < ArithmeticType{0}) [[unlikely]]
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
|
|
||||||
root = std::sqrt(root);
|
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);
|
return angles::radians_to_degrees(angle);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
bool is_projectile_reached_target(const Vector3<ArithmeticType>& target_position,
|
bool is_target_potentially_reachable(const Projectile<ArithmeticType>& projectile,
|
||||||
const Projectile<ArithmeticType>& projectile,
|
const Vector3<ArithmeticType>& target_position,
|
||||||
const ArithmeticType pitch, const ArithmeticType time) const noexcept
|
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 =
|
const auto projectile_position =
|
||||||
EngineTrait::predict_projectile_position(projectile, pitch, yaw, time, m_gravity_constant);
|
EngineTrait::predict_projectile_position(projectile, pitch, yaw, time, m_gravity_constant);
|
||||||
|
|
||||||
|
|||||||
@@ -54,9 +54,6 @@ namespace omath
|
|||||||
return {value, Length - 1};
|
return {value, Length - 1};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
template<std::size_t N>
|
|
||||||
ConstevalPattern(const char (&)[N]) -> ConstevalPattern<N>;
|
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
static std::span<std::byte>::iterator scan_for_pattern(const std::span<std::byte>& range,
|
static std::span<std::byte>::iterator scan_for_pattern(const std::span<std::byte>& range,
|
||||||
const std::string_view& pattern);
|
const std::string_view& pattern);
|
||||||
|
|||||||
@@ -179,7 +179,7 @@ if command -v genhtml >/dev/null 2>&1; then
|
|||||||
--legend \
|
--legend \
|
||||||
--demangle-cpp \
|
--demangle-cpp \
|
||||||
--num-spaces 4 \
|
--num-spaces 4 \
|
||||||
--sort \
|
--sort-tables \
|
||||||
--function-coverage \
|
--function-coverage \
|
||||||
--branch-coverage
|
--branch-coverage
|
||||||
|
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ namespace omath::hud
|
|||||||
if (gradient.animated)
|
if (gradient.animated)
|
||||||
{
|
{
|
||||||
const float animation_offset = static_cast<float>(ImGui::GetTime()) * gradient.animation_speed;
|
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;
|
float cursor_x = position.x;
|
||||||
const char* glyph_start = text.data();
|
const char* glyph_start = text.data();
|
||||||
const char* const text_end = text.data() + text.size();
|
const char* const text_end = text.data() + text.size();
|
||||||
@@ -117,7 +118,9 @@ namespace omath::hud
|
|||||||
|
|
||||||
const char* const glyph_end = glyph_start + glyph_size;
|
const char* const glyph_end = glyph_start + glyph_size;
|
||||||
const float blend =
|
const float blend =
|
||||||
(std::sin(animation_offset + static_cast<float>(glyph_index) * gradient.animation_spread) + 1.f)
|
(std::sin(animation_offset + direction * static_cast<float>(glyph_index)
|
||||||
|
* gradient.animation_spread)
|
||||||
|
+ 1.f)
|
||||||
* 0.5f;
|
* 0.5f;
|
||||||
const auto color = gradient.top_left.value() * (1.f - blend) + gradient.top_right.value() * blend;
|
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);
|
draw_list->AddText({cursor_x, position.y}, Color{color}.to_im_color(), glyph_start, glyph_end);
|
||||||
|
|||||||
@@ -16,6 +16,21 @@ namespace
|
|||||||
const float diff = actual - expected;
|
const float diff = actual - expected;
|
||||||
return (diff < 0.0f ? -diff : diff) <= epsilon;
|
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
|
} // namespace
|
||||||
|
|
||||||
class UnitTestMat : public ::testing::Test
|
class UnitTestMat : public ::testing::Test
|
||||||
@@ -92,6 +107,45 @@ TEST_F(UnitTestMat, Operator_Multiplication_Matrix)
|
|||||||
EXPECT_FLOAT_EQ(m3.at(1, 1), 22.0f);
|
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)
|
TEST_F(UnitTestMat, Operator_Multiplication_Scalar)
|
||||||
{
|
{
|
||||||
Mat<2, 2> m3 = m2 * 2.0f;
|
Mat<2, 2> m3 = m2 * 2.0f;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
// Tests for PredEngineTrait
|
// Tests for PredEngineTrait
|
||||||
|
#include <array>
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include <omath/engines/source_engine/traits/pred_engine_trait.hpp>
|
#include <omath/engines/source_engine/traits/pred_engine_trait.hpp>
|
||||||
#include <omath/projectile_prediction/projectile.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);
|
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)
|
TEST(PredEngineTrait, ZeroLaunchOffsetMatchesOriginalBehavior)
|
||||||
{
|
{
|
||||||
Projectile p;
|
Projectile p;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
|
#include <limits>
|
||||||
#include <omath/projectile_prediction/proj_pred_engine_legacy.hpp>
|
#include <omath/projectile_prediction/proj_pred_engine_legacy.hpp>
|
||||||
#include <omath/projectile_prediction/projectile.hpp>
|
#include <omath/projectile_prediction/projectile.hpp>
|
||||||
#include <omath/projectile_prediction/target.hpp>
|
#include <omath/projectile_prediction/target.hpp>
|
||||||
@@ -15,25 +16,45 @@ struct FakeEngineZeroGravity
|
|||||||
{
|
{
|
||||||
return t.m_origin;
|
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 a fixed point matching typical target used in the test
|
||||||
return Vector3<float>{100.f, 0.f, 0.f};
|
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 calc_vector_2d_distance(const Vector3<float>& v) noexcept
|
||||||
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 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};
|
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_pitch_angle(const Vector3<float>& /*a*/, const Vector3<float>& /*b*/) noexcept
|
||||||
static float calc_direct_yaw_angle(const Vector3<float>& /*a*/, const Vector3<float>& /*b*/) noexcept { return 0.f; }
|
{
|
||||||
|
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)
|
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 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 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>;
|
using Engine = omath::projectile_prediction::ProjPredEngineLegacy<FakeEngineZeroGravity>;
|
||||||
const Engine engine(9.8f, 0.1f, 5.f, 1e-3f);
|
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);
|
const auto res = engine.maybe_calculate_aim_point(proj, target);
|
||||||
EXPECT_FALSE(res.has_value());
|
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,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"default-registry": {
|
"default-registry": {
|
||||||
"kind": "git",
|
"kind": "git",
|
||||||
"baseline": "b1b19307e2d2ec1eefbdb7ea069de7d4bcd31f01",
|
"baseline": "0878b5224d4a4968940ee296a2e7fae2d3b62983",
|
||||||
"repository": "https://github.com/microsoft/vcpkg"
|
"repository": "https://github.com/microsoft/vcpkg"
|
||||||
},
|
},
|
||||||
"registries": [
|
"registries": [
|
||||||
|
|||||||
+18
-4
@@ -21,7 +21,11 @@
|
|||||||
"dependencies": [
|
"dependencies": [
|
||||||
{
|
{
|
||||||
"name": "omath",
|
"name": "omath",
|
||||||
"features": ["imgui", "lua", "hooking"]
|
"features": [
|
||||||
|
"imgui",
|
||||||
|
"lua",
|
||||||
|
"hooking"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@@ -50,16 +54,26 @@
|
|||||||
"opengl",
|
"opengl",
|
||||||
{
|
{
|
||||||
"name": "omath",
|
"name": "omath",
|
||||||
"features": ["hooking"],
|
"features": [
|
||||||
|
"hooking"
|
||||||
|
],
|
||||||
"platform": "windows & !arm & !uwp"
|
"platform": "windows & !arm & !uwp"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "imgui",
|
"name": "imgui",
|
||||||
"features": ["glfw-binding", "opengl3-binding"]
|
"features": [
|
||||||
|
"glfw-binding",
|
||||||
|
"opengl3-binding"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "imgui",
|
"name": "imgui",
|
||||||
"features": ["dx9-binding", "dx11-binding", "dx12-binding", "win32-binding"],
|
"features": [
|
||||||
|
"dx9-binding",
|
||||||
|
"dx11-binding",
|
||||||
|
"dx12-binding",
|
||||||
|
"win32-binding"
|
||||||
|
],
|
||||||
"platform": "windows & !arm & !uwp"
|
"platform": "windows & !arm & !uwp"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user