mirror of
https://github.com/orange-cpp/omath.git
synced 2026-08-08 14:02:06 +00:00
Compare commits
87 Commits
v5.3.0
...
5b9bc0f3f8
| 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 | |||
| 0a3b10022f | |||
| 935f69426c | |||
| 9eb4dd1155 | |||
| fdcb7845cf | |||
| 3e3d2e5a23 | |||
| 58d3e1904c | |||
| d9a6f6ec91 | |||
| 468a1f4703 | |||
| db99a1ecfc | |||
| 8b4614eb89 | |||
| 0a072b0d56 | |||
| 2c60959e2b | |||
| d7ec571a7a | |||
| 235917008c | |||
| 71e256d033 | |||
| 306096af14 | |||
| 502cfb431c | |||
| 8ccc9459d4 | |||
| 2ee485297f | |||
| 6a5771e57d | |||
| 58c082d399 | |||
| 11e6f67e23 | |||
| d7f9ab6e85 | |||
| ceecdde9dc | |||
| a546c1a6d1 | |||
| 8a591ce769 | |||
| b0561c193e | |||
| fee4e4b9e3 | |||
| 2779bae82f | |||
| e82ec9c8ac | |||
| 63ea93dc1c | |||
| 10f5d866bd | |||
| 92da8bf0a6 | |||
| 47dcee037e | |||
| 75c3f2409d | |||
| a2a09fa8a6 | |||
| 43823c8fdc | |||
| 098be538f7 | |||
| 91d9335f83 | |||
| 136cd39496 | |||
| bb618f692f | |||
| 792fb13851 | |||
| 2d38387da9 | |||
| 5f14510e5b | |||
| 4a9125549f | |||
| d9acf5eea8 | |||
| 589f440e70 | |||
| 854b50f317 | |||
| a741fc1485 | |||
| a2be99be50 | |||
| 00e7c564fd | |||
| 5d9dbec5b8 |
@@ -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"
|
||||||
|
$htmlDir = "$buildDir/coverage-html"
|
||||||
|
|
||||||
# 1. Merge raw profile data (essential step)
|
|
||||||
& "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' }}
|
||||||
@@ -742,7 +707,11 @@ jobs:
|
|||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
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
|
- name: Run unit_tests.exe
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ option(OMATH_ENABLE_FORCE_INLINE
|
|||||||
option(OMATH_ENABLE_LUA
|
option(OMATH_ENABLE_LUA
|
||||||
"omath bindings for lua" OFF)
|
"omath bindings for lua" OFF)
|
||||||
option(OMATH_ENABLE_HOOKING "omath will HooksManager that can hook DirectX/OpenGL automatically" OFF)
|
option(OMATH_ENABLE_HOOKING "omath will HooksManager that can hook DirectX/OpenGL automatically" OFF)
|
||||||
|
option(OMATH_ENABLE_MODULES "Build omath C++ module interface" OFF)
|
||||||
|
|
||||||
if(VCPKG_MANIFEST_FEATURES)
|
if(VCPKG_MANIFEST_FEATURES)
|
||||||
foreach(omath_feature IN LISTS VCPKG_MANIFEST_FEATURES)
|
foreach(omath_feature IN LISTS VCPKG_MANIFEST_FEATURES)
|
||||||
@@ -80,6 +81,7 @@ if(${PROJECT_IS_TOP_LEVEL})
|
|||||||
message(STATUS "[${PROJECT_NAME}]: Coverage feature status ${OMATH_ENABLE_COVERAGE}")
|
message(STATUS "[${PROJECT_NAME}]: Coverage feature status ${OMATH_ENABLE_COVERAGE}")
|
||||||
message(STATUS "[${PROJECT_NAME}]: Valgrind feature status ${OMATH_ENABLE_VALGRIND}")
|
message(STATUS "[${PROJECT_NAME}]: Valgrind feature status ${OMATH_ENABLE_VALGRIND}")
|
||||||
message(STATUS "[${PROJECT_NAME}]: Lua feature status ${OMATH_ENABLE_LUA}")
|
message(STATUS "[${PROJECT_NAME}]: Lua feature status ${OMATH_ENABLE_LUA}")
|
||||||
|
message(STATUS "[${PROJECT_NAME}]: Modules feature status ${OMATH_ENABLE_MODULES}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(OMATH_STATIC_MSVC_RUNTIME_LIBRARY)
|
if(OMATH_STATIC_MSVC_RUNTIME_LIBRARY)
|
||||||
@@ -95,6 +97,20 @@ else()
|
|||||||
add_library(${PROJECT_NAME} STATIC ${OMATH_SOURCES} ${OMATH_HEADERS})
|
add_library(${PROJECT_NAME} STATIC ${OMATH_SOURCES} ${OMATH_HEADERS})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(OMATH_ENABLE_MODULES)
|
||||||
|
if(CMAKE_VERSION VERSION_LESS 3.28)
|
||||||
|
message(FATAL_ERROR "OMATH_ENABLE_MODULES requires CMake 3.28 or newer")
|
||||||
|
endif()
|
||||||
|
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_SCAN_FOR_MODULES ON)
|
||||||
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
||||||
|
target_compile_options(${PROJECT_NAME} PRIVATE /wd5244)
|
||||||
|
endif()
|
||||||
|
target_sources(
|
||||||
|
${PROJECT_NAME}
|
||||||
|
PUBLIC FILE_SET omath_modules TYPE CXX_MODULES BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/modules"
|
||||||
|
FILES "${CMAKE_CURRENT_SOURCE_DIR}/modules/omath.cppm")
|
||||||
|
endif()
|
||||||
|
|
||||||
if (OMATH_ENABLE_LUA)
|
if (OMATH_ENABLE_LUA)
|
||||||
target_compile_definitions(${PROJECT_NAME} PUBLIC OMATH_ENABLE_LUA)
|
target_compile_definitions(${PROJECT_NAME} PUBLIC OMATH_ENABLE_LUA)
|
||||||
|
|
||||||
@@ -120,6 +136,7 @@ if (OMATH_ENABLE_HOOKING)
|
|||||||
endif ()
|
endif ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
|
||||||
add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
|
add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
|
||||||
|
|
||||||
target_compile_definitions(${PROJECT_NAME} PUBLIC OMATH_VERSION="${PROJECT_VERSION}")
|
target_compile_definitions(${PROJECT_NAME} PUBLIC OMATH_VERSION="${PROJECT_VERSION}")
|
||||||
@@ -229,6 +246,10 @@ target_include_directories(
|
|||||||
|
|
||||||
# Installation rules
|
# Installation rules
|
||||||
|
|
||||||
|
if(OMATH_ENABLE_MODULES)
|
||||||
|
set(OMATH_MODULE_FILE_SET FILE_SET omath_modules DESTINATION modules)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Install the library
|
# Install the library
|
||||||
install(
|
install(
|
||||||
TARGETS ${PROJECT_NAME}
|
TARGETS ${PROJECT_NAME}
|
||||||
@@ -237,6 +258,7 @@ install(
|
|||||||
LIBRARY DESTINATION lib COMPONENT ${PROJECT_NAME} # For shared libraries
|
LIBRARY DESTINATION lib COMPONENT ${PROJECT_NAME} # For shared libraries
|
||||||
RUNTIME DESTINATION bin COMPONENT ${PROJECT_NAME} # For executables (on
|
RUNTIME DESTINATION bin COMPONENT ${PROJECT_NAME} # For executables (on
|
||||||
# Windows)
|
# Windows)
|
||||||
|
${OMATH_MODULE_FILE_SET}
|
||||||
)
|
)
|
||||||
|
|
||||||
# Install headers as part of omath_component
|
# Install headers as part of omath_component
|
||||||
|
|||||||
+2
-1
@@ -4,7 +4,8 @@ Thanks to everyone who made this possible, including:
|
|||||||
|
|
||||||
- Saikari aka luadebug for VCPKG port and awesome new initial logo design.
|
- Saikari aka luadebug for VCPKG port and awesome new initial logo design.
|
||||||
- Billy O'Neal aka BillyONeal for fixing compilation issues due to C math library compatibility.
|
- Billy O'Neal aka BillyONeal for fixing compilation issues due to C math library compatibility.
|
||||||
- Alex2772 for reference of AUI declarative interface design for omath::hud
|
- Alex2772 for reference of AUI declarative interface design for omath::hud.
|
||||||
|
- Keith O'Hara aka kthohr for a C++ generalized constant expression-based math library that was used as reference.
|
||||||
|
|
||||||
And a big hand to everyone else who has contributed over the past!
|
And a big hand to everyone else who has contributed over the past!
|
||||||
|
|
||||||
|
|||||||
+20
-10
@@ -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,9 +60,12 @@ 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);
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
+12
-10
@@ -3,8 +3,8 @@
|
|||||||
> Header: `omath/trigonometry/angle.hpp`
|
> Header: `omath/trigonometry/angle.hpp`
|
||||||
> Namespace: `omath`
|
> Namespace: `omath`
|
||||||
> Template: `Angle<Type = float, min = 0, max = 360, flags = AngleFlags::Normalized>`
|
> Template: `Angle<Type = float, min = 0, max = 360, flags = AngleFlags::Normalized>`
|
||||||
> Requires: `std::is_arithmetic_v<Type>`
|
> Requires: `std::is_floating_point_v<Type>`
|
||||||
> Formatters: `std::formatter` for `char`, `wchar_t`, `char8_t` → `"{}deg"`
|
> Formatters: `std::formatter` for `char` and `wchar_t` → `"{}deg"`
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
Two behaviors via `AngleFlags`:
|
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`.
|
* `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),
|
template<class Type = float, Type min = Type(0), Type max = Type(360),
|
||||||
AngleFlags flags = AngleFlags::Normalized>
|
AngleFlags flags = AngleFlags::Normalized>
|
||||||
requires std::is_arithmetic_v<Type>
|
requires std::is_floating_point_v<Type>
|
||||||
class Angle {
|
class Angle {
|
||||||
public:
|
public:
|
||||||
// Construction
|
// Construction
|
||||||
static constexpr Angle from_degrees(const Type& deg) noexcept;
|
static constexpr Angle from_degrees(const Type& deg) noexcept;
|
||||||
static constexpr Angle from_radians(const Type& rad) 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
|
constexpr Angle() noexcept; // 0 deg, adjusted by flags/range
|
||||||
|
|
||||||
// Accessors / conversions (degrees stored internally)
|
// Accessors / conversions (degrees stored internally)
|
||||||
@@ -45,10 +49,9 @@ public:
|
|||||||
Type sin() const noexcept;
|
Type sin() const noexcept;
|
||||||
Type cos() const noexcept;
|
Type cos() const noexcept;
|
||||||
Type tan() const noexcept;
|
Type tan() const noexcept;
|
||||||
Type atan() const noexcept; // atan(as_radians()) (rarely used)
|
|
||||||
Type cot() const noexcept; // cos()/sin() (watch sin≈0)
|
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;
|
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"
|
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
|
## Semantics & notes
|
||||||
|
|
||||||
* **Storage & units:** Internally stores **degrees** (`Type m_angle`). `as_radians()`/`from_radians()` use the project helpers in `omath::angles`.
|
* **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.
|
* **Arithmetic honors policy:** `operator+=`/`-=` and the binary `+`/`-` apply **wrap** or **clamp**, 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.
|
|
||||||
* **`cot()` / `tan()` singularities:** Near multiples where `sin() ≈ 0` or `cos() ≈ 0`, results blow up. Guard in your usage if inputs can approach these points.
|
* **`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.
|
* **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`
|
> Namespace: `omath::angles`
|
||||||
> All functions are `[[nodiscard]]` and `noexcept` where applicable.
|
> 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>
|
requires std::is_floating_point_v<Type>
|
||||||
Type vertical_fov_to_horizontal(const Type& vertical_fov, const Type& aspect) noexcept;
|
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>
|
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;
|
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)
|
### Wrapping angles (or any periodic value)
|
||||||
|
|
||||||
Wrap any numeric `angle` into `[min, max]`:
|
Wrap any floating-point `angle` into `[min, max)`:
|
||||||
|
|
||||||
```cpp
|
```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 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
|
float b = omath::angles::wrap_angle( -15.0f, 0.0f, 360.0f); // 345
|
||||||
// Signed range [-180,180]
|
// Signed range [-180,180]
|
||||||
@@ -83,10 +83,10 @@ float c = omath::angles::wrap_angle( 200.0f, -180.0f, 180.0f); // -160
|
|||||||
* **Type requirements**
|
* **Type requirements**
|
||||||
|
|
||||||
* Converters & FOV helpers require **floating-point** `Type`.
|
* 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.
|
* **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.
|
* **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.
|
* **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);
|
float h = vertical_fov_to_horizontal(v, 16.0f/9.0f);
|
||||||
assert(std::abs(h - 90.0f) < 1e-5f);
|
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.h>
|
||||||
#include <imgui_impl_dx11.h>
|
#include <imgui_impl_dx11.h>
|
||||||
#include <imgui_impl_win32.h>
|
#include <imgui_impl_win32.h>
|
||||||
|
#include <thread>
|
||||||
|
#include <tuple>
|
||||||
|
|
||||||
extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND, UINT, WPARAM, LPARAM);
|
extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND, UINT, WPARAM, LPARAM);
|
||||||
|
|
||||||
@@ -17,13 +19,35 @@ namespace
|
|||||||
ID3D11DeviceContext* g_context = nullptr;
|
ID3D11DeviceContext* g_context = nullptr;
|
||||||
ID3D11RenderTargetView* g_render_target_view = 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;
|
ID3D11Texture2D* back_buffer = nullptr;
|
||||||
if (FAILED(swap_chain->GetBuffer(0, IID_PPV_ARGS(&back_buffer))))
|
if (FAILED(swap_chain->GetBuffer(0, IID_PPV_ARGS(&back_buffer))))
|
||||||
return;
|
return false;
|
||||||
g_device->CreateRenderTargetView(back_buffer, nullptr, &g_render_target_view);
|
|
||||||
|
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();
|
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)
|
void init(IDXGISwapChain* swap_chain)
|
||||||
@@ -36,9 +60,9 @@ namespace
|
|||||||
g_device->GetImmediateContext(&g_context);
|
g_device->GetImmediateContext(&g_context);
|
||||||
|
|
||||||
DXGI_SWAP_CHAIN_DESC desc{};
|
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::CreateContext();
|
||||||
ImGui::StyleColorsDark();
|
ImGui::StyleColorsDark();
|
||||||
@@ -51,7 +75,7 @@ namespace
|
|||||||
|
|
||||||
auto& mgr = omath::hooks::HooksManager::get();
|
auto& mgr = omath::hooks::HooksManager::get();
|
||||||
mgr.set_on_wnd_proc(
|
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))
|
if (ImGui_ImplWin32_WndProcHandler(h, msg, wp, lp))
|
||||||
return 0;
|
return 0;
|
||||||
@@ -71,44 +95,49 @@ namespace
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!g_render_target_view)
|
if (!g_render_target_view && !create_render_target(swap_chain))
|
||||||
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);
|
g_context->OMSetRenderTargets(1, &g_render_target_view, nullptr);
|
||||||
|
|
||||||
ImGui_ImplDX11_NewFrame();
|
ImGui_ImplDX11_NewFrame();
|
||||||
ImGui_ImplWin32_NewFrame();
|
ImGui_ImplWin32_NewFrame();
|
||||||
ImGui::NewFrame();
|
ImGui::NewFrame();
|
||||||
|
ImGui::GetIO().MouseDrawCursor = true;
|
||||||
ImGui::SetNextWindowSize({300.f, 80.f}, ImGuiCond_Once);
|
ImGui::ShowDemoWindow();
|
||||||
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::Render();
|
ImGui::Render();
|
||||||
ImGui_ImplDX11_RenderDrawData(ImGui::GetDrawData());
|
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)
|
void on_resize_buffers(IDXGISwapChain*, UINT, UINT, UINT, DXGI_FORMAT, UINT)
|
||||||
{
|
{
|
||||||
if (g_render_target_view)
|
release_render_target();
|
||||||
{
|
|
||||||
g_render_target_view->Release();
|
|
||||||
g_render_target_view = nullptr;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} // namespace
|
} // 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)
|
if (reason == DLL_PROCESS_ATTACH)
|
||||||
{
|
{
|
||||||
DisableThreadLibraryCalls(h_instance);
|
DisableThreadLibraryCalls(h_instance);
|
||||||
CreateThread(
|
std::thread(
|
||||||
nullptr, 0,
|
[]()
|
||||||
[](LPVOID) -> DWORD
|
|
||||||
{
|
{
|
||||||
while (!GetModuleHandle("d3d11.dll"))
|
while (!GetModuleHandle("d3d11.dll"))
|
||||||
Sleep(100);
|
Sleep(100);
|
||||||
@@ -116,10 +145,10 @@ BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
|
|||||||
auto& mgr = omath::hooks::HooksManager::get();
|
auto& mgr = omath::hooks::HooksManager::get();
|
||||||
mgr.set_on_present(on_present);
|
mgr.set_on_present(on_present);
|
||||||
mgr.set_on_resize_buffers(on_resize_buffers);
|
mgr.set_on_resize_buffers(on_resize_buffers);
|
||||||
mgr.hook_dx11();
|
std::ignore = mgr.hook_dx11();
|
||||||
return 0;
|
return 0;
|
||||||
},
|
})
|
||||||
nullptr, 0, nullptr);
|
.detach();
|
||||||
}
|
}
|
||||||
else if (reason == DLL_PROCESS_DETACH)
|
else if (reason == DLL_PROCESS_DETACH)
|
||||||
{
|
{
|
||||||
@@ -134,11 +163,7 @@ BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
|
|||||||
ImGui::DestroyContext();
|
ImGui::DestroyContext();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (g_render_target_view)
|
release_render_target();
|
||||||
{
|
|
||||||
g_render_target_view->Release();
|
|
||||||
g_render_target_view = nullptr;
|
|
||||||
}
|
|
||||||
if (g_context)
|
if (g_context)
|
||||||
{
|
{
|
||||||
g_context->Release();
|
g_context->Release();
|
||||||
|
|||||||
@@ -16,7 +16,10 @@ namespace
|
|||||||
struct frame_context
|
struct frame_context
|
||||||
{
|
{
|
||||||
ID3D12Resource* render_target = nullptr;
|
ID3D12Resource* render_target = nullptr;
|
||||||
|
// Each back buffer gets its own allocator because allocators cannot be reset while GPU work uses them.
|
||||||
|
ID3D12CommandAllocator* command_allocator = nullptr;
|
||||||
D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle = {};
|
D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle = {};
|
||||||
|
UINT64 fence_value = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
bool g_initialized = false;
|
bool g_initialized = false;
|
||||||
@@ -28,9 +31,188 @@ namespace
|
|||||||
ID3D12DescriptorHeap* g_rtv_heap = nullptr;
|
ID3D12DescriptorHeap* g_rtv_heap = nullptr;
|
||||||
ID3D12DescriptorHeap* g_srv_heap = nullptr;
|
ID3D12DescriptorHeap* g_srv_heap = nullptr;
|
||||||
ID3D12GraphicsCommandList* g_command_list = nullptr;
|
ID3D12GraphicsCommandList* g_command_list = nullptr;
|
||||||
ID3D12CommandAllocator* g_command_allocator = nullptr;
|
ID3D12Fence* g_fence = nullptr;
|
||||||
|
HANDLE g_fence_event = nullptr;
|
||||||
|
UINT64 g_fence_value = 0;
|
||||||
std::vector<frame_context> g_frames;
|
std::vector<frame_context> g_frames;
|
||||||
|
|
||||||
|
// This fence tracks only the overlay work submitted by this DLL, not the game's whole frame.
|
||||||
|
bool create_sync_objects()
|
||||||
|
{
|
||||||
|
if (g_fence)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (FAILED(g_device->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&g_fence))))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
g_fence_event = CreateEvent(nullptr, FALSE, FALSE, nullptr);
|
||||||
|
if (!g_fence_event)
|
||||||
|
{
|
||||||
|
g_fence->Release();
|
||||||
|
g_fence = nullptr;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
g_fence_value = 0;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool wait_for_fence_value(UINT64 fence_value)
|
||||||
|
{
|
||||||
|
if (!g_fence || !g_fence_event || fence_value == 0 || g_fence->GetCompletedValue() >= fence_value)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (FAILED(g_fence->SetEventOnCompletion(fence_value, g_fence_event)))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
WaitForSingleObject(g_fence_event, INFINITE);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void wait_for_frame(frame_context& fc)
|
||||||
|
{
|
||||||
|
// The current back buffer's allocator is safe to reset only after its previous overlay pass completes.
|
||||||
|
if (wait_for_fence_value(fc.fence_value))
|
||||||
|
fc.fence_value = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void wait_for_gpu()
|
||||||
|
{
|
||||||
|
// ResizeBuffers and shutdown must not release back buffers still referenced by queued overlay commands.
|
||||||
|
if (!g_command_queue || !g_fence || !g_fence_event)
|
||||||
|
return;
|
||||||
|
|
||||||
|
const UINT64 fence_value = ++g_fence_value;
|
||||||
|
if (FAILED(g_command_queue->Signal(g_fence, fence_value)))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (wait_for_fence_value(fence_value))
|
||||||
|
{
|
||||||
|
for (auto& fc : g_frames)
|
||||||
|
fc.fence_value = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool signal_frame(frame_context& fc)
|
||||||
|
{
|
||||||
|
if (!g_command_queue || !g_fence)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
const UINT64 fence_value = ++g_fence_value;
|
||||||
|
if (FAILED(g_command_queue->Signal(g_fence, fence_value)))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
fc.fence_value = fence_value;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void release_sync_objects()
|
||||||
|
{
|
||||||
|
if (g_fence_event)
|
||||||
|
{
|
||||||
|
CloseHandle(g_fence_event);
|
||||||
|
g_fence_event = nullptr;
|
||||||
|
}
|
||||||
|
if (g_fence)
|
||||||
|
{
|
||||||
|
g_fence->Release();
|
||||||
|
g_fence = nullptr;
|
||||||
|
}
|
||||||
|
g_fence_value = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void release_frame_contexts()
|
||||||
|
{
|
||||||
|
for (auto& fc : g_frames)
|
||||||
|
{
|
||||||
|
if (fc.render_target)
|
||||||
|
{
|
||||||
|
fc.render_target->Release();
|
||||||
|
fc.render_target = nullptr;
|
||||||
|
}
|
||||||
|
if (fc.command_allocator)
|
||||||
|
{
|
||||||
|
fc.command_allocator->Release();
|
||||||
|
fc.command_allocator = nullptr;
|
||||||
|
}
|
||||||
|
fc.fence_value = 0;
|
||||||
|
}
|
||||||
|
g_frames.clear();
|
||||||
|
|
||||||
|
if (g_rtv_heap)
|
||||||
|
{
|
||||||
|
g_rtv_heap->Release();
|
||||||
|
g_rtv_heap = nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void release_command_objects()
|
||||||
|
{
|
||||||
|
if (g_command_list)
|
||||||
|
{
|
||||||
|
g_command_list->Release();
|
||||||
|
g_command_list = nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool create_command_objects()
|
||||||
|
{
|
||||||
|
if (g_frames.empty() || !g_frames[0].command_allocator)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (FAILED(g_device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, g_frames[0].command_allocator,
|
||||||
|
nullptr, IID_PPV_ARGS(&g_command_list))))
|
||||||
|
{
|
||||||
|
release_command_objects();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
g_command_list->Close();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool create_render_targets(IDXGISwapChain* swap_chain)
|
||||||
|
{
|
||||||
|
// These references must be released before IDXGISwapChain::ResizeBuffers reaches the original function.
|
||||||
|
DXGI_SWAP_CHAIN_DESC desc{};
|
||||||
|
if (FAILED(swap_chain->GetDesc(&desc)))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
const UINT buffer_count = desc.BufferCount;
|
||||||
|
|
||||||
|
D3D12_DESCRIPTOR_HEAP_DESC heap_desc{};
|
||||||
|
heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV;
|
||||||
|
heap_desc.NumDescriptors = buffer_count;
|
||||||
|
heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
|
||||||
|
heap_desc.NodeMask = 1;
|
||||||
|
if (FAILED(g_device->CreateDescriptorHeap(&heap_desc, IID_PPV_ARGS(&g_rtv_heap))))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
g_frames.resize(buffer_count);
|
||||||
|
const UINT rtv_size = g_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
|
||||||
|
D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle = g_rtv_heap->GetCPUDescriptorHandleForHeapStart();
|
||||||
|
|
||||||
|
for (UINT i = 0; i < buffer_count; ++i)
|
||||||
|
{
|
||||||
|
g_frames[i].rtv_handle = rtv_handle;
|
||||||
|
if (FAILED(g_device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT,
|
||||||
|
IID_PPV_ARGS(&g_frames[i].command_allocator))))
|
||||||
|
{
|
||||||
|
release_frame_contexts();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (FAILED(swap_chain->GetBuffer(i, IID_PPV_ARGS(&g_frames[i].render_target))))
|
||||||
|
{
|
||||||
|
release_frame_contexts();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
g_device->CreateRenderTargetView(g_frames[i].render_target, nullptr, rtv_handle);
|
||||||
|
rtv_handle.ptr += rtv_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
void init(IDXGISwapChain* swap_chain)
|
void init(IDXGISwapChain* swap_chain)
|
||||||
{
|
{
|
||||||
g_init_attempted = true;
|
g_init_attempted = true;
|
||||||
@@ -53,37 +235,15 @@ namespace
|
|||||||
if (FAILED(g_device->CreateDescriptorHeap(&heap_desc, IID_PPV_ARGS(&g_srv_heap))))
|
if (FAILED(g_device->CreateDescriptorHeap(&heap_desc, IID_PPV_ARGS(&g_srv_heap))))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
{
|
|
||||||
D3D12_DESCRIPTOR_HEAP_DESC heap_desc{};
|
|
||||||
heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV;
|
|
||||||
heap_desc.NumDescriptors = buffer_count;
|
|
||||||
heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE;
|
|
||||||
heap_desc.NodeMask = 1;
|
|
||||||
if (FAILED(g_device->CreateDescriptorHeap(&heap_desc, IID_PPV_ARGS(&g_rtv_heap))))
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FAILED(g_device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT,
|
if (!create_render_targets(swap_chain))
|
||||||
IID_PPV_ARGS(&g_command_allocator))))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
g_frames.resize(buffer_count);
|
if (!create_command_objects())
|
||||||
const UINT rtv_size = g_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_RTV);
|
return;
|
||||||
D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle = g_rtv_heap->GetCPUDescriptorHandleForHeapStart();
|
|
||||||
|
if (!create_sync_objects())
|
||||||
for (UINT i = 0; i < buffer_count; ++i)
|
|
||||||
{
|
|
||||||
g_frames[i].rtv_handle = rtv_handle;
|
|
||||||
if (FAILED(swap_chain->GetBuffer(i, IID_PPV_ARGS(&g_frames[i].render_target))))
|
|
||||||
return;
|
|
||||||
g_device->CreateRenderTargetView(g_frames[i].render_target, nullptr, rtv_handle);
|
|
||||||
rtv_handle.ptr += rtv_size;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FAILED(g_device->CreateCommandList(0, D3D12_COMMAND_LIST_TYPE_DIRECT, g_command_allocator, nullptr,
|
|
||||||
IID_PPV_ARGS(&g_command_list))))
|
|
||||||
return;
|
return;
|
||||||
g_command_list->Close();
|
|
||||||
|
|
||||||
ImGui::CreateContext();
|
ImGui::CreateContext();
|
||||||
ImGui::StyleColorsDark();
|
ImGui::StyleColorsDark();
|
||||||
@@ -114,27 +274,65 @@ namespace
|
|||||||
|
|
||||||
void on_execute_command_lists(ID3D12CommandQueue* queue, UINT, ID3D12CommandList* const*)
|
void on_execute_command_lists(ID3D12CommandQueue* queue, UINT, ID3D12CommandList* const*)
|
||||||
{
|
{
|
||||||
|
// The overlay records DIRECT command lists; executing them on COPY/COMPUTE queues can remove the device.
|
||||||
if (!g_command_queue)
|
if (!g_command_queue)
|
||||||
g_command_queue = queue;
|
{
|
||||||
|
const D3D12_COMMAND_QUEUE_DESC desc = queue->GetDesc();
|
||||||
|
if (desc.Type == D3D12_COMMAND_LIST_TYPE_DIRECT)
|
||||||
|
g_command_queue = queue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void on_present(IDXGISwapChain* swap_chain, UINT, UINT)
|
bool ensure_initialized(IDXGISwapChain* swap_chain)
|
||||||
{
|
{
|
||||||
if (!g_initialized)
|
if (g_initialized)
|
||||||
{
|
return true;
|
||||||
if (!g_init_attempted && g_command_queue)
|
|
||||||
init(swap_chain);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!g_command_queue)
|
if (!g_init_attempted && g_command_queue)
|
||||||
return;
|
init(swap_chain);
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ensure_render_targets(IDXGISwapChain* swap_chain)
|
||||||
|
{
|
||||||
|
if (!g_frames.empty() && g_rtv_heap)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return create_render_targets(swap_chain);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ensure_command_list()
|
||||||
|
{
|
||||||
|
if (g_command_list)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return create_command_objects();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ensure_sync_ready()
|
||||||
|
{
|
||||||
|
if (g_fence)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return create_sync_objects();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ensure_present_resources(IDXGISwapChain* swap_chain)
|
||||||
|
{
|
||||||
|
if (!ensure_initialized(swap_chain) || !g_command_queue)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return ensure_render_targets(swap_chain) && ensure_command_list() && ensure_sync_ready();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool begin_imgui_frame()
|
||||||
|
{
|
||||||
if (GetAsyncKeyState(VK_INSERT) & 1)
|
if (GetAsyncKeyState(VK_INSERT) & 1)
|
||||||
show_menu = !show_menu;
|
show_menu = !show_menu;
|
||||||
|
|
||||||
if (!show_menu)
|
if (!show_menu)
|
||||||
return;
|
return false;
|
||||||
|
|
||||||
ImGui_ImplDX12_NewFrame();
|
ImGui_ImplDX12_NewFrame();
|
||||||
ImGui_ImplWin32_NewFrame();
|
ImGui_ImplWin32_NewFrame();
|
||||||
@@ -142,67 +340,97 @@ namespace
|
|||||||
ImGui::GetIO().MouseDrawCursor = true;
|
ImGui::GetIO().MouseDrawCursor = true;
|
||||||
ImGui::ShowDemoWindow();
|
ImGui::ShowDemoWindow();
|
||||||
ImGui::EndFrame();
|
ImGui::EndFrame();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
frame_context* current_frame_context()
|
||||||
|
{
|
||||||
const UINT buf_idx = g_swap_chain->GetCurrentBackBufferIndex();
|
const UINT buf_idx = g_swap_chain->GetCurrentBackBufferIndex();
|
||||||
auto& fc = g_frames[buf_idx];
|
if (buf_idx >= g_frames.size())
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
g_command_allocator->Reset();
|
return &g_frames[buf_idx];
|
||||||
g_command_list->Reset(g_command_allocator, nullptr);
|
}
|
||||||
|
|
||||||
|
bool reset_overlay_command_list(frame_context& fc)
|
||||||
|
{
|
||||||
|
wait_for_frame(fc);
|
||||||
|
|
||||||
|
// Both resets depend on wait_for_frame(); otherwise DLSSG/Streamline can observe invalid GPU work.
|
||||||
|
if (FAILED(fc.command_allocator->Reset()))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (FAILED(g_command_list->Reset(fc.command_allocator, nullptr)))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void transition_render_target(frame_context& fc, D3D12_RESOURCE_STATES before, D3D12_RESOURCE_STATES after)
|
||||||
|
{
|
||||||
D3D12_RESOURCE_BARRIER barrier{};
|
D3D12_RESOURCE_BARRIER barrier{};
|
||||||
barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
|
barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
|
||||||
barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
|
barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE;
|
||||||
barrier.Transition.pResource = fc.render_target;
|
barrier.Transition.pResource = fc.render_target;
|
||||||
barrier.Transition.Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES;
|
barrier.Transition.Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES;
|
||||||
barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_PRESENT;
|
barrier.Transition.StateBefore = before;
|
||||||
barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_RENDER_TARGET;
|
barrier.Transition.StateAfter = after;
|
||||||
g_command_list->ResourceBarrier(1, &barrier);
|
g_command_list->ResourceBarrier(1, &barrier);
|
||||||
|
}
|
||||||
|
|
||||||
|
void record_overlay_commands(frame_context& fc)
|
||||||
|
{
|
||||||
|
transition_render_target(fc, D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET);
|
||||||
g_command_list->OMSetRenderTargets(1, &fc.rtv_handle, FALSE, nullptr);
|
g_command_list->OMSetRenderTargets(1, &fc.rtv_handle, FALSE, nullptr);
|
||||||
g_command_list->SetDescriptorHeaps(1, &g_srv_heap);
|
g_command_list->SetDescriptorHeaps(1, &g_srv_heap);
|
||||||
|
|
||||||
ImGui::Render();
|
ImGui::Render();
|
||||||
ImGui_ImplDX12_RenderDrawData(ImGui::GetDrawData(), g_command_list);
|
ImGui_ImplDX12_RenderDrawData(ImGui::GetDrawData(), g_command_list);
|
||||||
|
|
||||||
barrier.Transition.StateBefore = D3D12_RESOURCE_STATE_RENDER_TARGET;
|
transition_render_target(fc, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT);
|
||||||
barrier.Transition.StateAfter = D3D12_RESOURCE_STATE_PRESENT;
|
}
|
||||||
g_command_list->ResourceBarrier(1, &barrier);
|
|
||||||
g_command_list->Close();
|
bool submit_overlay_commands(frame_context& fc)
|
||||||
|
{
|
||||||
|
if (FAILED(g_command_list->Close()))
|
||||||
|
return false;
|
||||||
|
|
||||||
ID3D12CommandList* cmd_lists[] = {g_command_list};
|
ID3D12CommandList* cmd_lists[] = {g_command_list};
|
||||||
g_command_queue->ExecuteCommandLists(1, cmd_lists);
|
g_command_queue->ExecuteCommandLists(1, cmd_lists);
|
||||||
|
return signal_frame(fc);
|
||||||
|
}
|
||||||
|
|
||||||
|
void on_present(IDXGISwapChain* swap_chain, UINT, UINT)
|
||||||
|
{
|
||||||
|
if (!ensure_present_resources(swap_chain) || !begin_imgui_frame())
|
||||||
|
return;
|
||||||
|
|
||||||
|
frame_context* fc = current_frame_context();
|
||||||
|
if (!fc || !reset_overlay_command_list(*fc))
|
||||||
|
return;
|
||||||
|
|
||||||
|
record_overlay_commands(*fc);
|
||||||
|
std::ignore = submit_overlay_commands(*fc);
|
||||||
|
}
|
||||||
|
|
||||||
|
void on_resize_buffers(IDXGISwapChain*, UINT, UINT, UINT, DXGI_FORMAT, UINT)
|
||||||
|
{
|
||||||
|
wait_for_gpu();
|
||||||
|
release_command_objects();
|
||||||
|
release_frame_contexts();
|
||||||
}
|
}
|
||||||
|
|
||||||
void release_dx12_resources()
|
void release_dx12_resources()
|
||||||
{
|
{
|
||||||
for (auto& fc : g_frames)
|
wait_for_gpu();
|
||||||
{
|
release_command_objects();
|
||||||
if (fc.render_target)
|
release_frame_contexts();
|
||||||
{
|
release_sync_objects();
|
||||||
fc.render_target->Release();
|
|
||||||
fc.render_target = nullptr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
g_frames.clear();
|
|
||||||
if (g_command_allocator)
|
|
||||||
{
|
|
||||||
g_command_allocator->Release();
|
|
||||||
g_command_allocator = nullptr;
|
|
||||||
}
|
|
||||||
if (g_command_list)
|
|
||||||
{
|
|
||||||
g_command_list->Release();
|
|
||||||
g_command_list = nullptr;
|
|
||||||
}
|
|
||||||
if (g_srv_heap)
|
if (g_srv_heap)
|
||||||
{
|
{
|
||||||
g_srv_heap->Release();
|
g_srv_heap->Release();
|
||||||
g_srv_heap = nullptr;
|
g_srv_heap = nullptr;
|
||||||
}
|
}
|
||||||
if (g_rtv_heap)
|
|
||||||
{
|
|
||||||
g_rtv_heap->Release();
|
|
||||||
g_rtv_heap = nullptr;
|
|
||||||
}
|
|
||||||
if (g_swap_chain)
|
if (g_swap_chain)
|
||||||
{
|
{
|
||||||
g_swap_chain->Release();
|
g_swap_chain->Release();
|
||||||
@@ -221,20 +449,20 @@ BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
|
|||||||
if (reason == DLL_PROCESS_ATTACH)
|
if (reason == DLL_PROCESS_ATTACH)
|
||||||
{
|
{
|
||||||
DisableThreadLibraryCalls(h_instance);
|
DisableThreadLibraryCalls(h_instance);
|
||||||
CreateThread(
|
std::thread(
|
||||||
nullptr, 0,
|
[]()
|
||||||
[](LPVOID) -> DWORD
|
|
||||||
{
|
{
|
||||||
while (!GetModuleHandle("d3d12.dll"))
|
while (!GetModuleHandle("d3d12.dll"))
|
||||||
Sleep(100);
|
Sleep(100);
|
||||||
|
|
||||||
auto& mgr = omath::hooks::HooksManager::get();
|
auto& mgr = omath::hooks::HooksManager::get();
|
||||||
mgr.set_on_present(on_present);
|
mgr.set_on_present(on_present);
|
||||||
|
mgr.set_on_resize_buffers(on_resize_buffers);
|
||||||
mgr.set_on_execute_command_lists(on_execute_command_lists);
|
mgr.set_on_execute_command_lists(on_execute_command_lists);
|
||||||
std::ignore = mgr.hook_dx12();
|
std::ignore = mgr.hook_dx12();
|
||||||
return 0;
|
return 0;
|
||||||
},
|
})
|
||||||
nullptr, 0, nullptr);
|
.detach();
|
||||||
}
|
}
|
||||||
else if (reason == DLL_PROCESS_DETACH)
|
else if (reason == DLL_PROCESS_DETACH)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
|
#include "omath/hooks/hooks_manager.hpp"
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
#include <d3d9.h>
|
#include <d3d9.h>
|
||||||
#include <imgui.h>
|
#include <imgui.h>
|
||||||
#include <imgui_impl_dx9.h>
|
#include <imgui_impl_dx9.h>
|
||||||
#include <imgui_impl_win32.h>
|
#include <imgui_impl_win32.h>
|
||||||
|
|
||||||
#include "omath/hooks/hooks_manager.hpp"
|
|
||||||
|
|
||||||
extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND, UINT, WPARAM, LPARAM);
|
extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND, UINT, WPARAM, LPARAM);
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
bool g_initialized = false;
|
bool g_initialized = false;
|
||||||
bool g_init_attempted = false;
|
bool g_init_attempted = false;
|
||||||
|
|
||||||
void init(IDirect3DDevice9* device)
|
void init(IDirect3DDevice9* device)
|
||||||
@@ -31,12 +30,14 @@ namespace
|
|||||||
ImGui_ImplDX9_Init(device);
|
ImGui_ImplDX9_Init(device);
|
||||||
|
|
||||||
auto& mgr = omath::hooks::HooksManager::get();
|
auto& mgr = omath::hooks::HooksManager::get();
|
||||||
mgr.set_on_wnd_proc([](HWND h, UINT msg, WPARAM wp, LPARAM lp) -> std::optional<LRESULT> {
|
mgr.set_on_wnd_proc(
|
||||||
if (ImGui_ImplWin32_WndProcHandler(h, msg, wp, lp))
|
[](HWND h, UINT msg, WPARAM wp, LPARAM lp) -> std::optional<LRESULT>
|
||||||
return 0;
|
{
|
||||||
return std::nullopt;
|
if (ImGui_ImplWin32_WndProcHandler(h, msg, wp, lp))
|
||||||
});
|
return 0;
|
||||||
mgr.hook_wnd_proc(params.hFocusWindow);
|
return std::nullopt;
|
||||||
|
});
|
||||||
|
std::ignore = mgr.hook_wnd_proc(params.hFocusWindow);
|
||||||
|
|
||||||
g_initialized = true;
|
g_initialized = true;
|
||||||
}
|
}
|
||||||
@@ -54,11 +55,8 @@ namespace
|
|||||||
ImGui_ImplWin32_NewFrame();
|
ImGui_ImplWin32_NewFrame();
|
||||||
ImGui::NewFrame();
|
ImGui::NewFrame();
|
||||||
|
|
||||||
ImGui::SetNextWindowSize({300.f, 80.f}, ImGuiCond_Once);
|
ImGui::GetIO().MouseDrawCursor = true;
|
||||||
ImGui::SetNextWindowPos({10.f, 10.f}, ImGuiCond_Once);
|
ImGui::ShowDemoWindow();
|
||||||
ImGui::Begin("omath | DX9 hook");
|
|
||||||
ImGui::Text("Hook active");
|
|
||||||
ImGui::Text("FPS: %.1f", ImGui::GetIO().Framerate);
|
|
||||||
ImGui::End();
|
ImGui::End();
|
||||||
|
|
||||||
ImGui::EndFrame();
|
ImGui::EndFrame();
|
||||||
@@ -78,17 +76,19 @@ BOOL WINAPI DllMain(HINSTANCE h_instance, DWORD reason, LPVOID)
|
|||||||
if (reason == DLL_PROCESS_ATTACH)
|
if (reason == DLL_PROCESS_ATTACH)
|
||||||
{
|
{
|
||||||
DisableThreadLibraryCalls(h_instance);
|
DisableThreadLibraryCalls(h_instance);
|
||||||
CreateThread(nullptr, 0, [](LPVOID) -> DWORD
|
std::thread(
|
||||||
{
|
[]()
|
||||||
while (!GetModuleHandle("d3d9.dll"))
|
{
|
||||||
Sleep(100);
|
while (!GetModuleHandle("d3d9.dll"))
|
||||||
|
Sleep(100);
|
||||||
|
|
||||||
auto& mgr = omath::hooks::HooksManager::get();
|
auto& mgr = omath::hooks::HooksManager::get();
|
||||||
mgr.set_on_dx9_present(on_present);
|
mgr.set_on_dx9_present(on_present);
|
||||||
mgr.set_on_dx9_reset(on_reset);
|
mgr.set_on_dx9_reset(on_reset);
|
||||||
mgr.hook_dx9();
|
std::ignore = mgr.hook_dx9();
|
||||||
return 0;
|
return 0;
|
||||||
}, nullptr, 0, nullptr);
|
})
|
||||||
|
.detach();
|
||||||
}
|
}
|
||||||
else if (reason == DLL_PROCESS_DETACH)
|
else if (reason == DLL_PROCESS_DETACH)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
#include "main_window.hpp"
|
#include "main_window.hpp"
|
||||||
#include "omath/hud/renderer_realizations/imgui_renderer.hpp"
|
#include "omath/hud/renderer_realizations/imgui_renderer.hpp"
|
||||||
#include <GLFW/glfw3.h>
|
#include <GLFW/glfw3.h>
|
||||||
|
#include <cmath>
|
||||||
#include <imgui.h>
|
#include <imgui.h>
|
||||||
#include <imgui_impl_glfw.h>
|
#include <imgui_impl_glfw.h>
|
||||||
#include <imgui_impl_opengl3.h>
|
#include <imgui_impl_opengl3.h>
|
||||||
@@ -65,6 +66,19 @@ namespace imgui_desktop::gui
|
|||||||
ImGui::Begin("Controls", &m_opened,
|
ImGui::Begin("Controls", &m_opened,
|
||||||
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);
|
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);
|
||||||
ImGui::PushItemWidth(160.f);
|
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))
|
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("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("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);
|
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))
|
if (ImGui::CollapsingHeader("Box", ImGuiTreeNodeFlags_DefaultOpen))
|
||||||
@@ -83,9 +103,20 @@ namespace imgui_desktop::gui
|
|||||||
ImGui::Checkbox("Dashed", &m_show_dashed_box);
|
ImGui::Checkbox("Dashed", &m_show_dashed_box);
|
||||||
ImGui::ColorEdit4("Color##box", reinterpret_cast<float*>(&m_box_color), ImGuiColorEditFlags_NoInputs);
|
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::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::ColorEdit4("Outline##box", reinterpret_cast<float*>(&m_box_outline), ImGuiColorEditFlags_NoInputs);
|
||||||
ImGui::SliderFloat("Thickness", &m_box_thickness, 0.5f, 5.f);
|
ImGui::SliderFloat("Thickness", &m_box_thickness, 0.5f, 5.f);
|
||||||
ImGui::SliderFloat("Corner ratio", &m_corner_ratio, 0.05f, 0.5f);
|
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::Separator();
|
||||||
ImGui::ColorEdit4("Dash color", reinterpret_cast<float*>(&m_dash_color), ImGuiColorEditFlags_NoInputs);
|
ImGui::ColorEdit4("Dash color", reinterpret_cast<float*>(&m_dash_color), ImGuiColorEditFlags_NoInputs);
|
||||||
ImGui::SliderFloat("Dash length", &m_dash_len, 2.f, 30.f);
|
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("BG##bar", reinterpret_cast<float*>(&m_bar_bg_color), ImGuiColorEditFlags_NoInputs);
|
||||||
ImGui::ColorEdit4("Outline##bar", reinterpret_cast<float*>(&m_bar_outline_color),
|
ImGui::ColorEdit4("Outline##bar", reinterpret_cast<float*>(&m_bar_outline_color),
|
||||||
ImGuiColorEditFlags_NoInputs);
|
ImGuiColorEditFlags_NoInputs);
|
||||||
|
ImGui::Checkbox("Gradient bars", &m_gradient_bars);
|
||||||
ImGui::SliderFloat("Width##bar", &m_bar_width, 1.f, 20.f);
|
ImGui::SliderFloat("Width##bar", &m_bar_width, 1.f, 20.f);
|
||||||
ImGui::SliderFloat("Value##bar", &m_bar_value, 0.f, 1.f);
|
ImGui::SliderFloat("Value##bar", &m_bar_value, 0.f, 1.f);
|
||||||
ImGui::SliderFloat("Offset##bar", &m_bar_offset, 1.f, 20.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::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 len##bar", &m_bar_dash_len, 2.f, 20.f);
|
||||||
ImGui::SliderFloat("Dash gap##bar", &m_bar_dash_gap, 1.f, 15.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))
|
if (ImGui::CollapsingHeader("Labels", ImGuiTreeNodeFlags_DefaultOpen))
|
||||||
{
|
{
|
||||||
ImGui::Checkbox("Outlined", &m_outlined);
|
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::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);
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
@@ -131,6 +178,7 @@ namespace imgui_desktop::gui
|
|||||||
ImGui::Checkbox("Ctr top##lbl", &m_show_centered_top);
|
ImGui::Checkbox("Ctr top##lbl", &m_show_centered_top);
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
ImGui::Checkbox("Ctr bot##lbl", &m_show_centered_bottom);
|
ImGui::Checkbox("Ctr bot##lbl", &m_show_centered_bottom);
|
||||||
|
draw_glow_controls("Label glow", m_label_glow);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ImGui::CollapsingHeader("Skeleton"))
|
if (ImGui::CollapsingHeader("Skeleton"))
|
||||||
@@ -193,9 +241,83 @@ namespace imgui_desktop::gui
|
|||||||
using namespace omath::hud::widget;
|
using namespace omath::hud::widget;
|
||||||
using omath::hud::when;
|
using omath::hud::when;
|
||||||
const auto* vp = ImGui::GetMainViewport();
|
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,
|
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};
|
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
|
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,
|
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>())
|
std::make_shared<omath::hud::ImguiHudRenderer>())
|
||||||
.contents(
|
.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 ────────────────────────────────────────────────────
|
// ── Boxes ────────────────────────────────────────────────────
|
||||||
when(m_show_box, Box{m_box_color, m_box_fill, m_box_outline, 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,
|
when(m_show_cornered_box,
|
||||||
m_box_outline, m_corner_ratio, m_box_thickness}),
|
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}),
|
when(m_show_dashed_box, DashedBox{m_dash_color, m_dash_len, m_dash_gap, m_dash_thickness}),
|
||||||
RightSide{
|
RightSide{
|
||||||
when(m_show_right_bar, bar),
|
when(m_show_right_bar, bar),
|
||||||
@@ -254,14 +379,14 @@ namespace imgui_desktop::gui
|
|||||||
when(m_show_bottom_bar, bar),
|
when(m_show_bottom_bar, bar),
|
||||||
when(m_show_bottom_dashed_bar, dbar),
|
when(m_show_bottom_dashed_bar, dbar),
|
||||||
when(m_show_centered_bottom,
|
when(m_show_centered_bottom,
|
||||||
Centered{Label{omath::Color::from_rgba(255, 255, 255, 255), m_label_offset,
|
Centered{Label{centered_label_color, m_label_offset, outline_helper(m_outlined),
|
||||||
outline_helper(m_outlined), "PlayerName"}}),
|
"Gradient PlayerName", label_glow}}),
|
||||||
when(m_show_bottom_labels, Label{omath::Color::from_rgba(200, 200, 0, 255),
|
when(m_show_bottom_labels, Label{omath::Color::from_rgba(200, 200, 0, 255),
|
||||||
m_label_offset, outline_helper(m_outlined), "42m"}),
|
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_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_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},
|
when(m_show_proj, ProjectileAim{{m_proj_pos_x, m_proj_pos_y},
|
||||||
m_proj_color,
|
m_proj_color,
|
||||||
m_proj_size,
|
m_proj_size,
|
||||||
|
|||||||
@@ -17,6 +17,14 @@ namespace imgui_desktop::gui
|
|||||||
void Run();
|
void Run();
|
||||||
|
|
||||||
private:
|
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_controls();
|
||||||
void draw_overlay();
|
void draw_overlay();
|
||||||
void present();
|
void present();
|
||||||
@@ -30,8 +38,12 @@ namespace imgui_desktop::gui
|
|||||||
// Box
|
// Box
|
||||||
omath::Color m_box_color{1.f, 1.f, 1.f, 1.f};
|
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_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};
|
omath::Color m_box_outline{0.f, 0.f, 0.f, 0.f};
|
||||||
float m_box_thickness = 1.f, m_corner_ratio = 0.2f;
|
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;
|
bool m_show_box = true, m_show_cornered_box = true, m_show_dashed_box = false;
|
||||||
|
|
||||||
// Dashed box
|
// 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_bg_color{0.f, 0.f, 0.f, 0.5f};
|
||||||
omath::Color m_bar_outline_color{0.f, 0.f, 0.f, 1.f};
|
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;
|
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_gradient_bars = true;
|
||||||
bool m_show_top_bar = true, m_show_bottom_bar = 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_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;
|
float m_bar_dash_len = 6.f, m_bar_dash_gap = 4.f;
|
||||||
|
|
||||||
// Labels
|
// Labels
|
||||||
float m_label_offset = 3.f;
|
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_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_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;
|
||||||
|
|
||||||
|
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
|
// Skeleton
|
||||||
omath::Color m_skel_color = omath::Color::from_rgba(255, 255, 255, 200);
|
omath::Color m_skel_color = omath::Color::from_rgba(255, 255, 255, 200);
|
||||||
float m_skel_thickness = 1.f;
|
float m_skel_thickness = 1.f;
|
||||||
|
|||||||
@@ -4,17 +4,28 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "omath/linear_algebra/vector3.hpp"
|
#include "omath/linear_algebra/vector3.hpp"
|
||||||
|
#include <array>
|
||||||
|
|
||||||
namespace omath::primitives
|
namespace omath::primitives
|
||||||
{
|
{
|
||||||
enum class UpAxis { X, Y, Z };
|
enum class UpAxis
|
||||||
|
{
|
||||||
|
X,
|
||||||
|
Y,
|
||||||
|
Z
|
||||||
|
};
|
||||||
|
|
||||||
template<class Type>
|
template<class Type, UpAxis Up = UpAxis::Y>
|
||||||
struct Aabb final
|
struct Aabb final
|
||||||
{
|
{
|
||||||
Vector3<Type> min;
|
Vector3<Type> min;
|
||||||
Vector3<Type> max;
|
Vector3<Type> max;
|
||||||
|
|
||||||
|
[[nodiscard]]
|
||||||
|
static consteval UpAxis get_up_axis()
|
||||||
|
{
|
||||||
|
return Up;
|
||||||
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
constexpr Vector3<Type> center() const noexcept
|
constexpr Vector3<Type> center() const noexcept
|
||||||
{
|
{
|
||||||
@@ -27,7 +38,6 @@ namespace omath::primitives
|
|||||||
return (max - min) / static_cast<Type>(2);
|
return (max - min) / static_cast<Type>(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<UpAxis Up = UpAxis::Y>
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
constexpr Vector3<Type> top() const noexcept
|
constexpr Vector3<Type> top() const noexcept
|
||||||
{
|
{
|
||||||
@@ -42,7 +52,6 @@ namespace omath::primitives
|
|||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
|
|
||||||
template<UpAxis Up = UpAxis::Y>
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
constexpr Vector3<Type> bottom() const noexcept
|
constexpr Vector3<Type> bottom() const noexcept
|
||||||
{
|
{
|
||||||
@@ -57,11 +66,22 @@ namespace omath::primitives
|
|||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr std::array<Vector3<Type>, 8> vertices() const noexcept
|
||||||
|
{
|
||||||
|
return {
|
||||||
|
Vector3<Type>{min.x, min.y, min.z}, Vector3<Type>{max.x, min.y, min.z},
|
||||||
|
Vector3<Type>{min.x, max.y, min.z}, Vector3<Type>{max.x, max.y, min.z},
|
||||||
|
Vector3<Type>{min.x, min.y, max.z}, Vector3<Type>{max.x, min.y, max.z},
|
||||||
|
Vector3<Type>{min.x, max.y, max.z}, Vector3<Type>{max.x, max.y, max.z},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
constexpr bool is_collide(const Aabb& other) const noexcept
|
constexpr bool is_collide(const Aabb& other) const noexcept
|
||||||
{
|
{
|
||||||
return min.x <= other.max.x && max.x >= other.min.x &&
|
return min.x <= other.max.x && max.x >= other.min.x && min.y <= other.max.y && max.y >= other.min.y
|
||||||
min.y <= other.max.y && max.y >= other.min.y &&min.z <= other.max.z && max.z >= other.min.z;
|
&& min.z <= other.max.z && max.z >= other.min.z;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
} // namespace omath::primitives
|
} // namespace omath::primitives
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
//
|
||||||
|
// Created by orange on 7/1/2026.
|
||||||
|
//
|
||||||
|
#pragma once
|
||||||
|
#include "omath/linear_algebra/vector3.hpp"
|
||||||
|
#include <type_traits>
|
||||||
|
|
||||||
|
namespace omath::algorithm
|
||||||
|
{
|
||||||
|
template<class Camera, class FloatingType>
|
||||||
|
requires std::is_floating_point_v<FloatingType>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Vector2<float> world_to_radar(const Camera& camera, const Vector3<FloatingType>& position, const FloatingType scale)
|
||||||
|
{
|
||||||
|
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]
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
}();
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
} // namespace omath::algorithm
|
||||||
@@ -7,36 +7,87 @@
|
|||||||
|
|
||||||
namespace omath::cry_engine
|
namespace omath::cry_engine
|
||||||
{
|
{
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept;
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
return mat_rotation_axis_z<float, MatStoreType::ROW_MAJOR>(angles.yaw)
|
||||||
|
* mat_rotation_axis_y<float, MatStoreType::ROW_MAJOR>(angles.roll)
|
||||||
|
* mat_rotation_axis_x<float, MatStoreType::ROW_MAJOR>(angles.pitch);
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("forward vector result should not be discarded")]]
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept;
|
constexpr Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]] Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
[[nodiscard("right vector result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("up vector result should not be discarded")]]
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept;
|
constexpr Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept;
|
constexpr Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return mat_camera_view<float, MatStoreType::ROW_MAJOR>(forward_vector(angles), right_vector(angles),
|
||||||
|
up_vector(angles), cam_origin);
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("origin result should not be discarded")]]
|
||||||
Mat4X4 calc_perspective_projection_matrix(float field_of_view, float aspect_ratio, float near, float far,
|
constexpr Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
||||||
NDCDepthRange ndc_depth_range = NDCDepthRange::ZERO_TO_ONE) noexcept;
|
{
|
||||||
|
return mat_extract_origin(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("scale result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_scale(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("rotation angles result should not be discarded")]]
|
||||||
|
constexpr ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
const auto angles = mat_extract_rotation_zyx(mat);
|
||||||
|
return {
|
||||||
|
PitchAngle::from_degrees(angles.x),
|
||||||
|
YawAngle::from_degrees(angles.z),
|
||||||
|
RollAngle::from_degrees(angles.y),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
[[nodiscard("perspective projection matrix result should not be discarded")]]
|
||||||
|
constexpr Mat4X4
|
||||||
|
calc_perspective_projection_matrix(const float field_of_view, const float aspect_ratio, const float near_plane,
|
||||||
|
const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range = NDCDepthRange::ZERO_TO_ONE) noexcept
|
||||||
|
{
|
||||||
|
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
||||||
|
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
||||||
|
field_of_view, aspect_ratio, near_plane, far_plane);
|
||||||
|
|
||||||
|
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
|
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
||||||
|
field_of_view, aspect_ratio, near_plane, far_plane);
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("centimeters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units / static_cast<FloatingType>(100);
|
return units / static_cast<FloatingType>(100);
|
||||||
@@ -44,7 +95,7 @@ namespace omath::cry_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("meters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_meters(const FloatingType& units)
|
constexpr FloatingType units_to_meters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units;
|
return units;
|
||||||
@@ -52,7 +103,7 @@ namespace omath::cry_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("kilometers value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
||||||
@@ -60,7 +111,7 @@ namespace omath::cry_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
||||||
{
|
{
|
||||||
return centimeters * static_cast<FloatingType>(100);
|
return centimeters * static_cast<FloatingType>(100);
|
||||||
@@ -68,7 +119,7 @@ namespace omath::cry_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
||||||
{
|
{
|
||||||
return meters;
|
return meters;
|
||||||
@@ -76,7 +127,7 @@ namespace omath::cry_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
||||||
{
|
{
|
||||||
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
||||||
|
|||||||
@@ -5,20 +5,34 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "omath/engines/cry_engine/formulas.hpp"
|
#include "omath/engines/cry_engine/formulas.hpp"
|
||||||
#include "omath/projection/camera.hpp"
|
#include "omath/projection/camera.hpp"
|
||||||
|
|
||||||
namespace omath::cry_engine
|
namespace omath::cry_engine
|
||||||
{
|
{
|
||||||
class CameraTrait final
|
class CameraTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("look-at angle result should not be discarded")]]
|
||||||
static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept;
|
constexpr static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin,
|
||||||
|
const Vector3<float>& look_at) noexcept
|
||||||
|
{
|
||||||
|
const auto direction = (look_at - cam_origin).normalized();
|
||||||
|
return {PitchAngle::from_asin(direction.z), -YawAngle::from_atan2(direction.x, direction.y),
|
||||||
|
RollAngle::from_radians(0.f)};
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
constexpr static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
[[nodiscard]]
|
{
|
||||||
static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov, const projection::ViewPort& view_port,
|
return cry_engine::calc_view_matrix(angles, cam_origin);
|
||||||
float near, float far, NDCDepthRange ndc_depth_range) noexcept;
|
}
|
||||||
|
[[nodiscard("projection matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov,
|
||||||
|
const projection::ViewPort& view_port, const float near_plane,
|
||||||
|
const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range) noexcept
|
||||||
|
{
|
||||||
|
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near_plane, far_plane,
|
||||||
|
ndc_depth_range);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace omath::cry_engine
|
} // namespace omath::cry_engine
|
||||||
@@ -10,7 +10,7 @@ namespace omath::cry_engine
|
|||||||
class MeshTrait final
|
class MeshTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
||||||
{
|
{
|
||||||
return cry_engine::rotation_matrix(rotation);
|
return cry_engine::rotation_matrix(rotation);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ namespace omath::cry_engine
|
|||||||
class PredEngineTrait final
|
class PredEngineTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
[[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> predict_projectile_position(const projectile_prediction::Projectile<float>& projectile,
|
||||||
const float pitch, const float yaw,
|
const float pitch, const float yaw,
|
||||||
const float time, const float gravity) noexcept
|
const float time, const float gravity) noexcept
|
||||||
@@ -25,7 +26,7 @@ namespace omath::cry_engine
|
|||||||
|
|
||||||
return current_pos;
|
return current_pos;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[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
|
||||||
{
|
{
|
||||||
@@ -36,19 +37,19 @@ namespace omath::cry_engine
|
|||||||
|
|
||||||
return predicted;
|
return predicted;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("2d distance result should not be discarded")]]
|
||||||
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
||||||
{
|
{
|
||||||
return std::sqrt(delta.x * delta.x + delta.y * delta.y);
|
return std::sqrt(delta.x * delta.x + delta.y * delta.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("height coordinate result should not be discarded")]]
|
||||||
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
||||||
{
|
{
|
||||||
return vec.z;
|
return vec.z;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("viewpoint result should not be discarded")]]
|
||||||
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
||||||
Vector3<float> predicted_target_position,
|
Vector3<float> predicted_target_position,
|
||||||
const std::optional<float> projectile_pitch) noexcept
|
const std::optional<float> projectile_pitch) noexcept
|
||||||
@@ -60,13 +61,13 @@ namespace omath::cry_engine
|
|||||||
}
|
}
|
||||||
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
||||||
// 89 look up, -89 look down
|
// 89 look up, -89 look down
|
||||||
[[nodiscard]]
|
[[nodiscard("pitch angle result should not be discarded")]]
|
||||||
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto direction = (view_to - origin).normalized();
|
const auto direction = (view_to - origin).normalized();
|
||||||
return angles::radians_to_degrees(std::asin(direction.z));
|
return angles::radians_to_degrees(std::asin(direction.z));
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("yaw angle result should not be discarded")]]
|
||||||
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto direction = (view_to - origin).normalized();
|
const auto direction = (view_to - origin).normalized();
|
||||||
|
|||||||
@@ -7,36 +7,91 @@
|
|||||||
|
|
||||||
namespace omath::frostbite_engine
|
namespace omath::frostbite_engine
|
||||||
{
|
{
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept;
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("forward vector result should not be discarded")]]
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept;
|
constexpr Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]] Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
[[nodiscard("right vector result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("up vector result should not be discarded")]]
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept;
|
constexpr Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept;
|
constexpr Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return mat_camera_view<float, MatStoreType::ROW_MAJOR>(forward_vector(angles), right_vector(angles),
|
||||||
|
up_vector(angles), cam_origin);
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Mat4X4 calc_perspective_projection_matrix(float field_of_view, float aspect_ratio, float near, float far,
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
||||||
NDCDepthRange ndc_depth_range = NDCDepthRange::NEGATIVE_ONE_TO_ONE) noexcept;
|
{
|
||||||
|
return mat_rotation_axis_z<float, MatStoreType::ROW_MAJOR>(angles.roll)
|
||||||
|
* mat_rotation_axis_y<float, MatStoreType::ROW_MAJOR>(angles.yaw)
|
||||||
|
* mat_rotation_axis_x<float, MatStoreType::ROW_MAJOR>(angles.pitch);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("origin result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_origin(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("scale result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_scale(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("rotation angles result should not be discarded")]]
|
||||||
|
constexpr ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
const auto angles = mat_extract_rotation_zyx(mat);
|
||||||
|
return {
|
||||||
|
PitchAngle::from_degrees(angles.x),
|
||||||
|
YawAngle::from_degrees(angles.y),
|
||||||
|
RollAngle::from_degrees(angles.z),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("perspective projection matrix result should not be discarded")]]
|
||||||
|
constexpr Mat4X4 calc_perspective_projection_matrix(
|
||||||
|
const float field_of_view, const float aspect_ratio, const float near_plane, const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range = NDCDepthRange::NEGATIVE_ONE_TO_ONE) noexcept
|
||||||
|
{
|
||||||
|
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
||||||
|
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
||||||
|
field_of_view, aspect_ratio, near_plane, far_plane);
|
||||||
|
|
||||||
|
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
|
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
||||||
|
field_of_view, aspect_ratio, near_plane, far_plane);
|
||||||
|
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("centimeters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units / static_cast<FloatingType>(100);
|
return units / static_cast<FloatingType>(100);
|
||||||
@@ -44,7 +99,7 @@ namespace omath::frostbite_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("meters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_meters(const FloatingType& units)
|
constexpr FloatingType units_to_meters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units;
|
return units;
|
||||||
@@ -52,7 +107,7 @@ namespace omath::frostbite_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("kilometers value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
||||||
@@ -60,7 +115,7 @@ namespace omath::frostbite_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
||||||
{
|
{
|
||||||
return centimeters * static_cast<FloatingType>(100);
|
return centimeters * static_cast<FloatingType>(100);
|
||||||
@@ -68,7 +123,7 @@ namespace omath::frostbite_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
||||||
{
|
{
|
||||||
return meters;
|
return meters;
|
||||||
@@ -76,7 +131,7 @@ namespace omath::frostbite_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
||||||
{
|
{
|
||||||
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
||||||
|
|||||||
@@ -11,14 +11,30 @@ namespace omath::frostbite_engine
|
|||||||
class CameraTrait final
|
class CameraTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("look-at angle result should not be discarded")]]
|
||||||
static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept;
|
constexpr static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin,
|
||||||
|
const Vector3<float>& look_at) noexcept
|
||||||
|
{
|
||||||
|
const auto direction = (look_at - cam_origin).normalized();
|
||||||
|
|
||||||
[[nodiscard]]
|
return {-PitchAngle::from_asin(direction.y), YawAngle::from_atan2(direction.x, direction.z),
|
||||||
static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
RollAngle::from_radians(0.f)};
|
||||||
[[nodiscard]]
|
}
|
||||||
static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov, const projection::ViewPort& view_port,
|
|
||||||
float near, float far, NDCDepthRange ndc_depth_range) noexcept;
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return frostbite_engine::calc_view_matrix(angles, cam_origin);
|
||||||
|
}
|
||||||
|
[[nodiscard("projection matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov,
|
||||||
|
const projection::ViewPort& view_port, const float near_plane,
|
||||||
|
const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range) noexcept
|
||||||
|
{
|
||||||
|
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near_plane, far_plane,
|
||||||
|
ndc_depth_range);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace omath::unreal_engine
|
} // namespace omath::frostbite_engine
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace omath::frostbite_engine
|
|||||||
class MeshTrait final
|
class MeshTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
||||||
{
|
{
|
||||||
return frostbite_engine::rotation_matrix(rotation);
|
return frostbite_engine::rotation_matrix(rotation);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ namespace omath::frostbite_engine
|
|||||||
class PredEngineTrait final
|
class PredEngineTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
[[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> predict_projectile_position(const projectile_prediction::Projectile<float>& projectile,
|
||||||
const float pitch, const float yaw,
|
const float pitch, const float yaw,
|
||||||
const float time, const float gravity) noexcept
|
const float time, const float gravity) noexcept
|
||||||
@@ -25,7 +26,7 @@ namespace omath::frostbite_engine
|
|||||||
|
|
||||||
return current_pos;
|
return current_pos;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[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
|
||||||
{
|
{
|
||||||
@@ -36,19 +37,19 @@ namespace omath::frostbite_engine
|
|||||||
|
|
||||||
return predicted;
|
return predicted;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("2d distance result should not be discarded")]]
|
||||||
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
||||||
{
|
{
|
||||||
return std::sqrt(delta.x * delta.x + delta.z * delta.z);
|
return std::sqrt(delta.x * delta.x + delta.z * delta.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("height coordinate result should not be discarded")]]
|
||||||
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
||||||
{
|
{
|
||||||
return vec.y;
|
return vec.y;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("viewpoint result should not be discarded")]]
|
||||||
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
||||||
Vector3<float> predicted_target_position,
|
Vector3<float> predicted_target_position,
|
||||||
const std::optional<float> projectile_pitch) noexcept
|
const std::optional<float> projectile_pitch) noexcept
|
||||||
@@ -60,13 +61,13 @@ namespace omath::frostbite_engine
|
|||||||
}
|
}
|
||||||
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
||||||
// 89 look up, -89 look down
|
// 89 look up, -89 look down
|
||||||
[[nodiscard]]
|
[[nodiscard("pitch angle result should not be discarded")]]
|
||||||
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto direction = (view_to - origin).normalized();
|
const auto direction = (view_to - origin).normalized();
|
||||||
return angles::radians_to_degrees(std::asin(direction.y));
|
return angles::radians_to_degrees(std::asin(direction.y));
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("yaw angle result should not be discarded")]]
|
||||||
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto direction = (view_to - origin).normalized();
|
const auto direction = (view_to - origin).normalized();
|
||||||
|
|||||||
@@ -7,36 +7,89 @@
|
|||||||
|
|
||||||
namespace omath::iw_engine
|
namespace omath::iw_engine
|
||||||
{
|
{
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept;
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("forward vector result should not be discarded")]]
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept;
|
constexpr Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("right vector result should not be discarded")]]
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
constexpr Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("up vector result should not be discarded")]]
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept;
|
constexpr Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]] Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
return mat_rotation_axis_z(angles.yaw) * mat_rotation_axis_y(angles.pitch) * mat_rotation_axis_x(angles.roll);
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("origin result should not be discarded")]]
|
||||||
Mat4X4 calc_perspective_projection_matrix(float field_of_view, float aspect_ratio, float near, float far,
|
constexpr Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
||||||
NDCDepthRange ndc_depth_range = NDCDepthRange::NEGATIVE_ONE_TO_ONE) noexcept;
|
{
|
||||||
|
return mat_extract_origin(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("scale result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_scale(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("rotation angles result should not be discarded")]]
|
||||||
|
constexpr ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
const auto angles = mat_extract_rotation_zyx(mat);
|
||||||
|
return {
|
||||||
|
PitchAngle::from_degrees(angles.y),
|
||||||
|
YawAngle::from_degrees(angles.z),
|
||||||
|
RollAngle::from_degrees(angles.x),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
|
constexpr Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return mat_camera_view(forward_vector(angles), right_vector(angles), up_vector(angles), cam_origin);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("perspective projection matrix result should not be discarded")]]
|
||||||
|
constexpr Mat4X4 calc_perspective_projection_matrix(
|
||||||
|
const float field_of_view, const float aspect_ratio, const float near_plane, const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range = NDCDepthRange::NEGATIVE_ONE_TO_ONE) noexcept
|
||||||
|
{
|
||||||
|
constexpr float k_source_reference_aspect = 4.f / 3.f;
|
||||||
|
const auto vertical_fov = angles::horizontal_fov_to_vertical(field_of_view, k_source_reference_aspect);
|
||||||
|
|
||||||
|
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
||||||
|
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
||||||
|
vertical_fov, aspect_ratio, near_plane, far_plane);
|
||||||
|
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
|
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
||||||
|
vertical_fov, aspect_ratio, near_plane, far_plane);
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("centimeters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
constexpr auto centimeter_in_unit = static_cast<FloatingType>(2.54);
|
constexpr auto centimeter_in_unit = static_cast<FloatingType>(2.54);
|
||||||
@@ -45,7 +98,7 @@ namespace omath::iw_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("meters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_meters(const FloatingType& units)
|
constexpr FloatingType units_to_meters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units_to_centimeters(units) / static_cast<FloatingType>(100);
|
return units_to_centimeters(units) / static_cast<FloatingType>(100);
|
||||||
@@ -53,7 +106,7 @@ namespace omath::iw_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("kilometers value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
||||||
@@ -61,7 +114,7 @@ namespace omath::iw_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
||||||
{
|
{
|
||||||
constexpr auto centimeter_in_unit = static_cast<FloatingType>(2.54);
|
constexpr auto centimeter_in_unit = static_cast<FloatingType>(2.54);
|
||||||
@@ -70,7 +123,7 @@ namespace omath::iw_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
||||||
{
|
{
|
||||||
return centimeters_to_units(meters * static_cast<FloatingType>(100));
|
return centimeters_to_units(meters * static_cast<FloatingType>(100));
|
||||||
@@ -78,7 +131,7 @@ namespace omath::iw_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
||||||
{
|
{
|
||||||
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "omath/engines/iw_engine/constants.hpp"
|
#include "omath/engines/iw_engine/formulas.hpp"
|
||||||
#include "omath/projection/camera.hpp"
|
#include "omath/projection/camera.hpp"
|
||||||
|
|
||||||
namespace omath::iw_engine
|
namespace omath::iw_engine
|
||||||
@@ -11,14 +11,30 @@ namespace omath::iw_engine
|
|||||||
class CameraTrait final
|
class CameraTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("look-at angle result should not be discarded")]]
|
||||||
static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept;
|
constexpr static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin,
|
||||||
|
const Vector3<float>& look_at) noexcept
|
||||||
|
{
|
||||||
|
const auto direction = (look_at - cam_origin).normalized();
|
||||||
|
|
||||||
[[nodiscard]]
|
return {-PitchAngle::from_asin(direction.z), YawAngle::from_atan2(direction.y, direction.x),
|
||||||
static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
RollAngle::from_radians(0.f)};
|
||||||
[[nodiscard]]
|
}
|
||||||
static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov, const projection::ViewPort& view_port,
|
|
||||||
float near, float far, NDCDepthRange ndc_depth_range) noexcept;
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return iw_engine::calc_view_matrix(angles, cam_origin);
|
||||||
|
}
|
||||||
|
[[nodiscard("projection matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov,
|
||||||
|
const projection::ViewPort& view_port, const float near_plane,
|
||||||
|
const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range) noexcept
|
||||||
|
{
|
||||||
|
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near_plane, far_plane,
|
||||||
|
ndc_depth_range);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace omath::iw_engine
|
} // namespace omath::iw_engine
|
||||||
@@ -10,7 +10,7 @@ namespace omath::iw_engine
|
|||||||
class MeshTrait final
|
class MeshTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
||||||
{
|
{
|
||||||
return iw_engine::rotation_matrix(rotation);
|
return iw_engine::rotation_matrix(rotation);
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace omath::iw_engine
|
|||||||
class PredEngineTrait final
|
class PredEngineTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
[[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> predict_projectile_position(const projectile_prediction::Projectile<float>& projectile,
|
||||||
const float pitch, const float yaw,
|
const float pitch, const float yaw,
|
||||||
const float time, const float gravity) noexcept
|
const float time, const float gravity) noexcept
|
||||||
@@ -26,7 +27,7 @@ namespace omath::iw_engine
|
|||||||
|
|
||||||
return current_pos;
|
return current_pos;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[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
|
||||||
{
|
{
|
||||||
@@ -37,19 +38,19 @@ namespace omath::iw_engine
|
|||||||
|
|
||||||
return predicted;
|
return predicted;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("2d distance result should not be discarded")]]
|
||||||
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
||||||
{
|
{
|
||||||
return std::sqrt(delta.x * delta.x + delta.y * delta.y);
|
return std::sqrt(delta.x * delta.x + delta.y * delta.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("height coordinate result should not be discarded")]]
|
||||||
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
||||||
{
|
{
|
||||||
return vec.z;
|
return vec.z;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("viewpoint result should not be discarded")]]
|
||||||
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
||||||
Vector3<float> predicted_target_position,
|
Vector3<float> predicted_target_position,
|
||||||
const std::optional<float> projectile_pitch) noexcept
|
const std::optional<float> projectile_pitch) noexcept
|
||||||
@@ -61,7 +62,7 @@ namespace omath::iw_engine
|
|||||||
}
|
}
|
||||||
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
||||||
// 89 look up, -89 look down
|
// 89 look up, -89 look down
|
||||||
[[nodiscard]]
|
[[nodiscard("pitch angle result should not be discarded")]]
|
||||||
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto distance = origin.distance_to(view_to);
|
const auto distance = origin.distance_to(view_to);
|
||||||
@@ -69,7 +70,7 @@ namespace omath::iw_engine
|
|||||||
|
|
||||||
return angles::radians_to_degrees(std::asin(delta.z / distance));
|
return angles::radians_to_degrees(std::asin(delta.z / distance));
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("yaw angle result should not be discarded")]]
|
||||||
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto delta = view_to - origin;
|
const auto delta = view_to - origin;
|
||||||
|
|||||||
@@ -6,36 +6,93 @@
|
|||||||
|
|
||||||
namespace omath::opengl_engine
|
namespace omath::opengl_engine
|
||||||
{
|
{
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept;
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("forward vector result should not be discarded")]]
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept;
|
constexpr Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec =
|
||||||
|
rotation_matrix(angles) * mat_column_from_vector<float, MatStoreType::COLUMN_MAJOR>(k_abs_forward);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]] Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
[[nodiscard("right vector result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec =
|
||||||
|
rotation_matrix(angles) * mat_column_from_vector<float, MatStoreType::COLUMN_MAJOR>(k_abs_right);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("up vector result should not be discarded")]]
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept;
|
constexpr Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector<float, MatStoreType::COLUMN_MAJOR>(k_abs_up);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept;
|
constexpr Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return mat_look_at_right_handed(cam_origin, cam_origin + forward_vector(angles), up_vector(angles));
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Mat4X4 calc_perspective_projection_matrix(float field_of_view, float aspect_ratio, float near, float far,
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
||||||
NDCDepthRange ndc_depth_range = NDCDepthRange::NEGATIVE_ONE_TO_ONE) noexcept;
|
{
|
||||||
|
return mat_rotation_axis_z<float, MatStoreType::COLUMN_MAJOR>(angles.roll)
|
||||||
|
* mat_rotation_axis_y<float, MatStoreType::COLUMN_MAJOR>(angles.yaw)
|
||||||
|
* mat_rotation_axis_x<float, MatStoreType::COLUMN_MAJOR>(angles.pitch);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("origin result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_origin(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("scale result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_scale(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("rotation angles result should not be discarded")]]
|
||||||
|
constexpr ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
const auto angles = mat_extract_rotation_zyx(mat);
|
||||||
|
return {
|
||||||
|
PitchAngle::from_degrees(angles.x),
|
||||||
|
YawAngle::from_degrees(angles.y),
|
||||||
|
RollAngle::from_degrees(angles.z),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("perspective projection matrix result should not be discarded")]]
|
||||||
|
constexpr Mat4X4 calc_perspective_projection_matrix(
|
||||||
|
const float field_of_view, const float aspect_ratio, const float near_plane, const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range = NDCDepthRange::NEGATIVE_ONE_TO_ONE) noexcept
|
||||||
|
{
|
||||||
|
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
|
return mat_perspective_right_handed_vertical_fov<float, MatStoreType::COLUMN_MAJOR,
|
||||||
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
||||||
|
field_of_view, aspect_ratio, near_plane, far_plane);
|
||||||
|
|
||||||
|
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
||||||
|
return mat_perspective_right_handed_vertical_fov<float, MatStoreType::COLUMN_MAJOR,
|
||||||
|
NDCDepthRange::ZERO_TO_ONE>(field_of_view, aspect_ratio,
|
||||||
|
near_plane, far_plane);
|
||||||
|
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("centimeters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units / static_cast<FloatingType>(100);
|
return units / static_cast<FloatingType>(100);
|
||||||
@@ -43,7 +100,7 @@ namespace omath::opengl_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("meters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_meters(const FloatingType& units)
|
constexpr FloatingType units_to_meters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units;
|
return units;
|
||||||
@@ -51,7 +108,7 @@ namespace omath::opengl_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("kilometers value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
||||||
@@ -59,7 +116,7 @@ namespace omath::opengl_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
||||||
{
|
{
|
||||||
return centimeters * static_cast<FloatingType>(100);
|
return centimeters * static_cast<FloatingType>(100);
|
||||||
@@ -67,7 +124,7 @@ namespace omath::opengl_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
||||||
{
|
{
|
||||||
return meters;
|
return meters;
|
||||||
@@ -75,7 +132,7 @@ namespace omath::opengl_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
||||||
{
|
{
|
||||||
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "omath/engines/opengl_engine/constants.hpp"
|
#include "omath/engines/opengl_engine/formulas.hpp"
|
||||||
#include "omath/projection/camera.hpp"
|
#include "omath/projection/camera.hpp"
|
||||||
|
|
||||||
namespace omath::opengl_engine
|
namespace omath::opengl_engine
|
||||||
@@ -11,14 +11,30 @@ namespace omath::opengl_engine
|
|||||||
class CameraTrait final
|
class CameraTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("look-at angle result should not be discarded")]]
|
||||||
static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept;
|
constexpr static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin,
|
||||||
|
const Vector3<float>& look_at) noexcept
|
||||||
|
{
|
||||||
|
const auto direction = (look_at - cam_origin).normalized();
|
||||||
|
|
||||||
[[nodiscard]]
|
return {PitchAngle::from_asin(direction.y), -YawAngle::from_atan2(direction.x, -direction.z),
|
||||||
static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
RollAngle::from_radians(0.f)};
|
||||||
[[nodiscard]]
|
}
|
||||||
static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov, const projection::ViewPort& view_port,
|
|
||||||
float near, float far, NDCDepthRange ndc_depth_range) noexcept;
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return opengl_engine::calc_view_matrix(angles, cam_origin);
|
||||||
|
}
|
||||||
|
[[nodiscard("projection matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov,
|
||||||
|
const projection::ViewPort& view_port, const float near_plane,
|
||||||
|
const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range) noexcept
|
||||||
|
{
|
||||||
|
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near_plane, far_plane,
|
||||||
|
ndc_depth_range);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace omath::opengl_engine
|
} // namespace omath::opengl_engine
|
||||||
@@ -10,7 +10,7 @@ namespace omath::opengl_engine
|
|||||||
class MeshTrait final
|
class MeshTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
||||||
{
|
{
|
||||||
return opengl_engine::rotation_matrix(rotation);
|
return opengl_engine::rotation_matrix(rotation);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ namespace omath::opengl_engine
|
|||||||
class PredEngineTrait final
|
class PredEngineTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
[[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> predict_projectile_position(const projectile_prediction::Projectile<float>& projectile,
|
||||||
const float pitch, const float yaw,
|
const float pitch, const float yaw,
|
||||||
const float time, const float gravity) noexcept
|
const float time, const float gravity) noexcept
|
||||||
@@ -25,7 +26,7 @@ namespace omath::opengl_engine
|
|||||||
|
|
||||||
return current_pos;
|
return current_pos;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[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
|
||||||
{
|
{
|
||||||
@@ -36,19 +37,19 @@ namespace omath::opengl_engine
|
|||||||
|
|
||||||
return predicted;
|
return predicted;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("2d distance result should not be discarded")]]
|
||||||
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
||||||
{
|
{
|
||||||
return std::sqrt(delta.x * delta.x + delta.z * delta.z);
|
return std::sqrt(delta.x * delta.x + delta.z * delta.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("height coordinate result should not be discarded")]]
|
||||||
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
||||||
{
|
{
|
||||||
return vec.y;
|
return vec.y;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("viewpoint result should not be discarded")]]
|
||||||
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
||||||
Vector3<float> predicted_target_position,
|
Vector3<float> predicted_target_position,
|
||||||
const std::optional<float> projectile_pitch) noexcept
|
const std::optional<float> projectile_pitch) noexcept
|
||||||
@@ -60,13 +61,13 @@ namespace omath::opengl_engine
|
|||||||
}
|
}
|
||||||
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
||||||
// 89 look up, -89 look down
|
// 89 look up, -89 look down
|
||||||
[[nodiscard]]
|
[[nodiscard("pitch angle result should not be discarded")]]
|
||||||
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto direction = (view_to - origin).normalized();
|
const auto direction = (view_to - origin).normalized();
|
||||||
return angles::radians_to_degrees(std::asin(direction.y));
|
return angles::radians_to_degrees(std::asin(direction.y));
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("yaw angle result should not be discarded")]]
|
||||||
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto direction = (view_to - origin).normalized();
|
const auto direction = (view_to - origin).normalized();
|
||||||
|
|||||||
@@ -8,36 +8,91 @@
|
|||||||
|
|
||||||
namespace omath::rage_engine
|
namespace omath::rage_engine
|
||||||
{
|
{
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept;
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("forward vector result should not be discarded")]]
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept;
|
constexpr Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]] Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
[[nodiscard("right vector result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("up vector result should not be discarded")]]
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept;
|
constexpr Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept;
|
constexpr Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return mat_camera_view<float, MatStoreType::ROW_MAJOR>(forward_vector(angles), right_vector(angles),
|
||||||
|
up_vector(angles), cam_origin);
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Mat4X4 calc_perspective_projection_matrix(float field_of_view, float aspect_ratio, float near, float far,
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
||||||
NDCDepthRange ndc_depth_range = NDCDepthRange::ZERO_TO_ONE) noexcept;
|
{
|
||||||
|
return mat_rotation_axis_z<float, MatStoreType::ROW_MAJOR>(angles.yaw)
|
||||||
|
* mat_rotation_axis_y<float, MatStoreType::ROW_MAJOR>(angles.roll)
|
||||||
|
* mat_rotation_axis_x<float, MatStoreType::ROW_MAJOR>(angles.pitch);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("origin result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_origin(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("scale result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_scale(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("rotation angles result should not be discarded")]]
|
||||||
|
constexpr ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
const auto angles = mat_extract_rotation_zyx(mat);
|
||||||
|
return {
|
||||||
|
PitchAngle::from_degrees(angles.x),
|
||||||
|
YawAngle::from_degrees(angles.z),
|
||||||
|
RollAngle::from_degrees(angles.y),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("perspective projection matrix result should not be discarded")]]
|
||||||
|
constexpr Mat4X4
|
||||||
|
calc_perspective_projection_matrix(const float field_of_view, const float aspect_ratio, const float near_plane,
|
||||||
|
const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range = NDCDepthRange::ZERO_TO_ONE) noexcept
|
||||||
|
{
|
||||||
|
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
||||||
|
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
||||||
|
field_of_view, aspect_ratio, near_plane, far_plane);
|
||||||
|
|
||||||
|
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
|
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
||||||
|
field_of_view, aspect_ratio, near_plane, far_plane);
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("centimeters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units / static_cast<FloatingType>(100);
|
return units / static_cast<FloatingType>(100);
|
||||||
@@ -45,7 +100,7 @@ namespace omath::rage_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("meters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_meters(const FloatingType& units)
|
constexpr FloatingType units_to_meters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units;
|
return units;
|
||||||
@@ -53,7 +108,7 @@ namespace omath::rage_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("kilometers value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
||||||
@@ -61,7 +116,7 @@ namespace omath::rage_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
||||||
{
|
{
|
||||||
return centimeters * static_cast<FloatingType>(100);
|
return centimeters * static_cast<FloatingType>(100);
|
||||||
@@ -69,7 +124,7 @@ namespace omath::rage_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
||||||
{
|
{
|
||||||
return meters;
|
return meters;
|
||||||
@@ -77,7 +132,7 @@ namespace omath::rage_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
||||||
{
|
{
|
||||||
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
||||||
|
|||||||
@@ -11,14 +11,30 @@ namespace omath::rage_engine
|
|||||||
class CameraTrait final
|
class CameraTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("look-at angle result should not be discarded")]]
|
||||||
static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept;
|
constexpr static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin,
|
||||||
|
const Vector3<float>& look_at) noexcept
|
||||||
|
{
|
||||||
|
const auto direction = (look_at - cam_origin).normalized();
|
||||||
|
|
||||||
[[nodiscard]]
|
return {PitchAngle::from_asin(direction.z), -YawAngle::from_atan2(direction.x, direction.y),
|
||||||
static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
RollAngle::from_radians(0.f)};
|
||||||
[[nodiscard]]
|
}
|
||||||
static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov, const projection::ViewPort& view_port,
|
|
||||||
float near, float far, NDCDepthRange ndc_depth_range) noexcept;
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return rage_engine::calc_view_matrix(angles, cam_origin);
|
||||||
|
}
|
||||||
|
[[nodiscard("projection matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov,
|
||||||
|
const projection::ViewPort& view_port, const float near_plane,
|
||||||
|
const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range) noexcept
|
||||||
|
{
|
||||||
|
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near_plane, far_plane,
|
||||||
|
ndc_depth_range);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace omath::rage_engine
|
} // namespace omath::rage_engine
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace omath::rage_engine
|
|||||||
class MeshTrait final
|
class MeshTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
||||||
{
|
{
|
||||||
return rage_engine::rotation_matrix(rotation);
|
return rage_engine::rotation_matrix(rotation);
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ namespace omath::rage_engine
|
|||||||
class PredEngineTrait final
|
class PredEngineTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
[[nodiscard("projectile position result should not be discarded")]]
|
||||||
constexpr static Vector3<float>
|
constexpr static Vector3<float>
|
||||||
predict_projectile_position(const projectile_prediction::Projectile<float>& projectile, const float pitch,
|
predict_projectile_position(const projectile_prediction::Projectile<float>& projectile, const float pitch,
|
||||||
const float yaw, const float time, const float gravity) noexcept
|
const float yaw, const float time, const float gravity) noexcept
|
||||||
@@ -26,7 +27,7 @@ namespace omath::rage_engine
|
|||||||
|
|
||||||
return current_pos;
|
return current_pos;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[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
|
||||||
{
|
{
|
||||||
@@ -37,19 +38,19 @@ namespace omath::rage_engine
|
|||||||
|
|
||||||
return predicted;
|
return predicted;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("2d distance result should not be discarded")]]
|
||||||
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
||||||
{
|
{
|
||||||
return std::sqrt(delta.x * delta.x + delta.y * delta.y);
|
return std::sqrt(delta.x * delta.x + delta.y * delta.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("height coordinate result should not be discarded")]]
|
||||||
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
||||||
{
|
{
|
||||||
return vec.z;
|
return vec.z;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("viewpoint result should not be discarded")]]
|
||||||
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
||||||
Vector3<float> predicted_target_position,
|
Vector3<float> predicted_target_position,
|
||||||
const std::optional<float> projectile_pitch) noexcept
|
const std::optional<float> projectile_pitch) noexcept
|
||||||
@@ -59,13 +60,13 @@ namespace omath::rage_engine
|
|||||||
|
|
||||||
return {predicted_target_position.x, predicted_target_position.y, projectile.m_origin.z + height};
|
return {predicted_target_position.x, predicted_target_position.y, projectile.m_origin.z + height};
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("pitch angle result should not be discarded")]]
|
||||||
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto direction = (view_to - origin).normalized();
|
const auto direction = (view_to - origin).normalized();
|
||||||
return angles::radians_to_degrees(std::asin(direction.z));
|
return angles::radians_to_degrees(std::asin(direction.z));
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("yaw angle result should not be discarded")]]
|
||||||
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto direction = (view_to - origin).normalized();
|
const auto direction = (view_to - origin).normalized();
|
||||||
|
|||||||
@@ -6,36 +6,89 @@
|
|||||||
|
|
||||||
namespace omath::source_engine
|
namespace omath::source_engine
|
||||||
{
|
{
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept;
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("forward vector result should not be discarded")]]
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
constexpr Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept;
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
return mat_rotation_axis_z(angles.yaw) * mat_rotation_axis_y(angles.pitch) * mat_rotation_axis_x(angles.roll);
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("origin result should not be discarded")]]
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept;
|
constexpr Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_origin(mat);
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("scale result should not be discarded")]]
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept;
|
constexpr Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_scale(mat);
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation angles result should not be discarded")]]
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept;
|
constexpr ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
const auto angles = mat_extract_rotation_zyx(mat);
|
||||||
|
return {
|
||||||
|
PitchAngle::from_degrees(angles.y),
|
||||||
|
YawAngle::from_degrees(angles.z),
|
||||||
|
RollAngle::from_degrees(angles.x),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]] Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
[[nodiscard("right vector result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Mat4X4 calc_perspective_projection_matrix(float field_of_view, float aspect_ratio, float near, float far,
|
}
|
||||||
NDCDepthRange ndc_depth_range = NDCDepthRange::NEGATIVE_ONE_TO_ONE) noexcept;
|
|
||||||
|
[[nodiscard("up vector result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
||||||
|
|
||||||
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
|
constexpr Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return mat_camera_view(forward_vector(angles), right_vector(angles), up_vector(angles), cam_origin);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("perspective projection matrix result should not be discarded")]]
|
||||||
|
constexpr Mat4X4 calc_perspective_projection_matrix(
|
||||||
|
const float field_of_view, const float aspect_ratio, const float near_plane, const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range = NDCDepthRange::NEGATIVE_ONE_TO_ONE) noexcept
|
||||||
|
{
|
||||||
|
constexpr float k_source_reference_aspect = 4.f / 3.f;
|
||||||
|
const auto vertical_fov = angles::horizontal_fov_to_vertical(field_of_view, k_source_reference_aspect);
|
||||||
|
|
||||||
|
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
||||||
|
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
||||||
|
vertical_fov, aspect_ratio, near_plane, far_plane);
|
||||||
|
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
|
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
||||||
|
vertical_fov, aspect_ratio, near_plane, far_plane);
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("centimeters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
constexpr auto centimeter_in_unit = static_cast<FloatingType>(2.54);
|
constexpr auto centimeter_in_unit = static_cast<FloatingType>(2.54);
|
||||||
@@ -44,7 +97,7 @@ namespace omath::source_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("meters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_meters(const FloatingType& units)
|
constexpr FloatingType units_to_meters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units_to_centimeters(units) / static_cast<FloatingType>(100);
|
return units_to_centimeters(units) / static_cast<FloatingType>(100);
|
||||||
@@ -52,7 +105,7 @@ namespace omath::source_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("kilometers value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
||||||
@@ -60,7 +113,7 @@ namespace omath::source_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
||||||
{
|
{
|
||||||
constexpr auto centimeter_in_unit = static_cast<FloatingType>(2.54);
|
constexpr auto centimeter_in_unit = static_cast<FloatingType>(2.54);
|
||||||
@@ -69,7 +122,7 @@ namespace omath::source_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
||||||
{
|
{
|
||||||
return centimeters_to_units(meters * static_cast<FloatingType>(100));
|
return centimeters_to_units(meters * static_cast<FloatingType>(100));
|
||||||
@@ -77,7 +130,7 @@ namespace omath::source_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
||||||
{
|
{
|
||||||
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "omath/engines/source_engine/constants.hpp"
|
#include "omath/engines/source_engine/formulas.hpp"
|
||||||
#include "omath/projection/camera.hpp"
|
#include "omath/projection/camera.hpp"
|
||||||
|
|
||||||
namespace omath::source_engine
|
namespace omath::source_engine
|
||||||
@@ -11,14 +11,30 @@ namespace omath::source_engine
|
|||||||
class CameraTrait final
|
class CameraTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("look-at angle result should not be discarded")]]
|
||||||
static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept;
|
constexpr static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin,
|
||||||
|
const Vector3<float>& look_at) noexcept
|
||||||
|
{
|
||||||
|
const auto direction = (look_at - cam_origin).normalized();
|
||||||
|
|
||||||
[[nodiscard]]
|
return {-PitchAngle::from_asin(direction.z),
|
||||||
static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
YawAngle::from_atan2(direction.y, direction.x), RollAngle::from_radians(0.f)};
|
||||||
[[nodiscard]]
|
}
|
||||||
static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov, const projection::ViewPort& view_port,
|
|
||||||
float near, float far, NDCDepthRange ndc_depth_range) noexcept;
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return source_engine::calc_view_matrix(angles, cam_origin);
|
||||||
|
}
|
||||||
|
[[nodiscard("projection matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov,
|
||||||
|
const projection::ViewPort& view_port, const float near_plane,
|
||||||
|
const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range) noexcept
|
||||||
|
{
|
||||||
|
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near_plane, far_plane,
|
||||||
|
ndc_depth_range);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace omath::source_engine
|
} // namespace omath::source_engine
|
||||||
@@ -10,7 +10,7 @@ namespace omath::source_engine
|
|||||||
class MeshTrait final
|
class MeshTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
||||||
{
|
{
|
||||||
return source_engine::rotation_matrix(rotation);
|
return source_engine::rotation_matrix(rotation);
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -13,20 +15,60 @@ namespace omath::source_engine
|
|||||||
class PredEngineTrait final
|
class PredEngineTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
constexpr static Vector3<float> predict_projectile_position(const projectile_prediction::Projectile<float>& projectile,
|
[[nodiscard("projectile position result should not be discarded")]]
|
||||||
const float pitch, const float yaw,
|
constexpr static Vector3<float>
|
||||||
const float time, const float gravity) noexcept
|
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;
|
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]]
|
|
||||||
|
[[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,
|
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
|
||||||
{
|
{
|
||||||
@@ -37,19 +79,19 @@ namespace omath::source_engine
|
|||||||
|
|
||||||
return predicted;
|
return predicted;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("2d distance result should not be discarded")]]
|
||||||
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
||||||
{
|
{
|
||||||
return std::sqrt(delta.x * delta.x + delta.y * delta.y);
|
return std::sqrt(delta.x * delta.x + delta.y * delta.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("height coordinate result should not be discarded")]]
|
||||||
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
||||||
{
|
{
|
||||||
return vec.z;
|
return vec.z;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("viewpoint result should not be discarded")]]
|
||||||
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
||||||
Vector3<float> predicted_target_position,
|
Vector3<float> predicted_target_position,
|
||||||
const std::optional<float> projectile_pitch) noexcept
|
const std::optional<float> projectile_pitch) noexcept
|
||||||
@@ -61,7 +103,7 @@ namespace omath::source_engine
|
|||||||
}
|
}
|
||||||
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
||||||
// 89 look up, -89 look down
|
// 89 look up, -89 look down
|
||||||
[[nodiscard]]
|
[[nodiscard("pitch angle result should not be discarded")]]
|
||||||
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto distance = origin.distance_to(view_to);
|
const auto distance = origin.distance_to(view_to);
|
||||||
@@ -69,7 +111,7 @@ namespace omath::source_engine
|
|||||||
|
|
||||||
return angles::radians_to_degrees(std::asin(delta.z / distance));
|
return angles::radians_to_degrees(std::asin(delta.z / distance));
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("yaw angle result should not be discarded")]]
|
||||||
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto delta = view_to - origin;
|
const auto delta = view_to - origin;
|
||||||
|
|||||||
@@ -7,36 +7,90 @@
|
|||||||
|
|
||||||
namespace omath::unity_engine
|
namespace omath::unity_engine
|
||||||
{
|
{
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept;
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("forward vector result should not be discarded")]]
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept;
|
constexpr Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]] Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
[[nodiscard("right vector result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("up vector result should not be discarded")]]
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept;
|
constexpr Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept;
|
constexpr Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return mat_camera_view<float, MatStoreType::ROW_MAJOR>(-forward_vector(angles), right_vector(angles),
|
||||||
|
up_vector(angles), cam_origin);
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Mat4X4 calc_perspective_projection_matrix(float field_of_view, float aspect_ratio, float near, float far,
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
||||||
NDCDepthRange ndc_depth_range = NDCDepthRange::NEGATIVE_ONE_TO_ONE) noexcept;
|
{
|
||||||
|
return mat_rotation_axis_z<float, MatStoreType::ROW_MAJOR>(angles.roll)
|
||||||
|
* mat_rotation_axis_y<float, MatStoreType::ROW_MAJOR>(angles.yaw)
|
||||||
|
* mat_rotation_axis_x<float, MatStoreType::ROW_MAJOR>(angles.pitch);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("origin result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_origin(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("scale result should not be discarded")]]
|
||||||
|
constexpr Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_scale(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("rotation angles result should not be discarded")]]
|
||||||
|
constexpr ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
const auto angles = mat_extract_rotation_zyx(mat);
|
||||||
|
return {
|
||||||
|
PitchAngle::from_degrees(angles.x),
|
||||||
|
YawAngle::from_degrees(angles.y),
|
||||||
|
RollAngle::from_degrees(angles.z),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("perspective projection matrix result should not be discarded")]]
|
||||||
|
constexpr Mat4X4 calc_perspective_projection_matrix(
|
||||||
|
const float field_of_view, const float aspect_ratio, const float near_plane, const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range = NDCDepthRange::NEGATIVE_ONE_TO_ONE) noexcept
|
||||||
|
{
|
||||||
|
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
||||||
|
return omath::mat_perspective_right_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
|
NDCDepthRange::ZERO_TO_ONE>(
|
||||||
|
field_of_view, aspect_ratio, near_plane, far_plane);
|
||||||
|
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
|
return omath::mat_perspective_right_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
||||||
|
field_of_view, aspect_ratio, near_plane, far_plane);
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("centimeters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units / static_cast<FloatingType>(100);
|
return units / static_cast<FloatingType>(100);
|
||||||
@@ -44,7 +98,7 @@ namespace omath::unity_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("meters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_meters(const FloatingType& units)
|
constexpr FloatingType units_to_meters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units;
|
return units;
|
||||||
@@ -52,7 +106,7 @@ namespace omath::unity_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("kilometers value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
||||||
@@ -60,7 +114,7 @@ namespace omath::unity_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
||||||
{
|
{
|
||||||
return centimeters * static_cast<FloatingType>(100);
|
return centimeters * static_cast<FloatingType>(100);
|
||||||
@@ -68,7 +122,7 @@ namespace omath::unity_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
||||||
{
|
{
|
||||||
return meters;
|
return meters;
|
||||||
@@ -76,7 +130,7 @@ namespace omath::unity_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
||||||
{
|
{
|
||||||
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
||||||
|
|||||||
@@ -11,14 +11,30 @@ namespace omath::unity_engine
|
|||||||
class CameraTrait final
|
class CameraTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("look-at angle result should not be discarded")]]
|
||||||
static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept;
|
constexpr static ViewAngles calc_look_at_angle(const Vector3<float>& cam_origin,
|
||||||
|
const Vector3<float>& look_at) noexcept
|
||||||
|
{
|
||||||
|
const auto direction = (look_at - cam_origin).normalized();
|
||||||
|
|
||||||
[[nodiscard]]
|
return {-PitchAngle::from_asin(direction.y), YawAngle::from_atan2(direction.x, direction.z),
|
||||||
static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept;
|
RollAngle::from_radians(0.f)};
|
||||||
[[nodiscard]]
|
}
|
||||||
static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov, const projection::ViewPort& view_port,
|
|
||||||
float near, float far, NDCDepthRange ndc_depth_range) noexcept;
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return unity_engine::calc_view_matrix(angles, cam_origin);
|
||||||
|
}
|
||||||
|
[[nodiscard("projection matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov,
|
||||||
|
const projection::ViewPort& view_port, const float near_plane,
|
||||||
|
const float far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range) noexcept
|
||||||
|
{
|
||||||
|
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near_plane, far_plane,
|
||||||
|
ndc_depth_range);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace omath::unity_engine
|
} // namespace omath::unity_engine
|
||||||
@@ -10,7 +10,7 @@ namespace omath::unity_engine
|
|||||||
class MeshTrait final
|
class MeshTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
||||||
{
|
{
|
||||||
return unity_engine::rotation_matrix(rotation);
|
return unity_engine::rotation_matrix(rotation);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ namespace omath::unity_engine
|
|||||||
class PredEngineTrait final
|
class PredEngineTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
[[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> predict_projectile_position(const projectile_prediction::Projectile<float>& projectile,
|
||||||
const float pitch, const float yaw,
|
const float pitch, const float yaw,
|
||||||
const float time, const float gravity) noexcept
|
const float time, const float gravity) noexcept
|
||||||
@@ -25,7 +26,7 @@ namespace omath::unity_engine
|
|||||||
|
|
||||||
return current_pos;
|
return current_pos;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[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
|
||||||
{
|
{
|
||||||
@@ -36,19 +37,19 @@ namespace omath::unity_engine
|
|||||||
|
|
||||||
return predicted;
|
return predicted;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("2d distance result should not be discarded")]]
|
||||||
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
static float calc_vector_2d_distance(const Vector3<float>& delta) noexcept
|
||||||
{
|
{
|
||||||
return std::sqrt(delta.x * delta.x + delta.z * delta.z);
|
return std::sqrt(delta.x * delta.x + delta.z * delta.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("height coordinate result should not be discarded")]]
|
||||||
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
constexpr static float get_vector_height_coordinate(const Vector3<float>& vec) noexcept
|
||||||
{
|
{
|
||||||
return vec.y;
|
return vec.y;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("viewpoint result should not be discarded")]]
|
||||||
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
static Vector3<float> calc_viewpoint_from_angles(const projectile_prediction::Projectile<float>& projectile,
|
||||||
Vector3<float> predicted_target_position,
|
Vector3<float> predicted_target_position,
|
||||||
const std::optional<float> projectile_pitch) noexcept
|
const std::optional<float> projectile_pitch) noexcept
|
||||||
@@ -60,13 +61,13 @@ namespace omath::unity_engine
|
|||||||
}
|
}
|
||||||
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
||||||
// 89 look up, -89 look down
|
// 89 look up, -89 look down
|
||||||
[[nodiscard]]
|
[[nodiscard("pitch angle result should not be discarded")]]
|
||||||
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_pitch_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto direction = (view_to - origin).normalized();
|
const auto direction = (view_to - origin).normalized();
|
||||||
return angles::radians_to_degrees(std::asin(direction.y));
|
return angles::radians_to_degrees(std::asin(direction.y));
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("yaw angle result should not be discarded")]]
|
||||||
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
static float calc_direct_yaw_angle(const Vector3<float>& origin, const Vector3<float>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto direction = (view_to - origin).normalized();
|
const auto direction = (view_to - origin).normalized();
|
||||||
|
|||||||
@@ -7,36 +7,90 @@
|
|||||||
|
|
||||||
namespace omath::unreal_engine
|
namespace omath::unreal_engine
|
||||||
{
|
{
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Vector3<double> forward_vector(const ViewAngles& angles) noexcept;
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("forward vector result should not be discarded")]]
|
||||||
Vector3<double> right_vector(const ViewAngles& angles) noexcept;
|
constexpr Vector3<double> forward_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<double> up_vector(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]] Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<double>& cam_origin) noexcept;
|
[[nodiscard("right vector result should not be discarded")]]
|
||||||
|
constexpr Vector3<double> right_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("up vector result should not be discarded")]]
|
||||||
Vector3<double> extract_origin(const Mat4X4& mat) noexcept;
|
constexpr Vector3<double> up_vector(const ViewAngles& angles) noexcept
|
||||||
|
{
|
||||||
|
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
||||||
|
|
||||||
[[nodiscard]]
|
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
||||||
Vector3<double> extract_scale(const Mat4X4& mat) noexcept;
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept;
|
constexpr Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<double>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return mat_camera_view<double, MatStoreType::ROW_MAJOR>(forward_vector(angles), right_vector(angles),
|
||||||
|
up_vector(angles), cam_origin);
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
Mat4X4 calc_perspective_projection_matrix(double field_of_view, double aspect_ratio, double near, double far,
|
constexpr Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
||||||
NDCDepthRange ndc_depth_range = NDCDepthRange::NEGATIVE_ONE_TO_ONE) noexcept;
|
{
|
||||||
|
return mat_rotation_axis_z<double, MatStoreType::ROW_MAJOR>(angles.yaw)
|
||||||
|
* mat_rotation_axis_y<double, MatStoreType::ROW_MAJOR>(-angles.pitch)
|
||||||
|
* mat_rotation_axis_x<double, MatStoreType::ROW_MAJOR>(-angles.roll);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("origin result should not be discarded")]]
|
||||||
|
constexpr Vector3<double> extract_origin(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_origin(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("scale result should not be discarded")]]
|
||||||
|
constexpr Vector3<double> extract_scale(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
return mat_extract_scale(mat);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("rotation angles result should not be discarded")]]
|
||||||
|
constexpr ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
||||||
|
{
|
||||||
|
const auto angles = mat_extract_rotation_zyx(mat);
|
||||||
|
return {
|
||||||
|
PitchAngle::from_degrees(-angles.y),
|
||||||
|
YawAngle::from_degrees(angles.z),
|
||||||
|
RollAngle::from_degrees(-angles.x),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("perspective projection matrix result should not be discarded")]]
|
||||||
|
constexpr Mat4X4 calc_perspective_projection_matrix(
|
||||||
|
const double field_of_view, const double aspect_ratio, const double near_plane, const double far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range = NDCDepthRange::NEGATIVE_ONE_TO_ONE) noexcept
|
||||||
|
{
|
||||||
|
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
||||||
|
return mat_perspective_left_handed_horizontal_fov<double, MatStoreType::ROW_MAJOR,
|
||||||
|
NDCDepthRange::ZERO_TO_ONE>(field_of_view, aspect_ratio,
|
||||||
|
near_plane, far_plane);
|
||||||
|
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
|
return mat_perspective_left_handed_horizontal_fov<double, MatStoreType::ROW_MAJOR,
|
||||||
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
||||||
|
field_of_view, aspect_ratio, near_plane, far_plane);
|
||||||
|
std::unreachable();
|
||||||
|
}
|
||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("centimeters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
constexpr FloatingType units_to_centimeters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units;
|
return units;
|
||||||
@@ -44,7 +98,7 @@ namespace omath::unreal_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("meters value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_meters(const FloatingType& units)
|
constexpr FloatingType units_to_meters(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units / static_cast<FloatingType>(100);
|
return units / static_cast<FloatingType>(100);
|
||||||
@@ -52,7 +106,7 @@ namespace omath::unreal_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("kilometers value should not be discarded")]]
|
||||||
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
constexpr FloatingType units_to_kilometers(const FloatingType& units)
|
||||||
{
|
{
|
||||||
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
return units_to_meters(units) / static_cast<FloatingType>(1000);
|
||||||
@@ -60,7 +114,7 @@ namespace omath::unreal_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
constexpr FloatingType centimeters_to_units(const FloatingType& centimeters)
|
||||||
{
|
{
|
||||||
return centimeters;
|
return centimeters;
|
||||||
@@ -68,7 +122,7 @@ namespace omath::unreal_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
constexpr FloatingType meters_to_units(const FloatingType& meters)
|
||||||
{
|
{
|
||||||
return meters * static_cast<FloatingType>(100);
|
return meters * static_cast<FloatingType>(100);
|
||||||
@@ -76,7 +130,7 @@ namespace omath::unreal_engine
|
|||||||
|
|
||||||
template<class FloatingType>
|
template<class FloatingType>
|
||||||
requires std::is_floating_point_v<FloatingType>
|
requires std::is_floating_point_v<FloatingType>
|
||||||
[[nodiscard]]
|
[[nodiscard("units value should not be discarded")]]
|
||||||
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
constexpr FloatingType kilometers_to_units(const FloatingType& kilometers)
|
||||||
{
|
{
|
||||||
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
return meters_to_units(kilometers * static_cast<FloatingType>(1000));
|
||||||
|
|||||||
@@ -11,14 +11,30 @@ namespace omath::unreal_engine
|
|||||||
class CameraTrait final
|
class CameraTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("look-at angle result should not be discarded")]]
|
||||||
static ViewAngles calc_look_at_angle(const Vector3<double>& cam_origin, const Vector3<double>& look_at) noexcept;
|
constexpr static ViewAngles calc_look_at_angle(const Vector3<double>& cam_origin,
|
||||||
|
const Vector3<double>& look_at) noexcept
|
||||||
|
{
|
||||||
|
const auto direction = (look_at - cam_origin).normalized();
|
||||||
|
|
||||||
[[nodiscard]]
|
return {PitchAngle::from_asin(direction.z), YawAngle::from_atan2(direction.y, direction.x),
|
||||||
static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<double>& cam_origin) noexcept;
|
RollAngle::from_radians(0.f)};
|
||||||
[[nodiscard]]
|
}
|
||||||
static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov, const projection::ViewPort& view_port,
|
|
||||||
double near, double far, NDCDepthRange ndc_depth_range) noexcept;
|
[[nodiscard("view matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<double>& cam_origin) noexcept
|
||||||
|
{
|
||||||
|
return unreal_engine::calc_view_matrix(angles, cam_origin);
|
||||||
|
}
|
||||||
|
[[nodiscard("projection matrix result should not be discarded")]]
|
||||||
|
constexpr static Mat4X4 calc_projection_matrix(const projection::FieldOfView& fov,
|
||||||
|
const projection::ViewPort& view_port, const double near_plane,
|
||||||
|
const double far_plane,
|
||||||
|
const NDCDepthRange ndc_depth_range) noexcept
|
||||||
|
{
|
||||||
|
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near_plane, far_plane,
|
||||||
|
ndc_depth_range);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace omath::unreal_engine
|
} // namespace omath::unreal_engine
|
||||||
@@ -10,7 +10,7 @@ namespace omath::unreal_engine
|
|||||||
class MeshTrait final
|
class MeshTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("rotation matrix result should not be discarded")]]
|
||||||
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
static Mat4X4 rotation_matrix(const ViewAngles& rotation)
|
||||||
{
|
{
|
||||||
return unreal_engine::rotation_matrix(rotation);
|
return unreal_engine::rotation_matrix(rotation);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ namespace omath::unreal_engine
|
|||||||
class PredEngineTrait final
|
class PredEngineTrait final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
[[nodiscard("projectile position result should not be discarded")]]
|
||||||
static Vector3<double> predict_projectile_position(const projectile_prediction::Projectile<double>& projectile,
|
static Vector3<double> predict_projectile_position(const projectile_prediction::Projectile<double>& projectile,
|
||||||
const double pitch, const double yaw,
|
const double pitch, const double yaw,
|
||||||
const double time, const double gravity) noexcept
|
const double time, const double gravity) noexcept
|
||||||
@@ -27,7 +28,7 @@ namespace omath::unreal_engine
|
|||||||
return current_pos;
|
return current_pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("target position result should not be discarded")]]
|
||||||
static Vector3<double> predict_target_position(const projectile_prediction::Target<double>& target,
|
static Vector3<double> predict_target_position(const projectile_prediction::Target<double>& target,
|
||||||
const double time, const double gravity) noexcept
|
const double time, const double gravity) noexcept
|
||||||
{
|
{
|
||||||
@@ -39,19 +40,19 @@ namespace omath::unreal_engine
|
|||||||
return predicted;
|
return predicted;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("2d distance result should not be discarded")]]
|
||||||
static double calc_vector_2d_distance(const Vector3<double>& delta) noexcept
|
static double calc_vector_2d_distance(const Vector3<double>& delta) noexcept
|
||||||
{
|
{
|
||||||
return std::sqrt(delta.x * delta.x + delta.z * delta.z);
|
return std::sqrt(delta.x * delta.x + delta.z * delta.z);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("height coordinate result should not be discarded")]]
|
||||||
static double get_vector_height_coordinate(const Vector3<double>& vec) noexcept
|
static double get_vector_height_coordinate(const Vector3<double>& vec) noexcept
|
||||||
{
|
{
|
||||||
return vec.y;
|
return vec.y;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("viewpoint result should not be discarded")]]
|
||||||
static Vector3<double> calc_viewpoint_from_angles(const projectile_prediction::Projectile<double>& projectile,
|
static Vector3<double> calc_viewpoint_from_angles(const projectile_prediction::Projectile<double>& projectile,
|
||||||
Vector3<double> predicted_target_position,
|
Vector3<double> predicted_target_position,
|
||||||
const std::optional<double> projectile_pitch) noexcept
|
const std::optional<double> projectile_pitch) noexcept
|
||||||
@@ -64,7 +65,7 @@ namespace omath::unreal_engine
|
|||||||
|
|
||||||
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
// Due to specification of maybe_calculate_projectile_launch_pitch_angle, pitch angle must be:
|
||||||
// 89 look up, -89 look down
|
// 89 look up, -89 look down
|
||||||
[[nodiscard]]
|
[[nodiscard("pitch angle result should not be discarded")]]
|
||||||
static double calc_direct_pitch_angle(const Vector3<double>& origin, const Vector3<double>& view_to) noexcept
|
static double calc_direct_pitch_angle(const Vector3<double>& origin, const Vector3<double>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto direction = (view_to - origin).normalized();
|
const auto direction = (view_to - origin).normalized();
|
||||||
@@ -72,7 +73,7 @@ namespace omath::unreal_engine
|
|||||||
return angles::radians_to_degrees(std::asin(direction.z));
|
return angles::radians_to_degrees(std::asin(direction.z));
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("yaw angle result should not be discarded")]]
|
||||||
static double calc_direct_yaw_angle(const Vector3<double>& origin, const Vector3<double>& view_to) noexcept
|
static double calc_direct_yaw_angle(const Vector3<double>& origin, const Vector3<double>& view_to) noexcept
|
||||||
{
|
{
|
||||||
const auto direction = (view_to - origin).normalized();
|
const auto direction = (view_to - origin).normalized();
|
||||||
|
|||||||
@@ -9,9 +9,10 @@ namespace omath::hud
|
|||||||
class CanvasBox final
|
class CanvasBox final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
CanvasBox() = default;
|
||||||
CanvasBox(Vector2<float> top, Vector2<float> bottom, float ratio = 4.f);
|
CanvasBox(Vector2<float> top, Vector2<float> bottom, float ratio = 4.f);
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("You have to use array")]]
|
||||||
std::array<Vector2<float>, 4> as_array() const;
|
std::array<Vector2<float>, 4> as_array() const;
|
||||||
|
|
||||||
Vector2<float> top_left_corner;
|
Vector2<float> top_left_corner;
|
||||||
|
|||||||
@@ -5,13 +5,21 @@
|
|||||||
#include "canvas_box.hpp"
|
#include "canvas_box.hpp"
|
||||||
#include "entity_overlay_widgets.hpp"
|
#include "entity_overlay_widgets.hpp"
|
||||||
#include "hud_renderer_interface.hpp"
|
#include "hud_renderer_interface.hpp"
|
||||||
|
#include "omath/3d_primitives/aabb.hpp"
|
||||||
#include "omath/linear_algebra/vector2.hpp"
|
#include "omath/linear_algebra/vector2.hpp"
|
||||||
#include "omath/utility/color.hpp"
|
#include "omath/utility/color.hpp"
|
||||||
|
#include <expected>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
|
#include <type_traits>
|
||||||
namespace omath::hud
|
namespace omath::hud
|
||||||
{
|
{
|
||||||
|
enum class EntityOverlayError
|
||||||
|
{
|
||||||
|
NO_PROJECTED_VERTEX,
|
||||||
|
CENTER_PROJECTION_FAILED,
|
||||||
|
};
|
||||||
|
|
||||||
class EntityOverlay final
|
class EntityOverlay final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
@@ -22,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},
|
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);
|
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},
|
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},
|
const Color& outline_color = Color{0.f, 0.f, 0.f, 0.f},
|
||||||
float corner_ratio_len = 0.2f, float thickness = 1.f);
|
float corner_ratio_len = 0.2f, float thickness = 1.f);
|
||||||
@@ -30,17 +41,21 @@ namespace omath::hud
|
|||||||
float thickness = 1.f);
|
float thickness = 1.f);
|
||||||
|
|
||||||
// ── Bars ─────────────────────────────────────────────────────────
|
// ── Bars ─────────────────────────────────────────────────────────
|
||||||
EntityOverlay& add_right_bar(const Color& color, const Color& outline_color, const Color& bg_color, float width,
|
EntityOverlay& add_right_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color,
|
||||||
float ratio, float offset = 5.f);
|
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,
|
EntityOverlay& add_left_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color,
|
||||||
float ratio, float offset = 5.f);
|
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,
|
EntityOverlay& add_top_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color,
|
||||||
float ratio, float offset = 5.f);
|
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,
|
EntityOverlay& add_bottom_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color,
|
||||||
float height, float ratio, float offset = 5.f);
|
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,
|
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,
|
float width, float ratio, float dash_len, float gap_len,
|
||||||
@@ -57,46 +72,58 @@ namespace omath::hud
|
|||||||
float offset = 5.f);
|
float offset = 5.f);
|
||||||
|
|
||||||
// ── Labels ───────────────────────────────────────────────────────
|
// ── 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,
|
EntityOverlay& add_centered_top_label(const widget::Paint& color, float offset, widget::Outlined outlined,
|
||||||
const std::string_view& text);
|
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,
|
EntityOverlay& add_centered_bottom_label(const widget::Paint& color, float offset, widget::Outlined outlined,
|
||||||
const std::string_view& text);
|
const std::string_view& text,
|
||||||
|
const std::optional<widget::Glow>& glow = std::nullopt);
|
||||||
|
|
||||||
template<typename... Args>
|
template<typename... Args>
|
||||||
EntityOverlay& add_right_label(const Color& color, const float offset, const widget::Outlined outlined, std::format_string<Args...> fmt,
|
requires(sizeof...(Args) > 0)
|
||||||
Args&&... args)
|
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,
|
return add_right_label(color, offset, outlined,
|
||||||
std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))});
|
std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))});
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename... Args>
|
template<typename... Args>
|
||||||
EntityOverlay& add_left_label(const Color& color, const float offset, const widget::Outlined outlined, std::format_string<Args...> fmt,
|
requires(sizeof...(Args) > 0)
|
||||||
Args&&... args)
|
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,
|
return add_left_label(color, offset, outlined,
|
||||||
std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))});
|
std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))});
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename... Args>
|
template<typename... Args>
|
||||||
EntityOverlay& add_top_label(const Color& color, const float offset, const widget::Outlined outlined, std::format_string<Args...> fmt,
|
requires(sizeof...(Args) > 0)
|
||||||
Args&&... args)
|
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,
|
return add_top_label(color, offset, outlined,
|
||||||
std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))});
|
std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))});
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename... Args>
|
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)
|
std::format_string<Args...> fmt, Args&&... args)
|
||||||
{
|
{
|
||||||
return add_bottom_label(color, offset, outlined,
|
return add_bottom_label(color, offset, outlined,
|
||||||
@@ -104,16 +131,20 @@ namespace omath::hud
|
|||||||
}
|
}
|
||||||
|
|
||||||
template<typename... Args>
|
template<typename... Args>
|
||||||
EntityOverlay& add_centered_top_label(const Color& color, const float offset, const widget::Outlined outlined,
|
requires(sizeof...(Args) > 0)
|
||||||
std::format_string<Args...> fmt, Args&&... args)
|
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,
|
return add_centered_top_label(color, offset, outlined,
|
||||||
std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))});
|
std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))});
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename... Args>
|
template<typename... Args>
|
||||||
EntityOverlay& add_centered_bottom_label(const Color& color, const float offset, const widget::Outlined outlined,
|
requires(sizeof...(Args) > 0)
|
||||||
std::format_string<Args...> fmt, Args&&... args)
|
EntityOverlay& add_centered_bottom_label(const widget::Paint& color, const float offset,
|
||||||
|
const widget::Outlined outlined, std::format_string<Args...> fmt,
|
||||||
|
Args&&... args)
|
||||||
{
|
{
|
||||||
return add_centered_bottom_label(color, offset, outlined,
|
return add_centered_bottom_label(color, offset, outlined,
|
||||||
std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))});
|
std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))});
|
||||||
@@ -153,6 +184,7 @@ namespace omath::hud
|
|||||||
EntityOverlay& add_snap_line(const Vector2<float>& start_pos, const Color& color, float width);
|
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(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 ─────────────────────────────────────────
|
// ── Declarative interface ─────────────────────────────────────────
|
||||||
/// Pass any combination of widget:: descriptor structs (and std::optional<W>
|
/// Pass any combination of widget:: descriptor structs (and std::optional<W>
|
||||||
@@ -164,6 +196,49 @@ namespace omath::hud
|
|||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<class Camera, class Aabb>
|
||||||
|
[[nodiscard]]
|
||||||
|
static std::expected<EntityOverlay, EntityOverlayError>
|
||||||
|
from_aabb(const Camera& camera, const Aabb& aabb, const float aspect,
|
||||||
|
const std::shared_ptr<HudRendererInterface>& renderer)
|
||||||
|
{
|
||||||
|
using ProjectedVector = std::invoke_result_t<decltype(&Aabb::center), const Aabb&>;
|
||||||
|
|
||||||
|
ProjectedVector top;
|
||||||
|
ProjectedVector bottom;
|
||||||
|
bool has_projected_vertex = false;
|
||||||
|
|
||||||
|
for (const auto& vertex : aabb.vertices())
|
||||||
|
{
|
||||||
|
if (auto projected = camera.world_to_screen_unclipped(vertex))
|
||||||
|
{
|
||||||
|
if (!has_projected_vertex)
|
||||||
|
{
|
||||||
|
top = *projected;
|
||||||
|
bottom = *projected;
|
||||||
|
has_projected_vertex = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (projected->y < top.y)
|
||||||
|
top = *projected;
|
||||||
|
if (projected->y > bottom.y)
|
||||||
|
bottom = *projected;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!has_projected_vertex)
|
||||||
|
return std::unexpected(EntityOverlayError::NO_PROJECTED_VERTEX);
|
||||||
|
|
||||||
|
auto center = camera.world_to_screen_unclipped(aabb.center());
|
||||||
|
if (!center)
|
||||||
|
return std::unexpected(EntityOverlayError::CENTER_PROJECTION_FAILED);
|
||||||
|
|
||||||
|
const auto center_x = static_cast<float>(center->x);
|
||||||
|
return EntityOverlay{
|
||||||
|
{center_x, static_cast<float>(top.y)}, {center_x, static_cast<float>(bottom.y)}, aspect, renderer};
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// optional<W> dispatch — enables when() conditional widgets
|
// optional<W> dispatch — enables when() conditional widgets
|
||||||
template<typename W>
|
template<typename W>
|
||||||
@@ -174,6 +249,7 @@ namespace omath::hud
|
|||||||
}
|
}
|
||||||
|
|
||||||
void dispatch(const widget::Box& box);
|
void dispatch(const widget::Box& box);
|
||||||
|
void dispatch(const widget::CanvasGlow& canvas_glow);
|
||||||
void dispatch(const widget::CorneredBox& cornered_box);
|
void dispatch(const widget::CorneredBox& cornered_box);
|
||||||
void dispatch(const widget::DashedBox& dashed_box);
|
void dispatch(const widget::DashedBox& dashed_box);
|
||||||
void dispatch(const widget::RightSide& right_side);
|
void dispatch(const widget::RightSide& right_side);
|
||||||
@@ -186,7 +262,19 @@ namespace omath::hud
|
|||||||
void dispatch(const widget::AimDot& aim_dot);
|
void dispatch(const widget::AimDot& aim_dot);
|
||||||
void dispatch(const widget::ProjectileAim& proj_widget);
|
void dispatch(const widget::ProjectileAim& proj_widget);
|
||||||
void draw_progress_ring(const Vector2<float>& center, const widget::ProgressRing& ring);
|
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,
|
void draw_dashed_line(const Vector2<float>& from, const Vector2<float>& to, const Color& color, float dash_len,
|
||||||
float gap_len, float thickness) const;
|
float gap_len, float thickness) const;
|
||||||
void draw_dashed_fill(const Vector2<float>& origin, const Vector2<float>& step_dir,
|
void draw_dashed_fill(const Vector2<float>& origin, const Vector2<float>& step_dir,
|
||||||
|
|||||||
@@ -2,16 +2,57 @@
|
|||||||
// Created by orange on 15.03.2026.
|
// Created by orange on 15.03.2026.
|
||||||
//
|
//
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include "gradient.hpp"
|
||||||
#include "omath/linear_algebra/vector2.hpp"
|
#include "omath/linear_algebra/vector2.hpp"
|
||||||
#include "omath/utility/color.hpp"
|
#include "omath/utility/color.hpp"
|
||||||
#include <any>
|
#include <any>
|
||||||
|
#include <array>
|
||||||
#include <initializer_list>
|
#include <initializer_list>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
#include <span>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
|
#include <type_traits>
|
||||||
#include <variant>
|
#include <variant>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
namespace omath::hud::widget
|
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 ──────────────────────────────────────
|
// ── Overloaded helper for std::visit ──────────────────────────────────────
|
||||||
template<typename... Ts>
|
template<typename... Ts>
|
||||||
struct Overloaded : Ts...
|
struct Overloaded : Ts...
|
||||||
@@ -21,13 +62,28 @@ namespace omath::hud::widget
|
|||||||
template<typename... Ts>
|
template<typename... Ts>
|
||||||
Overloaded(Ts...) -> Overloaded<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 ────────────────────────────────────────────────────
|
// ── Standalone widgets ────────────────────────────────────────────────────
|
||||||
struct Box
|
struct Box
|
||||||
{
|
{
|
||||||
Color color;
|
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};
|
Color outline{0.f, 0.f, 0.f, 0.f};
|
||||||
float thickness = 1.f;
|
float thickness = 1.f;
|
||||||
|
std::optional<Glow> glow = std::nullopt;
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class Outlined
|
enum class Outlined
|
||||||
@@ -42,6 +98,7 @@ namespace omath::hud::widget
|
|||||||
Color outline{0.f, 0.f, 0.f, 0.f};
|
Color outline{0.f, 0.f, 0.f, 0.f};
|
||||||
float corner_ratio = 0.2f;
|
float corner_ratio = 0.2f;
|
||||||
float thickness = 1.f;
|
float thickness = 1.f;
|
||||||
|
std::optional<Glow> glow = std::nullopt;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct DashedBox
|
struct DashedBox
|
||||||
@@ -52,10 +109,37 @@ namespace omath::hud::widget
|
|||||||
float thickness = 1.f;
|
float thickness = 1.f;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct Bone
|
||||||
|
{
|
||||||
|
Vector2<float> start;
|
||||||
|
Vector2<float> end;
|
||||||
|
};
|
||||||
|
|
||||||
struct Skeleton
|
struct Skeleton
|
||||||
{
|
{
|
||||||
|
std::vector<Bone> bones;
|
||||||
Color color;
|
Color color;
|
||||||
float thickness = 1.f;
|
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
|
struct SnapLine
|
||||||
{
|
{
|
||||||
@@ -92,18 +176,18 @@ namespace omath::hud::widget
|
|||||||
Figure figure = Figure::SQUARE;
|
Figure figure = Figure::SQUARE;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// ── Side-agnostic widgets (used inside XxxSide containers) ────────────────
|
// ── Side-agnostic widgets (used inside XxxSide containers) ────────────────
|
||||||
|
|
||||||
/// A filled bar. `size` is width for left/right sides, height for top/bottom.
|
/// A filled bar. `size` is width for left/right sides, height for top/bottom.
|
||||||
struct Bar
|
struct Bar
|
||||||
{
|
{
|
||||||
Color color;
|
BarPaint color;
|
||||||
Color outline;
|
Color outline;
|
||||||
Color bg;
|
Color bg;
|
||||||
float size;
|
float size;
|
||||||
float ratio;
|
float ratio;
|
||||||
float offset = 5.f;
|
float offset = 5.f;
|
||||||
|
std::optional<Glow> glow = std::nullopt;
|
||||||
};
|
};
|
||||||
|
|
||||||
/// A dashed bar. Same field semantics as Bar plus dash parameters.
|
/// A dashed bar. Same field semantics as Bar plus dash parameters.
|
||||||
@@ -121,10 +205,11 @@ namespace omath::hud::widget
|
|||||||
|
|
||||||
struct Label
|
struct Label
|
||||||
{
|
{
|
||||||
Color color;
|
Paint color;
|
||||||
float offset;
|
float offset;
|
||||||
Outlined outlined;
|
Outlined outlined;
|
||||||
std::string_view text;
|
std::string_view text;
|
||||||
|
std::optional<Glow> glow = std::nullopt;
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Wraps a Label to request horizontal centering (only applied in TopSide / BottomSide).
|
/// Wraps a Label to request horizontal centering (only applied in TopSide / BottomSide).
|
||||||
@@ -172,8 +257,8 @@ namespace omath::hud::widget
|
|||||||
struct None
|
struct None
|
||||||
{
|
{
|
||||||
}; ///< No-op placeholder — used by widget::when for disabled elements.
|
}; ///< No-op placeholder — used by widget::when for disabled elements.
|
||||||
using SideWidget =
|
using SideWidget = std::variant<None, Bar, DashedBar, Label, Centered<Label>, SpaceVertical, SpaceHorizontal,
|
||||||
std::variant<None, Bar, DashedBar, Label, Centered<Label>, SpaceVertical, SpaceHorizontal, ProgressRing, Icon>;
|
ProgressRing, Icon>;
|
||||||
|
|
||||||
// ── Side containers ───────────────────────────────────────────────────────
|
// ── Side containers ───────────────────────────────────────────────────────
|
||||||
// Storing std::initializer_list<SideWidget> is safe here: the backing array
|
// 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.
|
// Created by orange on 13.03.2026.
|
||||||
//
|
//
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include "gradient.hpp"
|
||||||
#include "omath/linear_algebra/vector2.hpp"
|
#include "omath/linear_algebra/vector2.hpp"
|
||||||
#include "omath/utility/color.hpp"
|
#include "omath/utility/color.hpp"
|
||||||
#include <any>
|
#include <any>
|
||||||
@@ -19,12 +20,24 @@ namespace omath::hud
|
|||||||
virtual void add_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color,
|
virtual void add_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color,
|
||||||
float thickness) = 0;
|
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_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_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_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,
|
virtual void add_circle(const Vector2<float>& center, float radius, const Color& color, float thickness,
|
||||||
int segments = 0) = 0;
|
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_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]]
|
[[nodiscard]]
|
||||||
virtual Vector2<float> calc_text_size(const std::string_view& text) = 0;
|
virtual Vector2<float> calc_text_size(const std::string_view& text) = 0;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -13,10 +13,15 @@ namespace omath::hud
|
|||||||
~ImguiHudRenderer() override;
|
~ImguiHudRenderer() override;
|
||||||
void add_line(const Vector2<float>& line_start, const Vector2<float>& line_end, const Color& color,
|
void add_line(const Vector2<float>& line_start, const Vector2<float>& line_end, const Color& color,
|
||||||
float thickness) override;
|
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_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_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_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,
|
void add_circle(const Vector2<float>& center, float radius, const Color& color, float thickness,
|
||||||
int segments = 0) override;
|
int segments = 0) override;
|
||||||
void add_filled_circle(const Vector2<float>& center, float radius, const Color& color,
|
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,
|
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;
|
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_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]]
|
[[nodiscard]]
|
||||||
Vector2<float> calc_text_size(const std::string_view& text) override;
|
Vector2<float> calc_text_size(const std::string_view& text) override;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,707 @@
|
|||||||
|
//
|
||||||
|
// Created by orange on 6/11/2026.
|
||||||
|
//
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <bit>
|
||||||
|
#include <cmath>
|
||||||
|
#include <cstdint>
|
||||||
|
#include <limits>
|
||||||
|
#include <numbers>
|
||||||
|
#include <type_traits>
|
||||||
|
|
||||||
|
namespace omath::internal
|
||||||
|
{
|
||||||
|
// Embedded subset of GCE-Math 1.18.0.
|
||||||
|
//
|
||||||
|
// Original project:
|
||||||
|
// GCE-Math: A C++ generalized constant expression-based math library
|
||||||
|
// Copyright 2016-2024 Keith O'Hara
|
||||||
|
// Licensed under the Apache License, Version 2.0.
|
||||||
|
namespace math_detail
|
||||||
|
{
|
||||||
|
using uint_t = unsigned int;
|
||||||
|
using llint_t = long long int;
|
||||||
|
using ullint_t = unsigned long long int;
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
using limits = std::numeric_limits<Type>;
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
constexpr Type pi = std::numbers::pi_v<Type>;
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
constexpr Type half_pi = std::numbers::pi_v<Type> / static_cast<Type>(2);
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type abs(const Type value) noexcept
|
||||||
|
{
|
||||||
|
return value == Type{0} ? Type{0} : value < Type{0} ? -value : value;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr int sgn(const Type value) noexcept
|
||||||
|
{
|
||||||
|
return value > Type{0} ? 1 : value < Type{0} ? -1 : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr bool is_odd(const llint_t value) noexcept
|
||||||
|
{
|
||||||
|
return (value & 1U) != 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr bool is_nan(const Type value) noexcept
|
||||||
|
{
|
||||||
|
return value != value;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr bool is_neginf(const Type value) noexcept
|
||||||
|
{
|
||||||
|
return value == -limits<Type>::infinity();
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr bool is_posinf(const Type value) noexcept
|
||||||
|
{
|
||||||
|
return value == limits<Type>::infinity();
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr bool is_inf(const Type value) noexcept
|
||||||
|
{
|
||||||
|
return is_neginf(value) || is_posinf(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr bool is_finite(const Type value) noexcept
|
||||||
|
{
|
||||||
|
return !is_nan(value) && !is_inf(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr bool any_nan(const Type x, const Type y) noexcept
|
||||||
|
{
|
||||||
|
return is_nan(x) || is_nan(y);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr bool any_inf(const Type x, const Type y) noexcept
|
||||||
|
{
|
||||||
|
return is_inf(x) || is_inf(y);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr bool all_finite(const Type x, const Type y) noexcept
|
||||||
|
{
|
||||||
|
return is_finite(x) && is_finite(y);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr bool signbit(const Type value) noexcept
|
||||||
|
{
|
||||||
|
if constexpr (std::is_same_v<Type, float>)
|
||||||
|
return (std::bit_cast<std::uint32_t>(value) & 0x80000000U) != 0;
|
||||||
|
else if constexpr (std::is_same_v<Type, double>)
|
||||||
|
return (std::bit_cast<std::uint64_t>(value) & 0x8000000000000000ULL) != 0;
|
||||||
|
else
|
||||||
|
return value < Type{0};
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr bool neg_zero(const Type value) noexcept
|
||||||
|
{
|
||||||
|
return value == Type{0} && signbit(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type, class ExpType>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type pow_integral_compute(const Type base, const ExpType exp_term) noexcept;
|
||||||
|
|
||||||
|
template<class Type, class ExpType>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type pow_integral_compute_recur(const Type base, const Type value, const ExpType exp_term) noexcept
|
||||||
|
{
|
||||||
|
return exp_term > ExpType{1}
|
||||||
|
? is_odd(static_cast<llint_t>(exp_term))
|
||||||
|
? pow_integral_compute_recur(base * base, value * base, exp_term / ExpType{2})
|
||||||
|
: pow_integral_compute_recur(base * base, value, exp_term / ExpType{2})
|
||||||
|
: exp_term == ExpType{1} ? value * base
|
||||||
|
: value;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type, class ExpType>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type pow_integral_sgn_check(const Type base, const ExpType exp_term) noexcept
|
||||||
|
{
|
||||||
|
if constexpr (std::is_signed_v<ExpType>)
|
||||||
|
return exp_term < ExpType{0} ? Type{1} / pow_integral_compute(base, -exp_term)
|
||||||
|
: pow_integral_compute_recur(base, Type{1}, exp_term);
|
||||||
|
else
|
||||||
|
return pow_integral_compute_recur(base, Type{1}, exp_term);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type, class ExpType>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type pow_integral_compute(const Type base, const ExpType exp_term) noexcept
|
||||||
|
{
|
||||||
|
return exp_term == ExpType{3} ? base * base * base
|
||||||
|
: exp_term == ExpType{2} ? base * base
|
||||||
|
: exp_term == ExpType{1} ? base
|
||||||
|
: exp_term == ExpType{0} ? Type{1}
|
||||||
|
: exp_term == limits<ExpType>::min() ? Type{0}
|
||||||
|
: exp_term == limits<ExpType>::max() ? limits<Type>::infinity()
|
||||||
|
: pow_integral_sgn_check(base, exp_term);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type, class ExpType>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type pow_integral(const Type base, const ExpType exp_term) noexcept
|
||||||
|
{
|
||||||
|
return pow_integral_compute(base, exp_term);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type sqrt_recur(const Type x, const Type xn, const int count) noexcept
|
||||||
|
{
|
||||||
|
return abs(xn - x / xn) / (Type{1} + xn) < limits<Type>::min() ? xn
|
||||||
|
: count < 100 ? sqrt_recur(x, Type{0.5} * (xn + x / xn), count + 1)
|
||||||
|
: xn;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type sqrt_simplify(const Type x, const Type m_val) noexcept
|
||||||
|
{
|
||||||
|
return x > Type{1e+08} ? sqrt_simplify(x / Type{1e+08}, Type{1e+04} * m_val)
|
||||||
|
: x > Type{1e+06} ? sqrt_simplify(x / Type{1e+06}, Type{1e+03} * m_val)
|
||||||
|
: x > Type{1e+04} ? sqrt_simplify(x / Type{1e+04}, Type{1e+02} * m_val)
|
||||||
|
: x > Type{100} ? sqrt_simplify(x / Type{100}, Type{10} * m_val)
|
||||||
|
: x > Type{4} ? sqrt_simplify(x / Type{4}, Type{2} * m_val)
|
||||||
|
: m_val * sqrt_recur(x, x / Type{2}, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type sqrt(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return is_nan(x) ? limits<Type>::quiet_NaN()
|
||||||
|
: x < Type{0} ? limits<Type>::quiet_NaN()
|
||||||
|
: is_posinf(x) ? x
|
||||||
|
: limits<Type>::min() > abs(x) ? Type{0}
|
||||||
|
: limits<Type>::min() > abs(Type{1} - x) ? x
|
||||||
|
: sqrt_simplify(x, Type{1});
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type floor_int(const Type x, const Type x_whole) noexcept
|
||||||
|
{
|
||||||
|
return x_whole - static_cast<Type>((x < Type{0}) && (x < x_whole));
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type floor_check_internal(const Type x) noexcept
|
||||||
|
{
|
||||||
|
if constexpr (std::is_same_v<Type, float>)
|
||||||
|
return abs(x) >= 8388608.f ? x : floor_int(x, static_cast<float>(static_cast<int>(x)));
|
||||||
|
else if constexpr (std::is_same_v<Type, double>)
|
||||||
|
return abs(x) >= 4503599627370496. ? x : floor_int(x, static_cast<double>(static_cast<llint_t>(x)));
|
||||||
|
else
|
||||||
|
return abs(x) >= 9223372036854775808.l
|
||||||
|
? x
|
||||||
|
: static_cast<long double>(static_cast<ullint_t>(abs(x))) * sgn(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type floor(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return is_nan(x) ? limits<Type>::quiet_NaN()
|
||||||
|
: !is_finite(x) ? x
|
||||||
|
: limits<Type>::min() > abs(x) ? x
|
||||||
|
: floor_check_internal(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type trunc_int(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return static_cast<Type>(static_cast<llint_t>(x));
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type trunc_check_internal(const Type x) noexcept
|
||||||
|
{
|
||||||
|
if constexpr (std::is_same_v<Type, float>)
|
||||||
|
return abs(x) >= 8388608.f ? x : trunc_int(x);
|
||||||
|
else if constexpr (std::is_same_v<Type, double>)
|
||||||
|
return abs(x) >= 4503599627370496. ? x : trunc_int(x);
|
||||||
|
else
|
||||||
|
return abs(x) >= 9223372036854775808.l
|
||||||
|
? x
|
||||||
|
: static_cast<long double>(static_cast<ullint_t>(abs(x))) * sgn(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type trunc(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return is_nan(x) ? limits<Type>::quiet_NaN()
|
||||||
|
: !is_finite(x) ? x
|
||||||
|
: limits<Type>::min() > abs(x) ? x
|
||||||
|
: trunc_check_internal(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type fmod(const Type x, const Type y) noexcept
|
||||||
|
{
|
||||||
|
return any_nan(x, y) || !all_finite(x, y) || limits<Type>::min() > abs(y) ? limits<Type>::quiet_NaN()
|
||||||
|
: x - trunc(x / y) * y;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type tan_series_exp_long(const Type z) noexcept
|
||||||
|
{
|
||||||
|
return -Type{1} / z
|
||||||
|
+ (z / Type{3}
|
||||||
|
+ (pow_integral(z, 3) / Type{45}
|
||||||
|
+ (Type{2} * pow_integral(z, 5) / Type{945} + pow_integral(z, 7) / Type{4725})));
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type tan_series_exp(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return limits<Type>::min() > abs(x - half_pi<Type>) ? Type{1.633124e+16}
|
||||||
|
: tan_series_exp_long(x - half_pi<Type>);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type tan_cf_recur(const Type xx, const int max_depth) noexcept
|
||||||
|
{
|
||||||
|
Type result = static_cast<Type>(2 * max_depth - 1);
|
||||||
|
for (int depth = max_depth - 1; depth >= 1; --depth)
|
||||||
|
result = static_cast<Type>(2 * depth - 1) - xx / result;
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type tan_cf_main(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return x > Type{1.55} && x < Type{1.60} ? tan_series_exp(x)
|
||||||
|
: x > Type{1.4} ? x / tan_cf_recur(x * x, 45)
|
||||||
|
: x > Type{1} ? x / tan_cf_recur(x * x, 35)
|
||||||
|
: x / tan_cf_recur(x * x, 25);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type tan_begin(const Type x, const int count = 0) noexcept
|
||||||
|
{
|
||||||
|
return x > pi<Type> ? count > 1 ? limits<Type>::quiet_NaN()
|
||||||
|
: tan_begin(x - pi<Type> * floor(x / pi<Type>), count + 1)
|
||||||
|
: tan_cf_main(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type tan(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return is_nan(x) ? limits<Type>::quiet_NaN()
|
||||||
|
: limits<Type>::min() > abs(x) ? Type{0}
|
||||||
|
: x < Type{0} ? -tan_begin(-x)
|
||||||
|
: tan_begin(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type sin(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return is_nan(x) ? limits<Type>::quiet_NaN()
|
||||||
|
: limits<Type>::min() > abs(x) ? Type{0}
|
||||||
|
: limits<Type>::min() > abs(x - half_pi<Type>) ? Type{1}
|
||||||
|
: limits<Type>::min() > abs(x + half_pi<Type>) ? -Type{1}
|
||||||
|
: limits<Type>::min() > abs(x - pi<Type>) ? Type{0}
|
||||||
|
: limits<Type>::min() > abs(x + pi<Type>)
|
||||||
|
? -Type{0}
|
||||||
|
: (Type{2} * tan(x / Type{2})) / (Type{1} + tan(x / Type{2}) * tan(x / Type{2}));
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type cos(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return is_nan(x) ? limits<Type>::quiet_NaN()
|
||||||
|
: limits<Type>::min() > abs(x) ? Type{1}
|
||||||
|
: limits<Type>::min() > abs(x - half_pi<Type>) ? Type{0}
|
||||||
|
: limits<Type>::min() > abs(x + half_pi<Type>) ? Type{0}
|
||||||
|
: limits<Type>::min() > abs(x - pi<Type>) ? -Type{1}
|
||||||
|
: limits<Type>::min() > abs(x + pi<Type>)
|
||||||
|
? -Type{1}
|
||||||
|
: (Type{1} - tan(x / Type{2}) * tan(x / Type{2}))
|
||||||
|
/ (Type{1} + tan(x / Type{2}) * tan(x / Type{2}));
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type atan_series_order_calc(const Type xx, const Type x_pow, const uint_t order) noexcept
|
||||||
|
{
|
||||||
|
return Type{1} / (static_cast<Type>((order - 1) * 4 - 1) * x_pow)
|
||||||
|
- Type{1} / (static_cast<Type>((order - 1) * 4 + 1) * x_pow * xx);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type atan_series_order(const Type x, const uint_t order_begin, const uint_t max_order) noexcept
|
||||||
|
{
|
||||||
|
if (max_order == 1)
|
||||||
|
return half_pi<Type> - Type{1} / x;
|
||||||
|
|
||||||
|
const Type xx = x * x;
|
||||||
|
Type result = atan_series_order_calc(xx, pow_integral(x, 4 * max_order - 5), max_order);
|
||||||
|
auto depth = max_order - 1;
|
||||||
|
|
||||||
|
while (depth > order_begin)
|
||||||
|
{
|
||||||
|
result += atan_series_order_calc(xx, pow_integral(x, 4 * depth - 5), depth);
|
||||||
|
--depth;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result + half_pi<Type> - Type{1} / x;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type atan_series_main(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return x < Type{3} ? atan_series_order(x, 1U, 10U)
|
||||||
|
: x < Type{4} ? atan_series_order(x, 1U, 9U)
|
||||||
|
: x < Type{5} ? atan_series_order(x, 1U, 8U)
|
||||||
|
: x < Type{7} ? atan_series_order(x, 1U, 7U)
|
||||||
|
: x < Type{11} ? atan_series_order(x, 1U, 6U)
|
||||||
|
: x < Type{25} ? atan_series_order(x, 1U, 5U)
|
||||||
|
: x < Type{100} ? atan_series_order(x, 1U, 4U)
|
||||||
|
: x < Type{1000} ? atan_series_order(x, 1U, 3U)
|
||||||
|
: atan_series_order(x, 1U, 2U);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type atan_cf_recur(const Type xx, const uint_t depth_begin, const uint_t max_depth) noexcept
|
||||||
|
{
|
||||||
|
auto depth = max_depth - 1;
|
||||||
|
Type result = static_cast<Type>(2 * (depth + 1) - 1);
|
||||||
|
|
||||||
|
while (depth > depth_begin - 1)
|
||||||
|
{
|
||||||
|
result = static_cast<Type>(2 * depth - 1) + static_cast<Type>(depth * depth) * xx / result;
|
||||||
|
--depth;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type atan_cf_main(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return x < Type{0.5} ? x / atan_cf_recur(x * x, 1U, 15U)
|
||||||
|
: x < Type{1} ? x / atan_cf_recur(x * x, 1U, 25U)
|
||||||
|
: x < Type{1.5} ? x / atan_cf_recur(x * x, 1U, 35U)
|
||||||
|
: x < Type{2} ? x / atan_cf_recur(x * x, 1U, 45U)
|
||||||
|
: x / atan_cf_recur(x * x, 1U, 52U);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type atan_begin(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return x > Type{2.5} ? atan_series_main(x) : atan_cf_main(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type atan(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return is_nan(x) ? limits<Type>::quiet_NaN()
|
||||||
|
: limits<Type>::min() > abs(x) ? Type{0}
|
||||||
|
: x < Type{0} ? -atan_begin(-x)
|
||||||
|
: atan_begin(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type atan2(const Type y, const Type x) noexcept
|
||||||
|
{
|
||||||
|
return any_nan(y, x) ? limits<Type>::quiet_NaN()
|
||||||
|
: limits<Type>::min() > abs(x) ? limits<Type>::min() > abs(y)
|
||||||
|
? neg_zero(y) ? neg_zero(x) ? -pi<Type> : -Type{0}
|
||||||
|
: neg_zero(x) ? pi<Type>
|
||||||
|
: Type{0}
|
||||||
|
: y > Type{0} ? half_pi<Type>
|
||||||
|
: -half_pi<Type>
|
||||||
|
: x < Type{0} ? y < Type{0} ? atan(y / x) - pi<Type> : atan(y / x) + pi<Type>
|
||||||
|
: atan(y / x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type asin_compute(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return x > Type{1} ? limits<Type>::quiet_NaN()
|
||||||
|
: limits<Type>::min() > abs(x - Type{1}) ? half_pi<Type>
|
||||||
|
: limits<Type>::min() > abs(x) ? Type{0}
|
||||||
|
: atan(x / sqrt(Type{1} - x * x));
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type asin(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return is_nan(x) ? limits<Type>::quiet_NaN() : x < Type{0} ? -asin_compute(-x) : asin_compute(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type acos_compute(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return abs(x) > Type{1} ? limits<Type>::quiet_NaN()
|
||||||
|
: limits<Type>::min() > abs(x - Type{1}) ? Type{0}
|
||||||
|
: limits<Type>::min() > abs(x) ? half_pi<Type>
|
||||||
|
: atan(sqrt(Type{1} - x * x) / x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type acos(const Type x) noexcept
|
||||||
|
{
|
||||||
|
return is_nan(x) ? limits<Type>::quiet_NaN() : x > Type{0} ? acos_compute(x) : pi<Type> - acos_compute(-x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type hypot(const Type x, const Type y) noexcept
|
||||||
|
{
|
||||||
|
return any_nan(x, y) ? limits<Type>::quiet_NaN()
|
||||||
|
: any_inf(x, y) ? limits<Type>::infinity()
|
||||||
|
: limits<Type>::min() > abs(x) ? abs(y)
|
||||||
|
: limits<Type>::min() > abs(y) ? abs(x)
|
||||||
|
: abs(x) * sqrt(Type{1} + (y / x) * (y / x));
|
||||||
|
}
|
||||||
|
} // namespace math_detail
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type sin(const Type& value) noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return math_detail::sin(value);
|
||||||
|
}
|
||||||
|
return std::sin(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type cos(const Type& value) noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return math_detail::cos(value);
|
||||||
|
}
|
||||||
|
return std::cos(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type tan(const Type& value) noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return math_detail::tan(value);
|
||||||
|
}
|
||||||
|
return std::tan(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type atan(const Type& value) noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return math_detail::atan(value);
|
||||||
|
}
|
||||||
|
return std::atan(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type atan2(const Type& y, const Type& x) noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return math_detail::atan2(y, x);
|
||||||
|
}
|
||||||
|
return std::atan2(y, x);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type asin(const Type& value) noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return math_detail::asin(value);
|
||||||
|
}
|
||||||
|
return std::asin(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type acos(const Type& value) noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return math_detail::acos(value);
|
||||||
|
}
|
||||||
|
return std::acos(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type sqrt(const Type& value) noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return math_detail::sqrt(value);
|
||||||
|
}
|
||||||
|
return std::sqrt(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type hypot(const Type& x, const Type& y) noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return math_detail::hypot(x, y);
|
||||||
|
}
|
||||||
|
return std::hypot(x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type hypot(const Type& x, const Type& y, const Type& z) noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return math_detail::sqrt(x * x + y * y + z * z);
|
||||||
|
}
|
||||||
|
return std::hypot(x, y, z);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type abs(const Type& value) noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return math_detail::abs(value);
|
||||||
|
}
|
||||||
|
return std::abs(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class Type>
|
||||||
|
requires std::is_floating_point_v<Type>
|
||||||
|
[[nodiscard]]
|
||||||
|
constexpr Type fmod(const Type& dividend, const Type& divisor) noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return math_detail::fmod(dividend, divisor);
|
||||||
|
}
|
||||||
|
return std::fmod(dividend, divisor);
|
||||||
|
}
|
||||||
|
} // namespace omath::internal
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
// Created by vlad on 9/29/2024.
|
// Created by vlad on 9/29/2024.
|
||||||
//
|
//
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include "omath/internal/constexpr_math.hpp"
|
||||||
#include "vector3.hpp"
|
#include "vector3.hpp"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <array>
|
#include <array>
|
||||||
@@ -10,6 +11,7 @@
|
|||||||
#include <numeric>
|
#include <numeric>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
#include <type_traits>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
#ifdef OMATH_USE_AVX2
|
#ifdef OMATH_USE_AVX2
|
||||||
@@ -41,12 +43,12 @@ namespace omath
|
|||||||
enum class NDCDepthRange : uint8_t
|
enum class NDCDepthRange : uint8_t
|
||||||
{
|
{
|
||||||
NEGATIVE_ONE_TO_ONE = 0, // OpenGL: [-1.0, 1.0]
|
NEGATIVE_ONE_TO_ONE = 0, // OpenGL: [-1.0, 1.0]
|
||||||
ZERO_TO_ONE // DirectX / Vulkan: [0.0, 1.0]
|
ZERO_TO_ONE // DirectX / Vulkan: [0.0, 1.0]
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename M1, typename M2> concept MatTemplateEqual
|
template<typename M1, typename M2> concept MatTemplateEqual =
|
||||||
= (M1::rows == M2::rows) && (M1::columns == M2::columns)
|
(M1::rows == M2::rows) && (M1::columns == M2::columns)
|
||||||
&& std::is_same_v<typename M1::value_type, typename M2::value_type> && (M1::store_type == M2::store_type);
|
&& std::is_same_v<typename M1::value_type, typename M2::value_type> && (M1::store_type == M2::store_type);
|
||||||
|
|
||||||
template<size_t Rows = 0, size_t Columns = 0, class Type = float, MatStoreType StoreType = MatStoreType::ROW_MAJOR>
|
template<size_t Rows = 0, size_t Columns = 0, class Type = float, MatStoreType StoreType = MatStoreType::ROW_MAJOR>
|
||||||
requires std::is_arithmetic_v<Type>
|
requires std::is_arithmetic_v<Type>
|
||||||
@@ -149,7 +151,8 @@ namespace omath
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use element reference")]] constexpr Type& at(const size_t row_index, const size_t column_index)
|
[[nodiscard("You must use element reference")]] constexpr Type& at(const size_t row_index,
|
||||||
|
const size_t column_index)
|
||||||
{
|
{
|
||||||
return const_cast<Type&>(std::as_const(*this).at(row_index, column_index));
|
return const_cast<Type&>(std::as_const(*this).at(row_index, column_index));
|
||||||
}
|
}
|
||||||
@@ -176,7 +179,21 @@ namespace omath
|
|||||||
operator*(const Mat<Columns, OtherColumns, Type, StoreType>& other) const
|
operator*(const Mat<Columns, OtherColumns, Type, StoreType>& other) const
|
||||||
{
|
{
|
||||||
#ifdef OMATH_USE_AVX2
|
#ifdef OMATH_USE_AVX2
|
||||||
if constexpr (StoreType == MatStoreType::ROW_MAJOR)
|
if (std::is_constant_evaluated())
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
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);
|
||||||
@@ -192,7 +209,11 @@ namespace omath
|
|||||||
|
|
||||||
constexpr Mat& operator*=(const Type& f) noexcept
|
constexpr Mat& operator*=(const Type& f) noexcept
|
||||||
{
|
{
|
||||||
std::ranges::for_each(m_data, [&f](auto& val) { val *= f; });
|
std::ranges::for_each(m_data,
|
||||||
|
[&f](auto& val)
|
||||||
|
{
|
||||||
|
val *= f;
|
||||||
|
});
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -212,7 +233,11 @@ namespace omath
|
|||||||
|
|
||||||
constexpr Mat& operator/=(const Type& value) noexcept
|
constexpr Mat& operator/=(const Type& value) noexcept
|
||||||
{
|
{
|
||||||
std::ranges::for_each(m_data, [&value](auto& val) { val /= value; });
|
std::ranges::for_each(m_data,
|
||||||
|
[&value](auto& val)
|
||||||
|
{
|
||||||
|
val /= value;
|
||||||
|
});
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -388,7 +413,7 @@ namespace omath
|
|||||||
{
|
{
|
||||||
const auto det = determinant();
|
const auto det = determinant();
|
||||||
|
|
||||||
if (std::abs(det) < std::numeric_limits<Type>::epsilon())
|
if (internal::abs(det) < std::numeric_limits<Type>::epsilon())
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
|
|
||||||
const auto transposed_mat = transposed();
|
const auto transposed_mat = transposed();
|
||||||
@@ -411,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -426,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
|
||||||
@@ -448,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
|
||||||
@@ -518,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
|
||||||
@@ -578,13 +693,13 @@ namespace omath
|
|||||||
};
|
};
|
||||||
|
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR> [[nodiscard("You must use row matrix")]]
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR> [[nodiscard("You must use row matrix")]]
|
||||||
constexpr static Mat<1, 4, Type, St> mat_row_from_vector(const Vector3<Type>& vector) noexcept
|
constexpr Mat<1, 4, Type, St> mat_row_from_vector(const Vector3<Type>& vector) noexcept
|
||||||
{
|
{
|
||||||
return {{vector.x, vector.y, vector.z, 1}};
|
return {{vector.x, vector.y, vector.z, 1}};
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR> [[nodiscard("You must use column matrix")]]
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR> [[nodiscard("You must use column matrix")]]
|
||||||
constexpr static Mat<4, 1, Type, St> mat_column_from_vector(const Vector3<Type>& vector) noexcept
|
constexpr Mat<4, 1, Type, St> mat_column_from_vector(const Vector3<Type>& vector) noexcept
|
||||||
{
|
{
|
||||||
return {{vector.x}, {vector.y}, {vector.z}, {1}};
|
return {{vector.x}, {vector.y}, {vector.z}, {1}};
|
||||||
}
|
}
|
||||||
@@ -593,8 +708,7 @@ namespace omath
|
|||||||
[[nodiscard("You must use translation matrix")]]
|
[[nodiscard("You must use translation matrix")]]
|
||||||
constexpr Mat<4, 4, Type, St> mat_translation(const Vector3<Type>& diff) noexcept
|
constexpr Mat<4, 4, Type, St> mat_translation(const Vector3<Type>& diff) noexcept
|
||||||
{
|
{
|
||||||
return
|
return {
|
||||||
{
|
|
||||||
{1, 0, 0, diff.x},
|
{1, 0, 0, diff.x},
|
||||||
{0, 1, 0, diff.y},
|
{0, 1, 0, diff.y},
|
||||||
{0, 0, 1, diff.z},
|
{0, 0, 1, diff.z},
|
||||||
@@ -622,10 +736,11 @@ namespace omath
|
|||||||
|
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR>
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR>
|
||||||
[[nodiscard("You must use extracted scale")]]
|
[[nodiscard("You must use extracted scale")]]
|
||||||
Vector3<Type> mat_extract_scale(const Mat<4, 4, Type, St>& mat) noexcept
|
constexpr Vector3<Type> mat_extract_scale(const Mat<4, 4, Type, St>& mat) noexcept
|
||||||
{
|
{
|
||||||
auto column_length = [](const Type x, const Type y, const Type z) {
|
auto column_length = [](const Type x, const Type y, const Type z)
|
||||||
return static_cast<Type>(std::sqrt(x * x + y * y + z * z));
|
{
|
||||||
|
return static_cast<Type>(internal::sqrt(x * x + y * y + z * z));
|
||||||
};
|
};
|
||||||
|
|
||||||
const auto scale_x = column_length(mat.at(0, 0), mat.at(1, 0), mat.at(2, 0));
|
const auto scale_x = column_length(mat.at(0, 0), mat.at(1, 0), mat.at(2, 0));
|
||||||
@@ -635,16 +750,16 @@ namespace omath
|
|||||||
constexpr auto epsilon = std::numeric_limits<Type>::epsilon();
|
constexpr auto epsilon = std::numeric_limits<Type>::epsilon();
|
||||||
|
|
||||||
return {
|
return {
|
||||||
std::abs(scale_x) < epsilon ? Type{1} : scale_x,
|
internal::abs(scale_x) < epsilon ? Type{1} : scale_x,
|
||||||
std::abs(scale_y) < epsilon ? Type{1} : scale_y,
|
internal::abs(scale_y) < epsilon ? Type{1} : scale_y,
|
||||||
std::abs(scale_z) < epsilon ? Type{1} : scale_z,
|
internal::abs(scale_z) < epsilon ? Type{1} : scale_z,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR>
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR>
|
||||||
requires std::is_floating_point_v<Type>
|
requires std::is_floating_point_v<Type>
|
||||||
[[nodiscard("You must use extracted rotation")]]
|
[[nodiscard("You must use extracted rotation")]]
|
||||||
Vector3<Type> mat_extract_rotation_zyx(const Mat<4, 4, Type, St>& mat) noexcept
|
constexpr Vector3<Type> mat_extract_rotation_zyx(const Mat<4, 4, Type, St>& mat) noexcept
|
||||||
{
|
{
|
||||||
const auto scale = mat_extract_scale(mat);
|
const auto scale = mat_extract_scale(mat);
|
||||||
const auto m00 = mat.at(0, 0) / scale.x;
|
const auto m00 = mat.at(0, 0) / scale.x;
|
||||||
@@ -654,105 +769,91 @@ namespace omath
|
|||||||
const auto m22 = mat.at(2, 2) / scale.z;
|
const auto m22 = mat.at(2, 2) / scale.z;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
angles::radians_to_degrees(std::atan2(m21, m22)),
|
angles::radians_to_degrees(internal::atan2(m21, m22)),
|
||||||
angles::radians_to_degrees(std::asin(std::clamp(-m20, Type{-1}, Type{1}))),
|
angles::radians_to_degrees(internal::asin(std::clamp(-m20, Type{-1}, Type{1}))),
|
||||||
angles::radians_to_degrees(std::atan2(m10, m00)),
|
angles::radians_to_degrees(internal::atan2(m10, m00)),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR, class Angle>
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR, class Angle>
|
||||||
[[nodiscard("You must use rotation matrix")]]
|
[[nodiscard("You must use rotation matrix")]]
|
||||||
Mat<4, 4, Type, St> mat_rotation_axis_x(const Angle& angle) noexcept
|
constexpr Mat<4, 4, Type, St> mat_rotation_axis_x(const Angle& angle) noexcept
|
||||||
{
|
{
|
||||||
return
|
return {{1, 0, 0, 0}, {0, angle.cos(), -angle.sin(), 0}, {0, angle.sin(), angle.cos(), 0}, {0, 0, 0, 1}};
|
||||||
{
|
|
||||||
{1, 0, 0, 0},
|
|
||||||
{0, angle.cos(), -angle.sin(), 0},
|
|
||||||
{0, angle.sin(), angle.cos(), 0},
|
|
||||||
{0, 0, 0, 1}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR, class Angle>
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR, class Angle>
|
||||||
[[nodiscard("You must use rotation matrix")]]
|
[[nodiscard("You must use rotation matrix")]]
|
||||||
Mat<4, 4, Type, St> mat_rotation_axis_y(const Angle& angle) noexcept
|
constexpr Mat<4, 4, Type, St> mat_rotation_axis_y(const Angle& angle) noexcept
|
||||||
{
|
{
|
||||||
return
|
return {{angle.cos(), 0, angle.sin(), 0}, {0, 1, 0, 0}, {-angle.sin(), 0, angle.cos(), 0}, {0, 0, 0, 1}};
|
||||||
{
|
|
||||||
{angle.cos(), 0, angle.sin(), 0},
|
|
||||||
{0 , 1, 0, 0},
|
|
||||||
{-angle.sin(), 0, angle.cos(), 0},
|
|
||||||
{0 , 0, 0, 1}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR, class Angle>
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR, class Angle>
|
||||||
[[nodiscard("You must use rotation matrix")]]
|
[[nodiscard("You must use rotation matrix")]]
|
||||||
Mat<4, 4, Type, St> mat_rotation_axis_z(const Angle& angle) noexcept
|
constexpr Mat<4, 4, Type, St> mat_rotation_axis_z(const Angle& angle) noexcept
|
||||||
{
|
{
|
||||||
return
|
return {
|
||||||
{
|
{angle.cos(), -angle.sin(), 0, 0},
|
||||||
{angle.cos(), -angle.sin(), 0, 0},
|
{angle.sin(), angle.cos(), 0, 0},
|
||||||
{angle.sin(), angle.cos(), 0, 0},
|
{0, 0, 1, 0},
|
||||||
{ 0, 0, 1, 0},
|
{0, 0, 0, 1},
|
||||||
{ 0, 0, 0, 1},
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR>
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR>
|
||||||
[[nodiscard("You must use camera view matrix")]]
|
[[nodiscard("You must use camera view matrix")]]
|
||||||
static Mat<4, 4, Type, St> mat_camera_view(const Vector3<Type>& forward, const Vector3<Type>& right,
|
constexpr Mat<4, 4, Type, St> mat_camera_view(const Vector3<Type>& forward, const Vector3<Type>& right,
|
||||||
const Vector3<Type>& up, const Vector3<Type>& camera_origin) noexcept
|
const Vector3<Type>& up, const Vector3<Type>& camera_origin) noexcept
|
||||||
{
|
{
|
||||||
return Mat<4, 4, Type, St>
|
return Mat<4, 4, Type, St>{
|
||||||
{
|
{right.x, right.y, right.z, 0},
|
||||||
{right.x, right.y, right.z, 0},
|
{up.x, up.y, up.z, 0},
|
||||||
{up.x, up.y, up.z, 0},
|
{forward.x, forward.y, forward.z, 0},
|
||||||
{forward.x, forward.y, forward.z, 0},
|
{0, 0, 0, 1},
|
||||||
{0, 0, 0, 1},
|
}
|
||||||
} * mat_translation<Type, St>(-camera_origin);
|
* mat_translation<Type, St>(-camera_origin);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR,
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR,
|
||||||
NDCDepthRange DepthRange = NDCDepthRange::NEGATIVE_ONE_TO_ONE>
|
NDCDepthRange DepthRange = NDCDepthRange::NEGATIVE_ONE_TO_ONE>
|
||||||
[[nodiscard("You must use perspective matrix")]]
|
[[nodiscard("You must use perspective matrix")]] constexpr Mat<4, 4, Type, St>
|
||||||
Mat<4, 4, Type, St> mat_perspective_left_handed_vertical_fov(const Type field_of_view, const Type aspect_ratio,
|
mat_perspective_left_handed_vertical_fov(const Type field_of_view, const Type aspect_ratio, const Type near,
|
||||||
const Type near, const Type far) noexcept
|
const Type far) noexcept
|
||||||
{
|
{
|
||||||
const auto fov_half_tan = std::tan(angles::degrees_to_radians(field_of_view) / Type{2});
|
const auto fov_half_tan = internal::tan(angles::degrees_to_radians(field_of_view) / Type{2});
|
||||||
|
|
||||||
if constexpr (DepthRange == NDCDepthRange::ZERO_TO_ONE)
|
if constexpr (DepthRange == NDCDepthRange::ZERO_TO_ONE)
|
||||||
return {{Type{1} / (aspect_ratio * fov_half_tan), Type{0}, Type{0}, Type{0}},
|
return {{Type{1} / (aspect_ratio * fov_half_tan), Type{0}, Type{0}, Type{0}},
|
||||||
{Type{0}, Type{1} / fov_half_tan, Type{0}, Type{0}},
|
{Type{0}, Type{1} / fov_half_tan, Type{0}, Type{0}},
|
||||||
{Type{0}, Type{0}, far / (far - near), -(near * far) / (far - near)},
|
{Type{0}, Type{0}, far / (far - near), -(near * far) / (far - near)},
|
||||||
{Type{0}, Type{0}, Type{1}, Type{0}}};
|
{Type{0}, Type{0}, Type{1}, Type{0}}};
|
||||||
else if constexpr (DepthRange == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
else if constexpr (DepthRange == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
return {{Type{1} / (aspect_ratio * fov_half_tan), Type{0}, Type{0}, Type{0}},
|
return {{Type{1} / (aspect_ratio * fov_half_tan), Type{0}, Type{0}, Type{0}},
|
||||||
{Type{0}, Type{1} / fov_half_tan, Type{0}, Type{0}},
|
{Type{0}, Type{1} / fov_half_tan, Type{0}, Type{0}},
|
||||||
{Type{0}, Type{0}, (far + near) / (far - near), -(Type{2} * near * far) / (far - near)},
|
{Type{0}, Type{0}, (far + near) / (far - near), -(Type{2} * near * far) / (far - near)},
|
||||||
{Type{0}, Type{0}, Type{1}, Type{0}}};
|
{Type{0}, Type{0}, Type{1}, Type{0}}};
|
||||||
else
|
else
|
||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR,
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR,
|
||||||
NDCDepthRange DepthRange = NDCDepthRange::NEGATIVE_ONE_TO_ONE>
|
NDCDepthRange DepthRange = NDCDepthRange::NEGATIVE_ONE_TO_ONE>
|
||||||
[[nodiscard("You must use perspective matrix")]]
|
[[nodiscard("You must use perspective matrix")]] constexpr Mat<4, 4, Type, St>
|
||||||
Mat<4, 4, Type, St> mat_perspective_right_handed_vertical_fov(const Type field_of_view, const Type aspect_ratio,
|
mat_perspective_right_handed_vertical_fov(const Type field_of_view, const Type aspect_ratio, const Type near,
|
||||||
const Type near, const Type far) noexcept
|
const Type far) noexcept
|
||||||
{
|
{
|
||||||
const auto fov_half_tan = std::tan(angles::degrees_to_radians(field_of_view) / Type{2});
|
const auto fov_half_tan = internal::tan(angles::degrees_to_radians(field_of_view) / Type{2});
|
||||||
|
|
||||||
if constexpr (DepthRange == NDCDepthRange::ZERO_TO_ONE)
|
if constexpr (DepthRange == NDCDepthRange::ZERO_TO_ONE)
|
||||||
return {{Type{1} / (aspect_ratio * fov_half_tan), Type{0}, Type{0}, Type{0}},
|
return {{Type{1} / (aspect_ratio * fov_half_tan), Type{0}, Type{0}, Type{0}},
|
||||||
{Type{0}, Type{1} / fov_half_tan, Type{0}, Type{0}},
|
{Type{0}, Type{1} / fov_half_tan, Type{0}, Type{0}},
|
||||||
{Type{0}, Type{0}, -far / (far - near), -(near * far) / (far - near)},
|
{Type{0}, Type{0}, -far / (far - near), -(near * far) / (far - near)},
|
||||||
{Type{0}, Type{0}, -Type{1}, Type{0}}};
|
{Type{0}, Type{0}, -Type{1}, Type{0}}};
|
||||||
else if constexpr (DepthRange == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
else if constexpr (DepthRange == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
return {{Type{1} / (aspect_ratio * fov_half_tan), Type{0}, Type{0}, Type{0}},
|
return {{Type{1} / (aspect_ratio * fov_half_tan), Type{0}, Type{0}, Type{0}},
|
||||||
{Type{0}, Type{1} / fov_half_tan, Type{0}, Type{0}},
|
{Type{0}, Type{1} / fov_half_tan, Type{0}, Type{0}},
|
||||||
{Type{0}, Type{0}, -(far + near) / (far - near), -(Type{2} * near * far) / (far - near)},
|
{Type{0}, Type{0}, -(far + near) / (far - near), -(Type{2} * near * far) / (far - near)},
|
||||||
{Type{0}, Type{0}, -Type{1}, Type{0}}};
|
{Type{0}, Type{0}, -Type{1}, Type{0}}};
|
||||||
else
|
else
|
||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
@@ -762,105 +863,93 @@ namespace omath
|
|||||||
// X and Y scales derived as: X = 1 / tan(hfov/2), Y = aspect / tan(hfov/2).
|
// X and Y scales derived as: X = 1 / tan(hfov/2), Y = aspect / tan(hfov/2).
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR,
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR,
|
||||||
NDCDepthRange DepthRange = NDCDepthRange::NEGATIVE_ONE_TO_ONE>
|
NDCDepthRange DepthRange = NDCDepthRange::NEGATIVE_ONE_TO_ONE>
|
||||||
[[nodiscard("You must use perspective matrix")]]
|
[[nodiscard("You must use perspective matrix")]] constexpr Mat<4, 4, Type, St>
|
||||||
Mat<4, 4, Type, St> mat_perspective_left_handed_horizontal_fov(const Type horizontal_fov,
|
mat_perspective_left_handed_horizontal_fov(const Type horizontal_fov, const Type aspect_ratio, const Type near,
|
||||||
const Type aspect_ratio, const Type near,
|
const Type far) noexcept
|
||||||
const Type far) noexcept
|
|
||||||
{
|
{
|
||||||
const auto inv_tan_half_hfov = Type{1} / std::tan(angles::degrees_to_radians(horizontal_fov) / Type{2});
|
const auto inv_tan_half_hfov = Type{1} / internal::tan(angles::degrees_to_radians(horizontal_fov) / Type{2});
|
||||||
const auto x_axis = inv_tan_half_hfov;
|
const auto x_axis = inv_tan_half_hfov;
|
||||||
const auto y_axis = inv_tan_half_hfov * aspect_ratio;
|
const auto y_axis = inv_tan_half_hfov * aspect_ratio;
|
||||||
|
|
||||||
if constexpr (DepthRange == NDCDepthRange::ZERO_TO_ONE)
|
if constexpr (DepthRange == NDCDepthRange::ZERO_TO_ONE)
|
||||||
return {{x_axis, Type{0}, Type{0}, Type{0}},
|
return {{x_axis, Type{0}, Type{0}, Type{0}},
|
||||||
{Type{0}, y_axis, Type{0}, Type{0}},
|
{Type{0}, y_axis, Type{0}, Type{0}},
|
||||||
{Type{0}, Type{0}, far / (far - near), -(near * far) / (far - near)},
|
{Type{0}, Type{0}, far / (far - near), -(near * far) / (far - near)},
|
||||||
{Type{0}, Type{0}, Type{1}, Type{0}}};
|
{Type{0}, Type{0}, Type{1}, Type{0}}};
|
||||||
else if constexpr (DepthRange == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
else if constexpr (DepthRange == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
return {{x_axis, Type{0}, Type{0}, Type{0}},
|
return {{x_axis, Type{0}, Type{0}, Type{0}},
|
||||||
{Type{0}, y_axis, Type{0}, Type{0}},
|
{Type{0}, y_axis, Type{0}, Type{0}},
|
||||||
{Type{0}, Type{0}, (far + near) / (far - near), -(Type{2} * near * far) / (far - near)},
|
{Type{0}, Type{0}, (far + near) / (far - near), -(Type{2} * near * far) / (far - near)},
|
||||||
{Type{0}, Type{0}, Type{1}, Type{0}}};
|
{Type{0}, Type{0}, Type{1}, Type{0}}};
|
||||||
else
|
else
|
||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR,
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR,
|
||||||
NDCDepthRange DepthRange = NDCDepthRange::NEGATIVE_ONE_TO_ONE>
|
NDCDepthRange DepthRange = NDCDepthRange::NEGATIVE_ONE_TO_ONE>
|
||||||
[[nodiscard("You must use perspective matrix")]]
|
[[nodiscard("You must use perspective matrix")]] constexpr Mat<4, 4, Type, St>
|
||||||
Mat<4, 4, Type, St> mat_perspective_right_handed_horizontal_fov(const Type horizontal_fov,
|
mat_perspective_right_handed_horizontal_fov(const Type horizontal_fov, const Type aspect_ratio, const Type near,
|
||||||
const Type aspect_ratio, const Type near,
|
const Type far) noexcept
|
||||||
const Type far) noexcept
|
|
||||||
{
|
{
|
||||||
const auto inv_tan_half_hfov = Type{1} / std::tan(angles::degrees_to_radians(horizontal_fov) / Type{2});
|
const auto inv_tan_half_hfov = Type{1} / internal::tan(angles::degrees_to_radians(horizontal_fov) / Type{2});
|
||||||
|
|
||||||
const auto x_axis = inv_tan_half_hfov;
|
const auto x_axis = inv_tan_half_hfov;
|
||||||
const auto y_axis = inv_tan_half_hfov * aspect_ratio;
|
const auto y_axis = inv_tan_half_hfov * aspect_ratio;
|
||||||
|
|
||||||
if constexpr (DepthRange == NDCDepthRange::ZERO_TO_ONE)
|
if constexpr (DepthRange == NDCDepthRange::ZERO_TO_ONE)
|
||||||
return {{x_axis, Type{0}, Type{0}, Type{0}},
|
return {{x_axis, Type{0}, Type{0}, Type{0}},
|
||||||
{Type{0}, y_axis, Type{0}, Type{0}},
|
{Type{0}, y_axis, Type{0}, Type{0}},
|
||||||
{Type{0}, Type{0}, -far / (far - near), -(near * far) / (far - near)},
|
{Type{0}, Type{0}, -far / (far - near), -(near * far) / (far - near)},
|
||||||
{Type{0}, Type{0}, -Type{1}, Type{0}}};
|
{Type{0}, Type{0}, -Type{1}, Type{0}}};
|
||||||
else if constexpr (DepthRange == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
else if constexpr (DepthRange == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
return {{x_axis, Type{0}, Type{0}, Type{0}},
|
return {{x_axis, Type{0}, Type{0}, Type{0}},
|
||||||
{Type{0}, y_axis, Type{0}, Type{0}},
|
{Type{0}, y_axis, Type{0}, Type{0}},
|
||||||
{Type{0}, Type{0}, -(far + near) / (far - near), -(Type{2} * near * far) / (far - near)},
|
{Type{0}, Type{0}, -(far + near) / (far - near), -(Type{2} * near * far) / (far - near)},
|
||||||
{Type{0}, Type{0}, -Type{1}, Type{0}}};
|
{Type{0}, Type{0}, -Type{1}, Type{0}}};
|
||||||
else
|
else
|
||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR,
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR,
|
||||||
NDCDepthRange DepthRange = NDCDepthRange::NEGATIVE_ONE_TO_ONE>
|
NDCDepthRange DepthRange = NDCDepthRange::NEGATIVE_ONE_TO_ONE>
|
||||||
[[nodiscard("You must use ortho matrix")]]
|
[[nodiscard("You must use ortho matrix")]] constexpr Mat<4, 4, Type, St>
|
||||||
Mat<4, 4, Type, St> mat_ortho_left_handed(const Type left, const Type right, const Type bottom, const Type top,
|
mat_ortho_left_handed(const Type left, const Type right, const Type bottom, const Type top, const Type near,
|
||||||
const Type near, const Type far) noexcept
|
const Type far) noexcept
|
||||||
{
|
{
|
||||||
if constexpr (DepthRange == NDCDepthRange::ZERO_TO_ONE)
|
if constexpr (DepthRange == NDCDepthRange::ZERO_TO_ONE)
|
||||||
return
|
return {{static_cast<Type>(2) / (right - left), 0.f, 0.f, -(right + left) / (right - left)},
|
||||||
{
|
{0.f, static_cast<Type>(2) / (top - bottom), 0.f, -(top + bottom) / (top - bottom)},
|
||||||
{ static_cast<Type>(2) / (right - left), 0.f, 0.f, -(right + left) / (right - left)},
|
{0.f, 0.f, static_cast<Type>(1) / (far - near), -near / (far - near)},
|
||||||
{ 0.f, static_cast<Type>(2) / (top - bottom), 0.f, -(top + bottom) / (top - bottom)},
|
{0.f, 0.f, 0.f, 1.f}};
|
||||||
{ 0.f, 0.f, static_cast<Type>(1) / (far - near), -near / (far - near) },
|
|
||||||
{ 0.f, 0.f, 0.f, 1.f }
|
|
||||||
};
|
|
||||||
else if constexpr (DepthRange == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
else if constexpr (DepthRange == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
return
|
return {{static_cast<Type>(2) / (right - left), 0.f, 0.f, -(right + left) / (right - left)},
|
||||||
{
|
{0.f, static_cast<Type>(2) / (top - bottom), 0.f, -(top + bottom) / (top - bottom)},
|
||||||
{ static_cast<Type>(2) / (right - left), 0.f, 0.f, -(right + left) / (right - left)},
|
{0.f, 0.f, static_cast<Type>(2) / (far - near), -(far + near) / (far - near)},
|
||||||
{ 0.f, static_cast<Type>(2) / (top - bottom), 0.f, -(top + bottom) / (top - bottom)},
|
{0.f, 0.f, 0.f, 1.f}};
|
||||||
{ 0.f, 0.f, static_cast<Type>(2) / (far - near), -(far + near) / (far - near) },
|
|
||||||
{ 0.f, 0.f, 0.f, 1.f }
|
|
||||||
};
|
|
||||||
else
|
else
|
||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR,
|
template<class Type = float, MatStoreType St = MatStoreType::ROW_MAJOR,
|
||||||
NDCDepthRange DepthRange = NDCDepthRange::NEGATIVE_ONE_TO_ONE>
|
NDCDepthRange DepthRange = NDCDepthRange::NEGATIVE_ONE_TO_ONE>
|
||||||
[[nodiscard("You must use ortho matrix")]]
|
[[nodiscard("You must use ortho matrix")]] constexpr Mat<4, 4, Type, St>
|
||||||
Mat<4, 4, Type, St> mat_ortho_right_handed(const Type left, const Type right, const Type bottom, const Type top,
|
mat_ortho_right_handed(const Type left, const Type right, const Type bottom, const Type top, const Type near,
|
||||||
const Type near, const Type far) noexcept
|
const Type far) noexcept
|
||||||
{
|
{
|
||||||
if constexpr (DepthRange == NDCDepthRange::ZERO_TO_ONE)
|
if constexpr (DepthRange == NDCDepthRange::ZERO_TO_ONE)
|
||||||
return
|
return {{static_cast<Type>(2) / (right - left), 0.f, 0.f, -(right + left) / (right - left)},
|
||||||
{
|
{0.f, static_cast<Type>(2) / (top - bottom), 0.f, -(top + bottom) / (top - bottom)},
|
||||||
{ static_cast<Type>(2) / (right - left), 0.f, 0.f, -(right + left) / (right - left)},
|
{0.f, 0.f, -static_cast<Type>(1) / (far - near), -near / (far - near)},
|
||||||
{ 0.f, static_cast<Type>(2) / (top - bottom), 0.f, -(top + bottom) / (top - bottom)},
|
{0.f, 0.f, 0.f, 1.f}};
|
||||||
{ 0.f, 0.f, -static_cast<Type>(1) / (far - near), -near / (far - near) },
|
|
||||||
{ 0.f, 0.f, 0.f, 1.f }
|
|
||||||
};
|
|
||||||
else if constexpr (DepthRange == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
else if constexpr (DepthRange == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
||||||
return
|
return {{static_cast<Type>(2) / (right - left), 0.f, 0.f, -(right + left) / (right - left)},
|
||||||
{
|
{0.f, static_cast<Type>(2) / (top - bottom), 0.f, -(top + bottom) / (top - bottom)},
|
||||||
{ static_cast<Type>(2) / (right - left), 0.f, 0.f, -(right + left) / (right - left)},
|
{0.f, 0.f, -static_cast<Type>(2) / (far - near), -(far + near) / (far - near)},
|
||||||
{ 0.f, static_cast<Type>(2) / (top - bottom), 0.f, -(top + bottom) / (top - bottom)},
|
{0.f, 0.f, 0.f, 1.f}};
|
||||||
{ 0.f, 0.f, -static_cast<Type>(2) / (far - near), -(far + near) / (far - near) },
|
|
||||||
{ 0.f, 0.f, 0.f, 1.f }
|
|
||||||
};
|
|
||||||
else
|
else
|
||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
template<class T = float, MatStoreType St = MatStoreType::COLUMN_MAJOR>
|
template<class T = float, MatStoreType St = MatStoreType::COLUMN_MAJOR>
|
||||||
Mat<4, 4, T, St> mat_look_at_left_handed(const Vector3<T>& eye, const Vector3<T>& center, const Vector3<T>& up)
|
constexpr Mat<4, 4, T, St> mat_look_at_left_handed(const Vector3<T>& eye, const Vector3<T>& center,
|
||||||
|
const Vector3<T>& up)
|
||||||
{
|
{
|
||||||
const Vector3<T> f = (center - eye).normalized();
|
const Vector3<T> f = (center - eye).normalized();
|
||||||
const Vector3<T> s = f.cross(up).normalized();
|
const Vector3<T> s = f.cross(up).normalized();
|
||||||
@@ -869,7 +958,8 @@ namespace omath
|
|||||||
}
|
}
|
||||||
|
|
||||||
template<class T = float, MatStoreType St = MatStoreType::COLUMN_MAJOR>
|
template<class T = float, MatStoreType St = MatStoreType::COLUMN_MAJOR>
|
||||||
Mat<4, 4, T, St>mat_look_at_right_handed(const Vector3<T>& eye, const Vector3<T>& center, const Vector3<T>& up)
|
constexpr Mat<4, 4, T, St> mat_look_at_right_handed(const Vector3<T>& eye, const Vector3<T>& center,
|
||||||
|
const Vector3<T>& up)
|
||||||
{
|
{
|
||||||
const Vector3<T> f = (center - eye).normalized();
|
const Vector3<T> f = (center - eye).normalized();
|
||||||
const Vector3<T> s = f.cross(up).normalized();
|
const Vector3<T> s = f.cross(up).normalized();
|
||||||
@@ -880,7 +970,7 @@ namespace omath
|
|||||||
} // namespace omath
|
} // namespace omath
|
||||||
|
|
||||||
template<size_t Rows, size_t Columns, class Type, omath::MatStoreType StoreType>
|
template<size_t Rows, size_t Columns, class Type, omath::MatStoreType StoreType>
|
||||||
struct std::formatter<omath::Mat<Rows, Columns, Type, StoreType>> // NOLINT(*-dcl58-cpp)
|
struct std::formatter<omath::Mat<Rows, Columns, Type, StoreType>> final // NOLINT(*-dcl58-cpp)
|
||||||
{
|
{
|
||||||
using MatType = omath::Mat<Rows, Columns, Type, StoreType>;
|
using MatType = omath::Mat<Rows, Columns, Type, StoreType>;
|
||||||
[[nodiscard("You must use parse iterator")]]
|
[[nodiscard("You must use parse iterator")]]
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
// Created by Orange on 11/13/2024.
|
// Created by Orange on 11/13/2024.
|
||||||
//
|
//
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include "omath/internal/constexpr_math.hpp"
|
||||||
#include "vector3.hpp"
|
#include "vector3.hpp"
|
||||||
|
|
||||||
namespace omath
|
namespace omath
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@@ -40,13 +40,13 @@ namespace omath
|
|||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
Vector::ContainedType side_a_length() const
|
constexpr Vector::ContainedType side_a_length() const
|
||||||
{
|
{
|
||||||
return m_vertex1.distance_to(m_vertex2);
|
return m_vertex1.distance_to(m_vertex2);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
Vector::ContainedType side_b_length() const
|
constexpr Vector::ContainedType side_b_length() const
|
||||||
{
|
{
|
||||||
return m_vertex3.distance_to(m_vertex2);
|
return m_vertex3.distance_to(m_vertex2);
|
||||||
}
|
}
|
||||||
@@ -69,7 +69,7 @@ namespace omath
|
|||||||
const auto side_b = side_b_length();
|
const auto side_b = side_b_length();
|
||||||
const auto hypot_value = hypot();
|
const auto hypot_value = hypot();
|
||||||
|
|
||||||
return std::abs(side_a * side_a + side_b * side_b - hypot_value * hypot_value) <= 0.0001f;
|
return internal::abs(side_a * side_a + side_b * side_b - hypot_value * hypot_value) <= 0.0001f;
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
constexpr Vector side_b_vector() const
|
constexpr Vector side_b_vector() const
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include "omath/internal/constexpr_math.hpp"
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <format>
|
#include <format>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
@@ -116,9 +117,9 @@ namespace omath
|
|||||||
|
|
||||||
// Basic vector operations
|
// Basic vector operations
|
||||||
[[nodiscard("You must use distance")]]
|
[[nodiscard("You must use distance")]]
|
||||||
Type distance_to(const Vector2& other) const noexcept
|
constexpr Type distance_to(const Vector2& other) const noexcept
|
||||||
{
|
{
|
||||||
return std::sqrt(distance_to_sqr(other));
|
return internal::sqrt(distance_to_sqr(other));
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use squared distance")]]
|
[[nodiscard("You must use squared distance")]]
|
||||||
@@ -136,7 +137,7 @@ namespace omath
|
|||||||
#ifndef _MSC_VER
|
#ifndef _MSC_VER
|
||||||
[[nodiscard("You must use length")]] constexpr Type length() const noexcept
|
[[nodiscard("You must use length")]] constexpr Type length() const noexcept
|
||||||
{
|
{
|
||||||
return std::hypot(this->x, this->y);
|
return internal::hypot(this->x, this->y);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use normalized vector")]] constexpr Vector2 normalized() const noexcept
|
[[nodiscard("You must use normalized vector")]] constexpr Vector2 normalized() const noexcept
|
||||||
@@ -146,13 +147,13 @@ namespace omath
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
[[nodiscard("You must use length")]]
|
[[nodiscard("You must use length")]]
|
||||||
Type length() const noexcept
|
constexpr Type length() const noexcept
|
||||||
{
|
{
|
||||||
return std::hypot(x, y);
|
return internal::hypot(x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use normalized vector")]]
|
[[nodiscard("You must use normalized vector")]]
|
||||||
Vector2 normalized() const noexcept
|
constexpr Vector2 normalized() const noexcept
|
||||||
{
|
{
|
||||||
const Type len = length();
|
const Type len = length();
|
||||||
return len > static_cast<Type>(0) ? *this / len : *this;
|
return len > static_cast<Type>(0) ? *this / len : *this;
|
||||||
@@ -216,24 +217,24 @@ namespace omath
|
|||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use comparison result")]]
|
[[nodiscard("You must use comparison result")]]
|
||||||
bool operator<(const Vector2& other) const noexcept
|
constexpr bool operator<(const Vector2& other) const noexcept
|
||||||
{
|
{
|
||||||
return length() < other.length();
|
return length() < other.length();
|
||||||
}
|
}
|
||||||
[[nodiscard("You must use comparison result")]]
|
[[nodiscard("You must use comparison result")]]
|
||||||
bool operator>(const Vector2& other) const noexcept
|
constexpr bool operator>(const Vector2& other) const noexcept
|
||||||
{
|
{
|
||||||
return length() > other.length();
|
return length() > other.length();
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use comparison result")]]
|
[[nodiscard("You must use comparison result")]]
|
||||||
bool operator<=(const Vector2& other) const noexcept
|
constexpr bool operator<=(const Vector2& other) const noexcept
|
||||||
{
|
{
|
||||||
return length() <= other.length();
|
return length() <= other.length();
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use comparison result")]]
|
[[nodiscard("You must use comparison result")]]
|
||||||
bool operator>=(const Vector2& other) const noexcept
|
constexpr bool operator>=(const Vector2& other) const noexcept
|
||||||
{
|
{
|
||||||
return length() >= other.length();
|
return length() >= other.length();
|
||||||
}
|
}
|
||||||
@@ -264,13 +265,14 @@ namespace omath
|
|||||||
};
|
};
|
||||||
} // namespace omath
|
} // namespace omath
|
||||||
|
|
||||||
template<> struct std::hash<omath::Vector2<float>>
|
template<class Type>
|
||||||
|
struct std::hash<omath::Vector2<Type>> final // NOLINT(*-dcl58-cpp)
|
||||||
{
|
{
|
||||||
[[nodiscard("You must use hash value")]]
|
[[nodiscard("You must use hash value")]]
|
||||||
std::size_t operator()(const omath::Vector2<float>& vec) const noexcept
|
std::size_t operator()(const omath::Vector2<Type>& vec) const noexcept
|
||||||
{
|
{
|
||||||
std::size_t hash = 0;
|
std::size_t hash = 0;
|
||||||
constexpr std::hash<float> hasher;
|
constexpr std::hash<Type> hasher;
|
||||||
|
|
||||||
hash ^= hasher(vec.x) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
|
hash ^= hasher(vec.x) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
|
||||||
hash ^= hasher(vec.y) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
|
hash ^= hasher(vec.y) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
|
||||||
@@ -280,10 +282,10 @@ template<> struct std::hash<omath::Vector2<float>>
|
|||||||
};
|
};
|
||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
struct std::formatter<omath::Vector2<Type>> // NOLINT(*-dcl58-cpp)
|
struct std::formatter<omath::Vector2<Type>> final // NOLINT(*-dcl58-cpp)
|
||||||
{
|
{
|
||||||
[[nodiscard("You must use parse iterator")]]
|
[[nodiscard("You must use parse iterator")]]
|
||||||
static constexpr auto parse(std::format_parse_context& ctx)
|
static constexpr auto parse(std::format_parse_context& ctx) noexcept
|
||||||
{
|
{
|
||||||
return ctx.begin();
|
return ctx.begin();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include "omath/internal/constexpr_math.hpp"
|
||||||
#include "omath/linear_algebra/vector2.hpp"
|
#include "omath/linear_algebra/vector2.hpp"
|
||||||
#include "omath/trigonometry/angle.hpp"
|
#include "omath/trigonometry/angle.hpp"
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
@@ -140,20 +141,20 @@ namespace omath
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifndef _MSC_VER
|
#ifndef _MSC_VER
|
||||||
[[nodiscard("You must use length")]] constexpr Type length() const
|
[[nodiscard("You must use length")]] constexpr Type length() const noexcept
|
||||||
{
|
{
|
||||||
return std::hypot(this->x, this->y, z);
|
return internal::hypot(this->x, this->y, z);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use 2D length")]] constexpr Type length_2d() const
|
[[nodiscard("You must use 2D length")]] constexpr Type length_2d() const noexcept
|
||||||
{
|
{
|
||||||
return Vector2<Type>::length();
|
return Vector2<Type>::length();
|
||||||
}
|
}
|
||||||
[[nodiscard("You must use distance")]] Type distance_to(const Vector3& other) const
|
[[nodiscard("You must use distance")]] constexpr Type distance_to(const Vector3& other) const noexcept
|
||||||
{
|
{
|
||||||
return (*this - other).length();
|
return (*this - other).length();
|
||||||
}
|
}
|
||||||
[[nodiscard("You must use normalized vector")]] constexpr Vector3 normalized() const
|
[[nodiscard("You must use normalized vector")]] constexpr Vector3 normalized() const noexcept
|
||||||
{
|
{
|
||||||
const Type length_value = this->length();
|
const Type length_value = this->length();
|
||||||
|
|
||||||
@@ -161,13 +162,13 @@ namespace omath
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
[[nodiscard("You must use length")]]
|
[[nodiscard("You must use length")]]
|
||||||
Type length() const noexcept
|
constexpr Type length() const noexcept
|
||||||
{
|
{
|
||||||
return std::hypot(this->x, this->y, z);
|
return internal::hypot(this->x, this->y, this->z);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use normalized vector")]]
|
[[nodiscard("You must use normalized vector")]]
|
||||||
Vector3 normalized() const noexcept
|
constexpr Vector3 normalized() const noexcept
|
||||||
{
|
{
|
||||||
const Type len = this->length();
|
const Type len = this->length();
|
||||||
|
|
||||||
@@ -175,13 +176,13 @@ namespace omath
|
|||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use 2D length")]]
|
[[nodiscard("You must use 2D length")]]
|
||||||
Type length_2d() const noexcept
|
constexpr Type length_2d() const noexcept
|
||||||
{
|
{
|
||||||
return Vector2<Type>::length();
|
return Vector2<Type>::length();
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use distance")]]
|
[[nodiscard("You must use distance")]]
|
||||||
Type distance_to(const Vector3& v_other) const noexcept
|
constexpr Type distance_to(const Vector3& v_other) const noexcept
|
||||||
{
|
{
|
||||||
return (*this - v_other).length();
|
return (*this - v_other).length();
|
||||||
}
|
}
|
||||||
@@ -249,24 +250,23 @@ namespace omath
|
|||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use direction check result")]]
|
[[nodiscard("You must use direction check result")]]
|
||||||
bool point_to_same_direction(const Vector3& other) const
|
constexpr bool point_to_same_direction(const Vector3& other) const
|
||||||
{
|
{
|
||||||
return dot(other) > static_cast<Type>(0);
|
return dot(other) > static_cast<Type>(0);
|
||||||
}
|
}
|
||||||
[[nodiscard("You must use angle between vectors")]]
|
[[nodiscard("You must use angle between vectors")]]
|
||||||
std::expected<Angle<float, 0.f, 180.f, AngleFlags::Clamped>, Vector3Error>
|
constexpr std::expected<Angle<float, 0.f, 180.f, AngleFlags::Clamped>, Vector3Error>
|
||||||
angle_between(const Vector3& other) const noexcept
|
angle_between(const Vector3& other) const noexcept
|
||||||
{
|
{
|
||||||
const auto bottom = length() * other.length();
|
const auto bottom = length() * other.length();
|
||||||
|
|
||||||
if (bottom == static_cast<Type>(0))
|
if (bottom == static_cast<Type>(0))
|
||||||
return std::unexpected(Vector3Error::IMPOSSIBLE_BETWEEN_ANGLE);
|
return std::unexpected(Vector3Error::IMPOSSIBLE_BETWEEN_ANGLE);
|
||||||
|
return Angle<float, 0.f, 180.f, AngleFlags::Clamped>::from_radians(internal::acos(dot(other) / bottom));
|
||||||
return Angle<float, 0.f, 180.f, AngleFlags::Clamped>::from_radians(std::acos(dot(other) / bottom));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use perpendicularity check result")]]
|
[[nodiscard("You must use perpendicularity check result")]]
|
||||||
bool is_perpendicular(const Vector3& other, Type epsilon = static_cast<Type>(0.0001)) const noexcept
|
constexpr bool is_perpendicular(const Vector3& other, Type epsilon = static_cast<Type>(0.0001)) const noexcept
|
||||||
{
|
{
|
||||||
if (const auto angle = angle_between(other))
|
if (const auto angle = angle_between(other))
|
||||||
return std::abs(angle->as_degrees() - static_cast<Type>(90)) <= epsilon;
|
return std::abs(angle->as_degrees() - static_cast<Type>(90)) <= epsilon;
|
||||||
@@ -287,25 +287,25 @@ namespace omath
|
|||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use comparison result")]]
|
[[nodiscard("You must use comparison result")]]
|
||||||
bool operator<(const Vector3& other) const noexcept
|
constexpr bool operator<(const Vector3& other) const noexcept
|
||||||
{
|
{
|
||||||
return length() < other.length();
|
return length() < other.length();
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use comparison result")]]
|
[[nodiscard("You must use comparison result")]]
|
||||||
bool operator>(const Vector3& other) const noexcept
|
constexpr bool operator>(const Vector3& other) const noexcept
|
||||||
{
|
{
|
||||||
return length() > other.length();
|
return length() > other.length();
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use comparison result")]]
|
[[nodiscard("You must use comparison result")]]
|
||||||
bool operator<=(const Vector3& other) const noexcept
|
constexpr bool operator<=(const Vector3& other) const noexcept
|
||||||
{
|
{
|
||||||
return length() <= other.length();
|
return length() <= other.length();
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use comparison result")]]
|
[[nodiscard("You must use comparison result")]]
|
||||||
bool operator>=(const Vector3& other) const noexcept
|
constexpr bool operator>=(const Vector3& other) const noexcept
|
||||||
{
|
{
|
||||||
return length() >= other.length();
|
return length() >= other.length();
|
||||||
}
|
}
|
||||||
@@ -318,13 +318,15 @@ namespace omath
|
|||||||
};
|
};
|
||||||
} // namespace omath
|
} // namespace omath
|
||||||
|
|
||||||
template<> struct std::hash<omath::Vector3<float>>
|
template<class Type>
|
||||||
|
struct std::hash<omath::Vector3<Type>> final // NOLINT(*-dcl58-cpp)
|
||||||
{
|
{
|
||||||
|
// NOTE: Cannot be constexpr because of MSVC
|
||||||
[[nodiscard("You must use hash value")]]
|
[[nodiscard("You must use hash value")]]
|
||||||
std::size_t operator()(const omath::Vector3<float>& vec) const noexcept
|
std::size_t operator()(const omath::Vector3<Type>& vec) const noexcept
|
||||||
{
|
{
|
||||||
std::size_t hash = 0;
|
std::size_t hash = 0;
|
||||||
constexpr std::hash<float> hasher;
|
constexpr std::hash<Type> hasher;
|
||||||
|
|
||||||
hash ^= hasher(vec.x) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
|
hash ^= hasher(vec.x) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
|
||||||
hash ^= hasher(vec.y) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
|
hash ^= hasher(vec.y) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
|
||||||
@@ -335,10 +337,10 @@ template<> struct std::hash<omath::Vector3<float>>
|
|||||||
};
|
};
|
||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
struct std::formatter<omath::Vector3<Type>> // NOLINT(*-dcl58-cpp)
|
struct std::formatter<omath::Vector3<Type>> final // NOLINT(*-dcl58-cpp)
|
||||||
{
|
{
|
||||||
[[nodiscard("You must use parse iterator")]]
|
[[nodiscard("You must use parse iterator")]]
|
||||||
static constexpr auto parse(std::format_parse_context& ctx)
|
static constexpr auto parse(std::format_parse_context& ctx) noexcept
|
||||||
{
|
{
|
||||||
return ctx.begin();
|
return ctx.begin();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -225,13 +225,14 @@ namespace omath
|
|||||||
};
|
};
|
||||||
} // namespace omath
|
} // namespace omath
|
||||||
|
|
||||||
template<> struct std::hash<omath::Vector4<float>>
|
template<class Type>
|
||||||
|
struct std::hash<omath::Vector4<Type>> final // NOLINT(*-dcl58-cpp)
|
||||||
{
|
{
|
||||||
[[nodiscard("You must use hash value")]]
|
[[nodiscard("You must use hash value")]]
|
||||||
std::size_t operator()(const omath::Vector4<float>& vec) const noexcept
|
std::size_t operator()(const omath::Vector4<Type>& vec) const noexcept
|
||||||
{
|
{
|
||||||
std::size_t hash = 0;
|
std::size_t hash = 0;
|
||||||
constexpr std::hash<float> hasher;
|
constexpr std::hash<Type> hasher;
|
||||||
|
|
||||||
hash ^= hasher(vec.x) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
|
hash ^= hasher(vec.x) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
|
||||||
hash ^= hasher(vec.y) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
|
hash ^= hasher(vec.y) + 0x9e3779b9 + (hash << 6) + (hash >> 2);
|
||||||
@@ -240,12 +241,11 @@ template<> struct std::hash<omath::Vector4<float>>
|
|||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
struct std::formatter<omath::Vector4<Type>> // NOLINT(*-dcl58-cpp)
|
struct std::formatter<omath::Vector4<Type>> final // NOLINT(*-dcl58-cpp)
|
||||||
{
|
{
|
||||||
[[nodiscard("You must use parse iterator")]]
|
[[nodiscard("You must use parse iterator")]]
|
||||||
static constexpr auto parse(std::format_parse_context& ctx)
|
static constexpr auto parse(std::format_parse_context& ctx) noexcept
|
||||||
{
|
{
|
||||||
return ctx.begin();
|
return ctx.begin();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,12 +13,12 @@ namespace omath::pathfinding
|
|||||||
class Astar final
|
class Astar final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
[[nodiscard]]
|
[[nodiscard("You forgot to use returned path")]]
|
||||||
static std::vector<Vector3<float>> find_path(const Vector3<float>& start, const Vector3<float>& end,
|
static std::vector<Vector3<float>> find_path(const Vector3<float>& start, const Vector3<float>& end,
|
||||||
const NavigationMesh& nav_mesh) noexcept;
|
const NavigationMesh& nav_mesh) noexcept;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
[[nodiscard]]
|
[[nodiscard("You forgot to use reconstructed path")]]
|
||||||
static std::vector<Vector3<float>>
|
static std::vector<Vector3<float>>
|
||||||
reconstruct_final_path(const std::unordered_map<Vector3<float>, PathNode>& closed_list,
|
reconstruct_final_path(const std::unordered_map<Vector3<float>, PathNode>& closed_list,
|
||||||
const Vector3<float>& current) noexcept;
|
const Vector3<float>& current) noexcept;
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
#include "omath/3d_primitives/aabb.hpp"
|
#include "omath/3d_primitives/aabb.hpp"
|
||||||
#include "omath/3d_primitives/obb.hpp"
|
#include "omath/3d_primitives/obb.hpp"
|
||||||
|
#include "omath/internal/constexpr_math.hpp"
|
||||||
#include "omath/linear_algebra/mat.hpp"
|
#include "omath/linear_algebra/mat.hpp"
|
||||||
#include "omath/linear_algebra/triangle.hpp"
|
#include "omath/linear_algebra/triangle.hpp"
|
||||||
#include "omath/linear_algebra/vector3.hpp"
|
#include "omath/linear_algebra/vector3.hpp"
|
||||||
@@ -84,8 +85,9 @@ namespace omath::projection
|
|||||||
};
|
};
|
||||||
|
|
||||||
~Camera() = default;
|
~Camera() = default;
|
||||||
Camera(const Vector3<NumericType>& position, const ViewAnglesType& view_angles, const ViewPort& view_port,
|
constexpr Camera(const Vector3<NumericType>& position, const ViewAnglesType& view_angles,
|
||||||
const FieldOfView& fov, const NumericType near, const NumericType far) noexcept
|
const ViewPort& view_port, const FieldOfView& fov, const NumericType near,
|
||||||
|
const NumericType far) noexcept
|
||||||
: m_view_port(view_port), m_field_of_view(fov), m_far_plane_distance(far), m_near_plane_distance(near),
|
: m_view_port(view_port), m_field_of_view(fov), m_far_plane_distance(far), m_near_plane_distance(near),
|
||||||
m_view_angles(view_angles), m_origin(position)
|
m_view_angles(view_angles), m_origin(position)
|
||||||
{
|
{
|
||||||
@@ -102,18 +104,18 @@ namespace omath::projection
|
|||||||
// NEGATIVE_ONE_TO_ONE) share the same m[0,0]/m[1,1] layout, so this works
|
// NEGATIVE_ONE_TO_ONE) share the same m[0,0]/m[1,1] layout, so this works
|
||||||
// regardless of the NDC depth range.
|
// regardless of the NDC depth range.
|
||||||
[[nodiscard("You must use extracted projection params")]]
|
[[nodiscard("You must use extracted projection params")]]
|
||||||
static ProjectionParams extract_projection_params(const Mat4X4Type& proj_matrix) noexcept
|
constexpr static ProjectionParams extract_projection_params(const Mat4X4Type& proj_matrix) noexcept
|
||||||
{
|
{
|
||||||
// m[1,1] == 1 / tan(fov/2) => fov = 2 * atan(1 / m[1,1])
|
// m[1,1] == 1 / tan(fov/2) => fov = 2 * atan(1 / m[1,1])
|
||||||
const auto f = proj_matrix.at(1, 1);
|
const auto f = proj_matrix.at(1, 1);
|
||||||
// m[0,0] == m[1,1] / aspect_ratio => aspect = m[1,1] / m[0,0]
|
// m[0,0] == m[1,1] / aspect_ratio => aspect = m[1,1] / m[0,0]
|
||||||
const auto fov_radians = NumericType{2} * std::atan(NumericType{1} / f);
|
const auto fov_radians = NumericType{2} * internal::atan(NumericType{1} / f);
|
||||||
return {FieldOfView::from_radians(static_cast<typename FieldOfView::ArithmeticType>(fov_radians)),
|
return {FieldOfView::from_radians(static_cast<typename FieldOfView::ArithmeticType>(fov_radians)),
|
||||||
f / proj_matrix.at(0, 0)};
|
f / proj_matrix.at(0, 0)};
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use calculated view angles")]]
|
[[nodiscard("You must use calculated view angles")]]
|
||||||
static ViewAnglesType calc_view_angles_from_view_matrix(const Mat4X4Type& view_matrix) noexcept
|
constexpr static ViewAnglesType calc_view_angles_from_view_matrix(const Mat4X4Type& view_matrix) noexcept
|
||||||
{
|
{
|
||||||
Vector3<NumericType> forward_vector = {view_matrix[2, 0], view_matrix[2, 1], view_matrix[2, 2]};
|
Vector3<NumericType> forward_vector = {view_matrix[2, 0], view_matrix[2, 1], view_matrix[2, 2]};
|
||||||
if constexpr (axes.inverted_forward)
|
if constexpr (axes.inverted_forward)
|
||||||
@@ -122,7 +124,7 @@ namespace omath::projection
|
|||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use calculated origin")]]
|
[[nodiscard("You must use calculated origin")]]
|
||||||
static Vector3<NumericType> calc_origin_from_view_matrix(const Mat4X4Type& view_matrix) noexcept
|
constexpr static Vector3<NumericType> calc_origin_from_view_matrix(const Mat4X4Type& view_matrix) noexcept
|
||||||
{
|
{
|
||||||
// The view matrix is R * T(-origin), so the last column stores t = -R * origin.
|
// The view matrix is R * T(-origin), so the last column stores t = -R * origin.
|
||||||
// Recovering origin: origin = -R^T * t
|
// Recovering origin: origin = -R^T * t
|
||||||
@@ -136,40 +138,58 @@ namespace omath::projection
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
void look_at(const Vector3<NumericType>& target)
|
constexpr void look_at(const Vector3<NumericType>& target)
|
||||||
{
|
{
|
||||||
m_view_angles = TraitClass::calc_look_at_angle(m_origin, target);
|
m_view_angles = TraitClass::calc_look_at_angle(m_origin, target);
|
||||||
m_view_projection_matrix = std::nullopt;
|
m_view_projection_matrix = std::nullopt;
|
||||||
m_view_matrix = std::nullopt;
|
m_view_matrix = std::nullopt;
|
||||||
}
|
}
|
||||||
[[nodiscard("You must use calculated look-at angles")]]
|
[[nodiscard("You must use calculated look-at angles")]]
|
||||||
ViewAnglesType calc_look_at_angles(const Vector3<NumericType>& look_to) const
|
constexpr ViewAnglesType calc_look_at_angles(const Vector3<NumericType>& look_to) const
|
||||||
{
|
{
|
||||||
return TraitClass::calc_look_at_angle(m_origin, look_to);
|
return TraitClass::calc_look_at_angle(m_origin, look_to);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use forward vector")]]
|
[[nodiscard("You must use forward vector")]]
|
||||||
Vector3<NumericType> get_forward() const noexcept
|
constexpr Vector3<NumericType> get_forward() const noexcept
|
||||||
{
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
const auto view_matrix = calc_view_matrix();
|
||||||
|
return {view_matrix[2, 0], view_matrix[2, 1], view_matrix[2, 2]};
|
||||||
|
}
|
||||||
|
|
||||||
const auto& view_matrix = get_view_matrix();
|
const auto& view_matrix = get_view_matrix();
|
||||||
return {view_matrix[2, 0], view_matrix[2, 1], view_matrix[2, 2]};
|
return {view_matrix[2, 0], view_matrix[2, 1], view_matrix[2, 2]};
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use right vector")]]
|
[[nodiscard("You must use right vector")]]
|
||||||
Vector3<NumericType> get_right() const noexcept
|
constexpr Vector3<NumericType> get_right() const noexcept
|
||||||
{
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
const auto view_matrix = calc_view_matrix();
|
||||||
|
return {view_matrix[0, 0], view_matrix[0, 1], view_matrix[0, 2]};
|
||||||
|
}
|
||||||
|
|
||||||
const auto& view_matrix = get_view_matrix();
|
const auto& view_matrix = get_view_matrix();
|
||||||
return {view_matrix[0, 0], view_matrix[0, 1], view_matrix[0, 2]};
|
return {view_matrix[0, 0], view_matrix[0, 1], view_matrix[0, 2]};
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use up vector")]]
|
[[nodiscard("You must use up vector")]]
|
||||||
Vector3<NumericType> get_up() const noexcept
|
constexpr Vector3<NumericType> get_up() const noexcept
|
||||||
{
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
const auto view_matrix = calc_view_matrix();
|
||||||
|
return {view_matrix[1, 0], view_matrix[1, 1], view_matrix[1, 2]};
|
||||||
|
}
|
||||||
|
|
||||||
const auto& view_matrix = get_view_matrix();
|
const auto& view_matrix = get_view_matrix();
|
||||||
return {view_matrix[1, 0], view_matrix[1, 1], view_matrix[1, 2]};
|
return {view_matrix[1, 0], view_matrix[1, 1], view_matrix[1, 2]};
|
||||||
}
|
}
|
||||||
[[nodiscard("You must use absolute forward vector")]]
|
[[nodiscard("You must use absolute forward vector")]]
|
||||||
Vector3<NumericType> get_abs_forward() const noexcept
|
constexpr Vector3<NumericType> get_abs_forward() const noexcept
|
||||||
{
|
{
|
||||||
if constexpr (axes.inverted_forward)
|
if constexpr (axes.inverted_forward)
|
||||||
return -get_forward();
|
return -get_forward();
|
||||||
@@ -177,7 +197,7 @@ namespace omath::projection
|
|||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use absolute right vector")]]
|
[[nodiscard("You must use absolute right vector")]]
|
||||||
Vector3<NumericType> get_abs_right() const noexcept
|
constexpr Vector3<NumericType> get_abs_right() const noexcept
|
||||||
{
|
{
|
||||||
if constexpr (axes.inverted_right)
|
if constexpr (axes.inverted_right)
|
||||||
return -get_right();
|
return -get_right();
|
||||||
@@ -185,13 +205,32 @@ namespace omath::projection
|
|||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use absolute up vector")]]
|
[[nodiscard("You must use absolute up vector")]]
|
||||||
Vector3<NumericType> get_abs_up() const noexcept
|
constexpr Vector3<NumericType> get_abs_up() const noexcept
|
||||||
{
|
{
|
||||||
return get_up();
|
return get_up();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[[nodiscard("You must use calculated view-projection matrix")]]
|
||||||
|
constexpr Mat4X4Type calc_view_projection_matrix() const noexcept
|
||||||
|
{
|
||||||
|
return calc_projection_matrix() * calc_view_matrix();
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("You must use calculated view matrix")]]
|
||||||
|
constexpr Mat4X4Type calc_view_matrix() const noexcept
|
||||||
|
{
|
||||||
|
return TraitClass::calc_view_matrix(m_view_angles, m_origin);
|
||||||
|
}
|
||||||
|
|
||||||
|
[[nodiscard("You must use calculated projection matrix")]]
|
||||||
|
constexpr Mat4X4Type calc_projection_matrix() const noexcept
|
||||||
|
{
|
||||||
|
return TraitClass::calc_projection_matrix(m_field_of_view, m_view_port, m_near_plane_distance,
|
||||||
|
m_far_plane_distance, depth_range);
|
||||||
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use view-projection matrix")]]
|
[[nodiscard("You must use view-projection matrix")]]
|
||||||
const Mat4X4Type& get_view_projection_matrix() const noexcept
|
constexpr const Mat4X4Type& get_view_projection_matrix() const noexcept
|
||||||
{
|
{
|
||||||
if (!m_view_projection_matrix.has_value())
|
if (!m_view_projection_matrix.has_value())
|
||||||
m_view_projection_matrix = get_projection_matrix() * get_view_matrix();
|
m_view_projection_matrix = get_projection_matrix() * get_view_matrix();
|
||||||
@@ -199,90 +238,96 @@ namespace omath::projection
|
|||||||
return m_view_projection_matrix.value();
|
return m_view_projection_matrix.value();
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use view matrix")]] const Mat4X4Type& get_view_matrix() const noexcept
|
[[nodiscard("You must use view matrix")]]
|
||||||
|
constexpr const Mat4X4Type& get_view_matrix() const noexcept
|
||||||
{
|
{
|
||||||
if (!m_view_matrix.has_value())
|
if (!m_view_matrix.has_value())
|
||||||
m_view_matrix = TraitClass::calc_view_matrix(m_view_angles, m_origin);
|
m_view_matrix = calc_view_matrix();
|
||||||
|
|
||||||
return m_view_matrix.value();
|
return m_view_matrix.value();
|
||||||
}
|
}
|
||||||
[[nodiscard("You must use projection matrix")]] const Mat4X4Type& get_projection_matrix() const noexcept
|
[[nodiscard("You must use projection matrix")]] constexpr const Mat4X4Type&
|
||||||
|
get_projection_matrix() const noexcept
|
||||||
{
|
{
|
||||||
if (!m_projection_matrix.has_value())
|
if (!m_projection_matrix.has_value())
|
||||||
m_projection_matrix = TraitClass::calc_projection_matrix(
|
m_projection_matrix = calc_projection_matrix();
|
||||||
m_field_of_view, m_view_port, m_near_plane_distance, m_far_plane_distance, depth_range);
|
|
||||||
|
|
||||||
return m_projection_matrix.value();
|
return m_projection_matrix.value();
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_field_of_view(const FieldOfView& fov) noexcept
|
constexpr void set_field_of_view(const FieldOfView& fov) noexcept
|
||||||
{
|
{
|
||||||
m_field_of_view = fov;
|
m_field_of_view = fov;
|
||||||
m_view_projection_matrix = std::nullopt;
|
m_view_projection_matrix = std::nullopt;
|
||||||
m_projection_matrix = std::nullopt;
|
m_projection_matrix = std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_near_plane(const NumericType near_plane) noexcept
|
constexpr void set_near_plane(const NumericType near_plane) noexcept
|
||||||
{
|
{
|
||||||
m_near_plane_distance = near_plane;
|
m_near_plane_distance = near_plane;
|
||||||
m_view_projection_matrix = std::nullopt;
|
m_view_projection_matrix = std::nullopt;
|
||||||
m_projection_matrix = std::nullopt;
|
m_projection_matrix = std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_far_plane(const NumericType far_plane) noexcept
|
constexpr void set_far_plane(const NumericType far_plane) noexcept
|
||||||
{
|
{
|
||||||
m_far_plane_distance = far_plane;
|
m_far_plane_distance = far_plane;
|
||||||
m_view_projection_matrix = std::nullopt;
|
m_view_projection_matrix = std::nullopt;
|
||||||
m_projection_matrix = std::nullopt;
|
m_projection_matrix = std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_view_angles(const ViewAnglesType& view_angles) noexcept
|
constexpr void set_view_angles(const ViewAnglesType& view_angles) noexcept
|
||||||
{
|
{
|
||||||
m_view_angles = view_angles;
|
m_view_angles = view_angles;
|
||||||
m_view_projection_matrix = std::nullopt;
|
m_view_projection_matrix = std::nullopt;
|
||||||
m_view_matrix = std::nullopt;
|
m_view_matrix = std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_origin(const Vector3<NumericType>& origin) noexcept
|
constexpr void set_origin(const Vector3<NumericType>& origin) noexcept
|
||||||
{
|
{
|
||||||
m_origin = origin;
|
m_origin = origin;
|
||||||
m_view_projection_matrix = std::nullopt;
|
m_view_projection_matrix = std::nullopt;
|
||||||
m_view_matrix = std::nullopt;
|
m_view_matrix = std::nullopt;
|
||||||
}
|
}
|
||||||
void set_view_port(const ViewPort& view_port) noexcept
|
constexpr void set_view_port(const ViewPort& view_port) noexcept
|
||||||
{
|
{
|
||||||
m_view_port = view_port;
|
m_view_port = view_port;
|
||||||
m_view_projection_matrix = std::nullopt;
|
m_view_projection_matrix = std::nullopt;
|
||||||
m_projection_matrix = std::nullopt;
|
m_projection_matrix = std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use field of view")]] const FieldOfView& get_field_of_view() const noexcept
|
[[nodiscard("You must use field of view")]]
|
||||||
|
constexpr const FieldOfView& get_field_of_view() const noexcept
|
||||||
{
|
{
|
||||||
return m_field_of_view;
|
return m_field_of_view;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use near plane")]] const NumericType& get_near_plane() const noexcept
|
[[nodiscard("You must use near plane")]]
|
||||||
|
constexpr const NumericType& get_near_plane() const noexcept
|
||||||
{
|
{
|
||||||
return m_near_plane_distance;
|
return m_near_plane_distance;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use far plane")]] const NumericType& get_far_plane() const noexcept
|
[[nodiscard("You must use far plane")]]
|
||||||
|
constexpr const NumericType& get_far_plane() const noexcept
|
||||||
{
|
{
|
||||||
return m_far_plane_distance;
|
return m_far_plane_distance;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use view angles")]] const ViewAnglesType& get_view_angles() const noexcept
|
[[nodiscard("You must use view angles")]]
|
||||||
|
constexpr const ViewAnglesType& get_view_angles() const noexcept
|
||||||
{
|
{
|
||||||
return m_view_angles;
|
return m_view_angles;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use origin")]] const Vector3<NumericType>& get_origin() const noexcept
|
[[nodiscard("You must use origin")]]
|
||||||
|
constexpr const Vector3<NumericType>& get_origin() const noexcept
|
||||||
{
|
{
|
||||||
return m_origin;
|
return m_origin;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<ScreenStart screen_start = ScreenStart::TOP_LEFT_CORNER>
|
template<ScreenStart screen_start = ScreenStart::TOP_LEFT_CORNER>
|
||||||
[[nodiscard("You must use screen position")]] std::expected<Vector3<NumericType>, Error>
|
[[nodiscard("You must use screen position")]] constexpr std::expected<Vector3<NumericType>, Error>
|
||||||
world_to_screen(const Vector3<NumericType>& world_position) const noexcept
|
world_to_screen(const Vector3<NumericType>& world_position) const noexcept
|
||||||
{
|
{
|
||||||
const auto normalized_cords = world_to_view_port(world_position);
|
const auto normalized_cords = world_to_view_port(world_position);
|
||||||
@@ -298,7 +343,7 @@ namespace omath::projection
|
|||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
template<ScreenStart screen_start = ScreenStart::TOP_LEFT_CORNER>
|
template<ScreenStart screen_start = ScreenStart::TOP_LEFT_CORNER>
|
||||||
[[nodiscard("You must use unclipped screen position")]] std::expected<Vector3<NumericType>, Error>
|
[[nodiscard("You must use unclipped screen position")]] constexpr std::expected<Vector3<NumericType>, Error>
|
||||||
world_to_screen_unclipped(const Vector3<NumericType>& world_position) const noexcept
|
world_to_screen_unclipped(const Vector3<NumericType>& world_position) const noexcept
|
||||||
{
|
{
|
||||||
const auto normalized_cords = world_to_view_port(world_position, ViewPortClipping::MANUAL);
|
const auto normalized_cords = world_to_view_port(world_position, ViewPortClipping::MANUAL);
|
||||||
@@ -314,7 +359,7 @@ namespace omath::projection
|
|||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use frustum culling result")]] bool
|
[[nodiscard("You must use frustum culling result")]] constexpr bool
|
||||||
is_culled_by_frustum(const Triangle<Vector3<NumericType>>& triangle) const noexcept
|
is_culled_by_frustum(const Triangle<Vector3<NumericType>>& triangle) const noexcept
|
||||||
{
|
{
|
||||||
// Transform to clip space (before perspective divide)
|
// Transform to clip space (before perspective divide)
|
||||||
@@ -382,7 +427,7 @@ namespace omath::projection
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use AABB frustum culling result")]] bool
|
[[nodiscard("You must use AABB frustum culling result")]] constexpr bool
|
||||||
is_aabb_culled_by_frustum(const primitives::Aabb<NumericType>& aabb) const noexcept
|
is_aabb_culled_by_frustum(const primitives::Aabb<NumericType>& aabb) const noexcept
|
||||||
{
|
{
|
||||||
// For each plane, find the AABB corner most in the direction of the plane normal
|
// For each plane, find the AABB corner most in the direction of the plane normal
|
||||||
@@ -400,7 +445,7 @@ namespace omath::projection
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use OBB frustum culling result")]] bool
|
[[nodiscard("You must use OBB frustum culling result")]] constexpr bool
|
||||||
is_obb_culled_by_frustum(const primitives::Obb<NumericType>& obb) const noexcept
|
is_obb_culled_by_frustum(const primitives::Obb<NumericType>& obb) const noexcept
|
||||||
{
|
{
|
||||||
// For each plane, project the OBB extents onto the plane normal to get the
|
// For each plane, project the OBB extents onto the plane normal to get the
|
||||||
@@ -410,9 +455,9 @@ namespace omath::projection
|
|||||||
const Vector3<NumericType> normal{a, b, c};
|
const Vector3<NumericType> normal{a, b, c};
|
||||||
|
|
||||||
const auto center_distance = normal.dot(obb.center) + d;
|
const auto center_distance = normal.dot(obb.center) + d;
|
||||||
const auto radius = obb.half_extents.x * std::abs(normal.dot(obb.axis_x))
|
const auto radius = obb.half_extents.x * internal::abs(normal.dot(obb.axis_x))
|
||||||
+ obb.half_extents.y * std::abs(normal.dot(obb.axis_y))
|
+ obb.half_extents.y * internal::abs(normal.dot(obb.axis_y))
|
||||||
+ obb.half_extents.z * std::abs(normal.dot(obb.axis_z));
|
+ obb.half_extents.z * internal::abs(normal.dot(obb.axis_z));
|
||||||
|
|
||||||
if (center_distance + radius < NumericType{0})
|
if (center_distance + radius < NumericType{0})
|
||||||
return true;
|
return true;
|
||||||
@@ -421,60 +466,102 @@ namespace omath::projection
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use view port position")]] std::expected<Vector3<NumericType>, Error>
|
[[nodiscard("You must view camera space coordinates")]]
|
||||||
|
constexpr Vector3<NumericType> world_to_view_coordinates(const Vector3<NumericType>& world_coordinates) const noexcept
|
||||||
|
{
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
const auto view_coordinates =
|
||||||
|
calc_view_matrix()
|
||||||
|
* mat_column_from_vector<NumericType, Mat4X4Type::get_store_ordering()>(world_coordinates);
|
||||||
|
|
||||||
|
return {view_coordinates.at(0, 0), view_coordinates.at(1, 0), view_coordinates.at(2, 0)};
|
||||||
|
}
|
||||||
|
const auto view_coordinates =
|
||||||
|
get_view_matrix()
|
||||||
|
* mat_column_from_vector<NumericType, Mat4X4Type::get_store_ordering()>(world_coordinates);
|
||||||
|
|
||||||
|
return {view_coordinates.at(0, 0), view_coordinates.at(1, 0), view_coordinates.at(2, 0)};
|
||||||
|
}
|
||||||
|
[[nodiscard("You must use view port position")]] constexpr std::expected<Vector3<NumericType>, Error>
|
||||||
world_to_view_port(const Vector3<NumericType>& world_position,
|
world_to_view_port(const Vector3<NumericType>& world_position,
|
||||||
const ViewPortClipping& clipping = ViewPortClipping::AUTO) const noexcept
|
const ViewPortClipping& clipping = ViewPortClipping::AUTO) const noexcept
|
||||||
{
|
{
|
||||||
|
auto project_to_view_port = [&clipping](auto projected) -> std::expected<Vector3<NumericType>, Error>
|
||||||
|
{
|
||||||
|
const auto& w = projected.at(3, 0);
|
||||||
|
constexpr auto eps = std::numeric_limits<NumericType>::epsilon();
|
||||||
|
if (w <= eps)
|
||||||
|
return std::unexpected(Error::PERSPECTIVE_DIVIDER_LESS_EQ_ZERO);
|
||||||
|
|
||||||
|
projected /= w;
|
||||||
|
|
||||||
|
// ReSharper disable once CppTooWideScope
|
||||||
|
const auto clipped_automatically =
|
||||||
|
clipping == ViewPortClipping::AUTO && is_ndc_out_of_bounds(projected);
|
||||||
|
if (clipped_automatically)
|
||||||
|
return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS);
|
||||||
|
|
||||||
|
// ReSharper disable once CppTooWideScope
|
||||||
|
constexpr auto z_min = depth_range == NDCDepthRange::ZERO_TO_ONE ? NumericType{0} : -NumericType{1};
|
||||||
|
const auto clipped_manually =
|
||||||
|
clipping == ViewPortClipping::MANUAL
|
||||||
|
&& (projected.at(2, 0) < z_min - eps || projected.at(2, 0) > NumericType{1} + eps);
|
||||||
|
if (clipped_manually)
|
||||||
|
return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS);
|
||||||
|
|
||||||
|
return Vector3<NumericType>{projected.at(0, 0), projected.at(1, 0), projected.at(2, 0)};
|
||||||
|
};
|
||||||
|
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
auto projected =
|
||||||
|
calc_view_projection_matrix()
|
||||||
|
* mat_column_from_vector<NumericType, Mat4X4Type::get_store_ordering()>(world_position);
|
||||||
|
return project_to_view_port(projected);
|
||||||
|
}
|
||||||
|
|
||||||
auto projected = get_view_projection_matrix()
|
auto projected = get_view_projection_matrix()
|
||||||
* mat_column_from_vector<NumericType, Mat4X4Type::get_store_ordering()>(world_position);
|
* mat_column_from_vector<NumericType, Mat4X4Type::get_store_ordering()>(world_position);
|
||||||
|
return project_to_view_port(projected);
|
||||||
const auto& w = projected.at(3, 0);
|
|
||||||
constexpr auto eps = std::numeric_limits<NumericType>::epsilon();
|
|
||||||
if (w <= eps)
|
|
||||||
return std::unexpected(Error::PERSPECTIVE_DIVIDER_LESS_EQ_ZERO);
|
|
||||||
|
|
||||||
projected /= w;
|
|
||||||
|
|
||||||
// ReSharper disable once CppTooWideScope
|
|
||||||
const auto clipped_automatically = clipping == ViewPortClipping::AUTO && is_ndc_out_of_bounds(projected);
|
|
||||||
if (clipped_automatically)
|
|
||||||
return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS);
|
|
||||||
|
|
||||||
// ReSharper disable once CppTooWideScope
|
|
||||||
constexpr auto z_min = depth_range == NDCDepthRange::ZERO_TO_ONE ? NumericType{0} : -NumericType{1};
|
|
||||||
const auto clipped_manually =
|
|
||||||
clipping == ViewPortClipping::MANUAL
|
|
||||||
&& (projected.at(2, 0) < z_min - eps || projected.at(2, 0) > NumericType{1} + eps);
|
|
||||||
if (clipped_manually)
|
|
||||||
return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS);
|
|
||||||
|
|
||||||
return Vector3<NumericType>{projected.at(0, 0), projected.at(1, 0), projected.at(2, 0)};
|
|
||||||
}
|
}
|
||||||
[[nodiscard("You must use world position")]]
|
[[nodiscard("You must use world position")]]
|
||||||
std::expected<Vector3<NumericType>, Error> view_port_to_world(const Vector3<NumericType>& ndc) const noexcept
|
constexpr std::expected<Vector3<NumericType>, Error>
|
||||||
|
view_port_to_world(const Vector3<NumericType>& ndc) const noexcept
|
||||||
{
|
{
|
||||||
const auto inv_view_proj = get_view_projection_matrix().inverted();
|
auto view_port_to_world =
|
||||||
|
[&ndc](const Mat4X4Type& view_projection) -> std::expected<Vector3<NumericType>, Error>
|
||||||
|
{
|
||||||
|
const auto inv_view_proj = view_projection.inverted();
|
||||||
|
|
||||||
if (!inv_view_proj)
|
if (!inv_view_proj)
|
||||||
return std::unexpected(Error::INV_VIEW_PROJ_MAT_DET_EQ_ZERO);
|
return std::unexpected(Error::INV_VIEW_PROJ_MAT_DET_EQ_ZERO);
|
||||||
|
|
||||||
auto inverted_projection =
|
auto inverted_projection = inv_view_proj.value()
|
||||||
inv_view_proj.value() * mat_column_from_vector<NumericType, Mat4X4Type::get_store_ordering()>(ndc);
|
* mat_column_from_vector<NumericType, Mat4X4Type::get_store_ordering()>(ndc);
|
||||||
|
|
||||||
const auto& w = inverted_projection.at(3, 0);
|
const auto& w = inverted_projection.at(3, 0);
|
||||||
|
|
||||||
if (std::abs(w) < std::numeric_limits<NumericType>::epsilon())
|
if (internal::abs(w) < std::numeric_limits<NumericType>::epsilon())
|
||||||
return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS);
|
return std::unexpected(Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS);
|
||||||
|
|
||||||
inverted_projection /= w;
|
inverted_projection /= w;
|
||||||
|
|
||||||
return Vector3<NumericType>{inverted_projection.at(0, 0), inverted_projection.at(1, 0),
|
return Vector3<NumericType>{inverted_projection.at(0, 0), inverted_projection.at(1, 0),
|
||||||
inverted_projection.at(2, 0)};
|
inverted_projection.at(2, 0)};
|
||||||
|
};
|
||||||
|
|
||||||
|
if consteval
|
||||||
|
{
|
||||||
|
return view_port_to_world(calc_view_projection_matrix());
|
||||||
|
}
|
||||||
|
|
||||||
|
return view_port_to_world(get_view_projection_matrix());
|
||||||
}
|
}
|
||||||
|
|
||||||
template<ScreenStart screen_start = ScreenStart::TOP_LEFT_CORNER>
|
template<ScreenStart screen_start = ScreenStart::TOP_LEFT_CORNER>
|
||||||
[[nodiscard("You must use world position")]]
|
[[nodiscard("You must use world position")]]
|
||||||
std::expected<Vector3<NumericType>, Error>
|
constexpr std::expected<Vector3<NumericType>, Error>
|
||||||
screen_to_world(const Vector3<NumericType>& screen_pos) const noexcept
|
screen_to_world(const Vector3<NumericType>& screen_pos) const noexcept
|
||||||
{
|
{
|
||||||
return view_port_to_world(screen_to_ndc<screen_start>(screen_pos));
|
return view_port_to_world(screen_to_ndc<screen_start>(screen_pos));
|
||||||
@@ -482,7 +569,7 @@ namespace omath::projection
|
|||||||
|
|
||||||
template<ScreenStart screen_start = ScreenStart::TOP_LEFT_CORNER>
|
template<ScreenStart screen_start = ScreenStart::TOP_LEFT_CORNER>
|
||||||
[[nodiscard("You must use world position")]]
|
[[nodiscard("You must use world position")]]
|
||||||
std::expected<Vector3<NumericType>, Error>
|
constexpr std::expected<Vector3<NumericType>, Error>
|
||||||
screen_to_world(const Vector2<NumericType>& screen_pos) const noexcept
|
screen_to_world(const Vector2<NumericType>& screen_pos) const noexcept
|
||||||
{
|
{
|
||||||
const auto& [x, y] = screen_pos;
|
const auto& [x, y] = screen_pos;
|
||||||
@@ -517,7 +604,8 @@ namespace omath::projection
|
|||||||
// Top = r3 - r1
|
// Top = r3 - r1
|
||||||
// Near = r3 + r2 ([-1,1]) or r2 ([0,1])
|
// Near = r3 + r2 ([-1,1]) or r2 ([0,1])
|
||||||
// Far = r3 - r2
|
// Far = r3 - r2
|
||||||
[[nodiscard("You must use frustum planes")]] std::array<FrustumPlane, 6> extract_frustum_planes() const noexcept
|
[[nodiscard("You must use frustum planes")]] constexpr std::array<FrustumPlane, 6>
|
||||||
|
extract_frustum_planes() const noexcept
|
||||||
{
|
{
|
||||||
const auto& m = get_view_projection_matrix();
|
const auto& m = get_view_projection_matrix();
|
||||||
|
|
||||||
@@ -589,7 +677,7 @@ namespace omath::projection
|
|||||||
v
|
v
|
||||||
*/
|
*/
|
||||||
|
|
||||||
[[nodiscard("You must use screen position")]] Vector3<NumericType>
|
[[nodiscard("You must use screen position")]] constexpr Vector3<NumericType>
|
||||||
ndc_to_screen_position_from_top_left_corner(const Vector3<NumericType>& ndc) const noexcept
|
ndc_to_screen_position_from_top_left_corner(const Vector3<NumericType>& ndc) const noexcept
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@@ -607,7 +695,7 @@ namespace omath::projection
|
|||||||
(ndc.y / -NumericType{2} + NumericType{0.5}) * m_view_port.m_height, ndc.z};
|
(ndc.y / -NumericType{2} + NumericType{0.5}) * m_view_port.m_height, ndc.z};
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard("You must use screen position")]] Vector3<NumericType>
|
[[nodiscard("You must use screen position")]] constexpr Vector3<NumericType>
|
||||||
ndc_to_screen_position_from_bottom_left_corner(const Vector3<NumericType>& ndc) const noexcept
|
ndc_to_screen_position_from_bottom_left_corner(const Vector3<NumericType>& ndc) const noexcept
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@@ -626,7 +714,7 @@ namespace omath::projection
|
|||||||
}
|
}
|
||||||
|
|
||||||
template<ScreenStart screen_start = ScreenStart::TOP_LEFT_CORNER>
|
template<ScreenStart screen_start = ScreenStart::TOP_LEFT_CORNER>
|
||||||
[[nodiscard("You must use NDC position")]] Vector3<NumericType>
|
[[nodiscard("You must use NDC position")]] constexpr Vector3<NumericType>
|
||||||
screen_to_ndc(const Vector3<NumericType>& screen_pos) const noexcept
|
screen_to_ndc(const Vector3<NumericType>& screen_pos) const noexcept
|
||||||
{
|
{
|
||||||
if constexpr (screen_start == ScreenStart::TOP_LEFT_CORNER)
|
if constexpr (screen_start == ScreenStart::TOP_LEFT_CORNER)
|
||||||
|
|||||||
@@ -21,36 +21,20 @@
|
|||||||
|
|
||||||
namespace omath::rev_eng
|
namespace omath::rev_eng
|
||||||
{
|
{
|
||||||
template<std::size_t N>
|
|
||||||
struct FixedString final
|
|
||||||
{
|
|
||||||
char data[N]{};
|
|
||||||
// ReSharper disable once CppNonExplicitConvertingConstructor
|
|
||||||
constexpr FixedString(const char (&str)[N]) noexcept // NOLINT(*-explicit-constructor)
|
|
||||||
{
|
|
||||||
for (std::size_t i = 0; i < N; ++i)
|
|
||||||
data[i] = str[i];
|
|
||||||
}
|
|
||||||
// ReSharper disable once CppNonExplicitConversionOperator
|
|
||||||
constexpr operator std::string_view() const noexcept // NOLINT(*-explicit-constructor)
|
|
||||||
{
|
|
||||||
return {data, N - 1};
|
|
||||||
}
|
|
||||||
};
|
|
||||||
template<std::size_t N>
|
|
||||||
FixedString(const char (&)[N]) -> FixedString<N>;
|
|
||||||
|
|
||||||
class InternalReverseEngineeredObject
|
class InternalReverseEngineeredObject
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
template<class Type>
|
template<class Type>
|
||||||
[[nodiscard]] Type& get_by_offset(const std::ptrdiff_t offset)
|
[[nodiscard("You must use value")]]
|
||||||
|
Type& get_by_offset(const std::ptrdiff_t offset) noexcept
|
||||||
{
|
{
|
||||||
return *reinterpret_cast<Type*>(reinterpret_cast<std::uintptr_t>(this) + offset);
|
return *reinterpret_cast<Type*>(reinterpret_cast<std::uintptr_t>(this) + offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
[[nodiscard]] const Type& get_by_offset(const std::ptrdiff_t offset) const
|
[[nodiscard("You must use value")]]
|
||||||
|
const Type& get_by_offset(const std::ptrdiff_t offset) const noexcept
|
||||||
{
|
{
|
||||||
return *reinterpret_cast<Type*>(reinterpret_cast<std::uintptr_t>(this) + offset);
|
return *reinterpret_cast<Type*>(reinterpret_cast<std::uintptr_t>(this) + offset);
|
||||||
}
|
}
|
||||||
@@ -76,14 +60,16 @@ namespace omath::rev_eng
|
|||||||
return reinterpret_cast<MethodType>(const_cast<void*>(ptr))(this, arg_list...);
|
return reinterpret_cast<MethodType>(const_cast<void*>(ptr))(this, arg_list...);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<FixedString ModuleName, FixedString Pattern, class ReturnType>
|
template<PatternScanner::ConstevalPattern ModuleName, PatternScanner::ConstevalPattern Pattern,
|
||||||
|
class ReturnType>
|
||||||
ReturnType call_method(auto... arg_list)
|
ReturnType call_method(auto... arg_list)
|
||||||
{
|
{
|
||||||
static const auto* address = resolve_pattern(ModuleName, Pattern);
|
static const auto* address = resolve_pattern(ModuleName, Pattern);
|
||||||
return call_method<ReturnType>(address, arg_list...);
|
return call_method<ReturnType>(address, arg_list...);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<FixedString ModuleName, FixedString Pattern, class ReturnType>
|
template<PatternScanner::ConstevalPattern ModuleName, PatternScanner::ConstevalPattern Pattern,
|
||||||
|
class ReturnType>
|
||||||
ReturnType call_method(auto... arg_list) const
|
ReturnType call_method(auto... arg_list) const
|
||||||
{
|
{
|
||||||
static const auto* address = resolve_pattern(ModuleName, Pattern);
|
static const auto* address = resolve_pattern(ModuleName, Pattern);
|
||||||
@@ -91,14 +77,15 @@ namespace omath::rev_eng
|
|||||||
}
|
}
|
||||||
|
|
||||||
template<class ReturnType>
|
template<class ReturnType>
|
||||||
ReturnType call_method(const std::string_view& module_name,const std::string_view& pattern, auto... arg_list)
|
ReturnType call_method(const std::string_view& module_name, const std::string_view& pattern, auto... arg_list)
|
||||||
{
|
{
|
||||||
static const auto* address = resolve_pattern(module_name, pattern);
|
static const auto* address = resolve_pattern(module_name, pattern);
|
||||||
return call_method<ReturnType>(address, arg_list...);
|
return call_method<ReturnType>(address, arg_list...);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class ReturnType>
|
template<class ReturnType>
|
||||||
ReturnType call_method(const std::string_view& module_name,const std::string_view& pattern, auto... arg_list) const
|
ReturnType call_method(const std::string_view& module_name, const std::string_view& pattern,
|
||||||
|
auto... arg_list) const
|
||||||
{
|
{
|
||||||
static const auto* address = resolve_pattern(module_name, pattern);
|
static const auto* address = resolve_pattern(module_name, pattern);
|
||||||
return call_method<ReturnType>(address, arg_list...);
|
return call_method<ReturnType>(address, arg_list...);
|
||||||
@@ -119,26 +106,24 @@ namespace omath::rev_eng
|
|||||||
template<std::ptrdiff_t TableOffset, std::size_t Id, class ReturnType>
|
template<std::ptrdiff_t TableOffset, std::size_t Id, class ReturnType>
|
||||||
ReturnType call_virtual_method(auto... arg_list)
|
ReturnType call_virtual_method(auto... arg_list)
|
||||||
{
|
{
|
||||||
auto sub_this = reinterpret_cast<void*>(
|
auto sub_this = reinterpret_cast<void*>(reinterpret_cast<std::uintptr_t>(this) + TableOffset);
|
||||||
reinterpret_cast<std::uintptr_t>(this) + TableOffset);
|
|
||||||
const auto vtable = *reinterpret_cast<void***>(sub_this);
|
const auto vtable = *reinterpret_cast<void***>(sub_this);
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
using Fn = ReturnType(__thiscall*)(void*, decltype(arg_list)...);
|
using Fn = ReturnType(__thiscall*)(void*, decltype(arg_list)...);
|
||||||
#else
|
#else
|
||||||
using Fn = ReturnType(*)(void*, decltype(arg_list)...);
|
using Fn = ReturnType (*)(void*, decltype(arg_list)...);
|
||||||
#endif
|
#endif
|
||||||
return reinterpret_cast<Fn>(vtable[Id])(sub_this, arg_list...);
|
return reinterpret_cast<Fn>(vtable[Id])(sub_this, arg_list...);
|
||||||
}
|
}
|
||||||
template<std::ptrdiff_t TableOffset, std::size_t Id, class ReturnType>
|
template<std::ptrdiff_t TableOffset, std::size_t Id, class ReturnType>
|
||||||
ReturnType call_virtual_method(auto... arg_list) const
|
ReturnType call_virtual_method(auto... arg_list) const
|
||||||
{
|
{
|
||||||
auto sub_this = reinterpret_cast<const void*>(
|
auto sub_this = reinterpret_cast<const void*>(reinterpret_cast<std::uintptr_t>(this) + TableOffset);
|
||||||
reinterpret_cast<std::uintptr_t>(this) + TableOffset);
|
|
||||||
const auto vtable = *reinterpret_cast<void* const* const*>(sub_this);
|
const auto vtable = *reinterpret_cast<void* const* const*>(sub_this);
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
using Fn = ReturnType(__thiscall*)(const void*, decltype(arg_list)...);
|
using Fn = ReturnType(__thiscall*)(const void*, decltype(arg_list)...);
|
||||||
#else
|
#else
|
||||||
using Fn = ReturnType(*)(const void*, decltype(arg_list)...);
|
using Fn = ReturnType (*)(const void*, decltype(arg_list)...);
|
||||||
#endif
|
#endif
|
||||||
return reinterpret_cast<Fn>(vtable[Id])(sub_this, arg_list...);
|
return reinterpret_cast<Fn>(vtable[Id])(sub_this, arg_list...);
|
||||||
}
|
}
|
||||||
@@ -161,8 +146,8 @@ namespace omath::rev_eng
|
|||||||
return reinterpret_cast<const void*>(*result);
|
return reinterpret_cast<const void*>(*result);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("You forgot to use module base address")]]
|
||||||
static const void* get_module_base(const std::string_view module_name)
|
static const void* get_module_base(const std::string_view module_name) noexcept
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
return GetModuleHandleA(module_name.data());
|
return GetModuleHandleA(module_name.data());
|
||||||
|
|||||||
@@ -3,9 +3,12 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include "omath/internal/constexpr_math.hpp"
|
||||||
#include "omath/trigonometry/angles.hpp"
|
#include "omath/trigonometry/angles.hpp"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <compare>
|
||||||
#include <format>
|
#include <format>
|
||||||
|
#include <type_traits>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
namespace omath
|
namespace omath
|
||||||
@@ -17,7 +20,7 @@ namespace omath
|
|||||||
};
|
};
|
||||||
|
|
||||||
template<class Type = float, Type min = Type(0), Type max = Type(360), AngleFlags flags = AngleFlags::Normalized>
|
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
|
class Angle
|
||||||
{
|
{
|
||||||
Type m_angle;
|
Type m_angle;
|
||||||
@@ -42,7 +45,7 @@ namespace omath
|
|||||||
{
|
{
|
||||||
return Angle{degrees};
|
return Angle{degrees};
|
||||||
}
|
}
|
||||||
constexpr Angle() noexcept: m_angle(0)
|
constexpr Angle() noexcept: Angle(Type{0})
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
@@ -51,6 +54,30 @@ namespace omath
|
|||||||
return Angle{angles::radians_to_degrees<Type>(degrees)};
|
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]]
|
[[nodiscard]]
|
||||||
constexpr const Type& operator*() const noexcept
|
constexpr const Type& operator*() const noexcept
|
||||||
{
|
{
|
||||||
@@ -70,31 +97,25 @@ namespace omath
|
|||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
Type sin() const noexcept
|
constexpr Type sin() const noexcept
|
||||||
{
|
{
|
||||||
return std::sin(as_radians());
|
return internal::sin(as_radians());
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
Type cos() const noexcept
|
constexpr Type cos() const noexcept
|
||||||
{
|
{
|
||||||
return std::cos(as_radians());
|
return internal::cos(as_radians());
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
Type tan() const noexcept
|
constexpr Type tan() const noexcept
|
||||||
{
|
{
|
||||||
return std::tan(as_radians());
|
return internal::tan(as_radians());
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
Type atan() const noexcept
|
constexpr Type cot() const noexcept
|
||||||
{
|
|
||||||
return std::atan(as_radians());
|
|
||||||
}
|
|
||||||
|
|
||||||
[[nodiscard]]
|
|
||||||
Type cot() const noexcept
|
|
||||||
{
|
{
|
||||||
return cos() / sin();
|
return cos() / sin();
|
||||||
}
|
}
|
||||||
@@ -120,11 +141,12 @@ namespace omath
|
|||||||
|
|
||||||
constexpr Angle& operator-=(const Angle& other) noexcept
|
constexpr Angle& operator-=(const Angle& other) noexcept
|
||||||
{
|
{
|
||||||
return operator+=(-other);
|
*this = Angle{m_angle - other.m_angle};
|
||||||
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
constexpr Angle operator+(const Angle& other) noexcept
|
constexpr Angle operator+(const Angle& other) const noexcept
|
||||||
{
|
{
|
||||||
if constexpr (flags == AngleFlags::Normalized)
|
if constexpr (flags == AngleFlags::Normalized)
|
||||||
return Angle{angles::wrap_angle(m_angle + other.m_angle, min, max)};
|
return Angle{angles::wrap_angle(m_angle + other.m_angle, min, max)};
|
||||||
@@ -139,9 +161,9 @@ namespace omath
|
|||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
constexpr Angle operator-(const Angle& other) noexcept
|
constexpr Angle operator-(const Angle& other) const noexcept
|
||||||
{
|
{
|
||||||
return operator+(-other);
|
return Angle{m_angle - other.m_angle};
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
@@ -153,10 +175,11 @@ namespace omath
|
|||||||
} // namespace omath
|
} // namespace omath
|
||||||
|
|
||||||
template<class T, T MinV, T MaxV, omath::AngleFlags F>
|
template<class T, T MinV, T MaxV, omath::AngleFlags F>
|
||||||
struct std::formatter<omath::Angle<T, MinV, MaxV, F>, char> // NOLINT(*-dcl58-cpp)
|
struct std::formatter<omath::Angle<T, MinV, MaxV, F>, char> final // NOLINT(*-dcl58-cpp)
|
||||||
{
|
{
|
||||||
using AngleT = omath::Angle<T, MinV, MaxV, F>;
|
using AngleT = omath::Angle<T, MinV, MaxV, F>;
|
||||||
|
|
||||||
|
[[nodiscard]]
|
||||||
static constexpr auto parse(std::format_parse_context& ctx)
|
static constexpr auto parse(std::format_parse_context& ctx)
|
||||||
{
|
{
|
||||||
return ctx.begin();
|
return ctx.begin();
|
||||||
@@ -170,13 +193,13 @@ struct std::formatter<omath::Angle<T, MinV, MaxV, F>, char> // NOLINT(*-dcl58-cp
|
|||||||
return std::format_to(ctx.out(), "{}deg", a.as_degrees());
|
return std::format_to(ctx.out(), "{}deg", a.as_degrees());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// wchar_t formatter
|
// wchar_t formatter
|
||||||
template<class T, T MinV, T MaxV, omath::AngleFlags F>
|
template<class T, T MinV, T MaxV, omath::AngleFlags F>
|
||||||
struct std::formatter<omath::Angle<T, MinV, MaxV, F>, wchar_t> // NOLINT(*-dcl58-cpp)
|
struct std::formatter<omath::Angle<T, MinV, MaxV, F>, wchar_t> final // NOLINT(*-dcl58-cpp)
|
||||||
{
|
{
|
||||||
using AngleT = omath::Angle<T, MinV, MaxV, F>;
|
using AngleT = omath::Angle<T, MinV, MaxV, F>;
|
||||||
|
|
||||||
|
[[nodiscard]]
|
||||||
static constexpr auto parse(std::wformat_parse_context& ctx)
|
static constexpr auto parse(std::wformat_parse_context& ctx)
|
||||||
{
|
{
|
||||||
return ctx.begin();
|
return ctx.begin();
|
||||||
@@ -190,23 +213,3 @@ struct std::formatter<omath::Angle<T, MinV, MaxV, F>, wchar_t> // NOLINT(*-dcl58
|
|||||||
return std::format_to(ctx.out(), L"{}deg", a.as_degrees());
|
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> // NOLINT(*-dcl58-cpp)
|
|
||||||
{
|
|
||||||
using AngleT = omath::Angle<T, MinV, MaxV, F>;
|
|
||||||
|
|
||||||
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());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
#include "omath/internal/constexpr_math.hpp"
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <numbers>
|
#include <numbers>
|
||||||
|
|
||||||
@@ -24,37 +25,38 @@ namespace omath::angles
|
|||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
requires std::is_floating_point_v<Type>
|
requires std::is_floating_point_v<Type>
|
||||||
[[nodiscard]] Type horizontal_fov_to_vertical(const Type& horizontal_fov, const Type& aspect) noexcept
|
[[nodiscard]] constexpr Type horizontal_fov_to_vertical(const Type& horizontal_fov, const Type& aspect) noexcept
|
||||||
{
|
{
|
||||||
const auto fov_rad = degrees_to_radians(horizontal_fov);
|
const auto fov_rad = degrees_to_radians(horizontal_fov);
|
||||||
|
|
||||||
const auto vert_fov = static_cast<Type>(2) * std::atan(std::tan(fov_rad / static_cast<Type>(2)) / aspect);
|
const auto vert_fov =
|
||||||
|
static_cast<Type>(2) * internal::atan(internal::tan(fov_rad / static_cast<Type>(2)) / aspect);
|
||||||
|
|
||||||
return radians_to_degrees(vert_fov);
|
return radians_to_degrees(vert_fov);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
requires std::is_floating_point_v<Type>
|
requires std::is_floating_point_v<Type>
|
||||||
[[nodiscard]] Type vertical_fov_to_horizontal(const Type& vertical_fov, const Type& aspect) noexcept
|
[[nodiscard]] constexpr Type vertical_fov_to_horizontal(const Type& vertical_fov, const Type& aspect) noexcept
|
||||||
{
|
{
|
||||||
const auto fov_as_radians = degrees_to_radians(vertical_fov);
|
const auto fov_as_radians = degrees_to_radians(vertical_fov);
|
||||||
|
|
||||||
const auto horizontal_fov =
|
const auto horizontal_fov =
|
||||||
static_cast<Type>(2) * std::atan(std::tan(fov_as_radians / static_cast<Type>(2)) * aspect);
|
static_cast<Type>(2) * internal::atan(internal::tan(fov_as_radians / static_cast<Type>(2)) * aspect);
|
||||||
|
|
||||||
return radians_to_degrees(horizontal_fov);
|
return radians_to_degrees(horizontal_fov);
|
||||||
}
|
}
|
||||||
|
|
||||||
template<class Type>
|
template<class Type>
|
||||||
requires std::is_arithmetic_v<Type>
|
requires std::is_floating_point_v<Type>
|
||||||
[[nodiscard]] Type wrap_angle(const Type& angle, const Type& min, const Type& max) noexcept
|
[[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;
|
return angle;
|
||||||
|
|
||||||
const Type range = max - min;
|
const Type range = max - min;
|
||||||
|
|
||||||
Type wrapped_angle = std::fmod(angle - min, range);
|
Type wrapped_angle = internal::fmod(angle - min, range);
|
||||||
|
|
||||||
if (wrapped_angle < 0)
|
if (wrapped_angle < 0)
|
||||||
wrapped_angle += range;
|
wrapped_angle += range;
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ namespace omath
|
|||||||
RollType roll;
|
RollType roll;
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard]]
|
||||||
Vector3<ArithmeticType> as_vector3() const
|
constexpr Vector3<ArithmeticType> as_vector3() const
|
||||||
{
|
{
|
||||||
return {pitch.as_degrees(), yaw.as_degrees(), roll.as_degrees()};
|
return {pitch.as_degrees(), yaw.as_degrees(), roll.as_degrees()};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,13 +34,13 @@ namespace omath
|
|||||||
m_value.clamp(0.f, 1.f);
|
m_value.clamp(0.f, 1.f);
|
||||||
}
|
}
|
||||||
constexpr explicit Color() noexcept = default;
|
constexpr explicit Color() noexcept = default;
|
||||||
[[nodiscard]]
|
[[nodiscard("color result should not be discarded")]]
|
||||||
constexpr static Color from_rgba(const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t a) noexcept
|
constexpr static Color from_rgba(const uint8_t r, const uint8_t g, const uint8_t b, const uint8_t a) noexcept
|
||||||
{
|
{
|
||||||
return Color(Vector4<float>(r, g, b, a) / 255.f);
|
return Color(Vector4<float>(r, g, b, a) / 255.f);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("color result should not be discarded")]]
|
||||||
constexpr static Color from_hsv(float hue, const float saturation, const float value) noexcept
|
constexpr static Color from_hsv(float hue, const float saturation, const float value) noexcept
|
||||||
{
|
{
|
||||||
float r{}, g{}, b{};
|
float r{}, g{}, b{};
|
||||||
@@ -80,13 +80,13 @@ namespace omath
|
|||||||
return {r, g, b, 1.f};
|
return {r, g, b, 1.f};
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("color result should not be discarded")]]
|
||||||
constexpr static Color from_hsv(const Hsv& hsv) noexcept
|
constexpr static Color from_hsv(const Hsv& hsv) noexcept
|
||||||
{
|
{
|
||||||
return from_hsv(hsv.hue, hsv.saturation, hsv.value);
|
return from_hsv(hsv.hue, hsv.saturation, hsv.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]]
|
[[nodiscard("hsv result should not be discarded")]]
|
||||||
constexpr Hsv to_hsv() const noexcept
|
constexpr Hsv to_hsv() const noexcept
|
||||||
{
|
{
|
||||||
Hsv hsv_data;
|
Hsv hsv_data;
|
||||||
@@ -141,33 +141,33 @@ namespace omath
|
|||||||
|
|
||||||
*this = from_hsv(hsv);
|
*this = from_hsv(hsv);
|
||||||
}
|
}
|
||||||
[[nodiscard]]
|
[[nodiscard("blended color result should not be discarded")]]
|
||||||
constexpr Color blend(const Color& other, float ratio) const noexcept
|
constexpr Color blend(const Color& other, float ratio) const noexcept
|
||||||
{
|
{
|
||||||
ratio = std::clamp(ratio, 0.f, 1.f);
|
ratio = std::clamp(ratio, 0.f, 1.f);
|
||||||
return Color(this->m_value * (1.f - ratio) + other.m_value * ratio);
|
return Color(this->m_value * (1.f - ratio) + other.m_value * ratio);
|
||||||
}
|
}
|
||||||
|
|
||||||
[[nodiscard]] static constexpr Color red()
|
[[nodiscard("color result should not be discarded")]] static constexpr Color red()
|
||||||
{
|
{
|
||||||
return {1.f, 0.f, 0.f, 1.f};
|
return {1.f, 0.f, 0.f, 1.f};
|
||||||
}
|
}
|
||||||
[[nodiscard]] static constexpr Color green()
|
[[nodiscard("color result should not be discarded")]] static constexpr Color green()
|
||||||
{
|
{
|
||||||
return {0.f, 1.f, 0.f, 1.f};
|
return {0.f, 1.f, 0.f, 1.f};
|
||||||
}
|
}
|
||||||
[[nodiscard]] static constexpr Color blue()
|
[[nodiscard("color result should not be discarded")]] static constexpr Color blue()
|
||||||
{
|
{
|
||||||
return {0.f, 0.f, 1.f, 1.f};
|
return {0.f, 0.f, 1.f, 1.f};
|
||||||
}
|
}
|
||||||
#ifdef OMATH_IMGUI_INTEGRATION
|
#ifdef OMATH_IMGUI_INTEGRATION
|
||||||
[[nodiscard]]
|
[[nodiscard("ImColor result should not be discarded")]]
|
||||||
ImColor to_im_color() const noexcept
|
ImColor to_im_color() const noexcept
|
||||||
{
|
{
|
||||||
return {m_value.to_im_vec4()};
|
return {m_value.to_im_vec4()};
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
[[nodiscard]] std::string to_string() const noexcept
|
[[nodiscard("string result should not be discarded")]] std::string to_string() const noexcept
|
||||||
{
|
{
|
||||||
return std::format("[r:{}, g:{}, b:{}, a:{}]",
|
return std::format("[r:{}, g:{}, b:{}, a:{}]",
|
||||||
static_cast<int>(m_value.x * 255.f),
|
static_cast<int>(m_value.x * 255.f),
|
||||||
@@ -175,24 +175,24 @@ namespace omath
|
|||||||
static_cast<int>(m_value.z * 255.f),
|
static_cast<int>(m_value.z * 255.f),
|
||||||
static_cast<int>(m_value.w * 255.f));
|
static_cast<int>(m_value.w * 255.f));
|
||||||
}
|
}
|
||||||
[[nodiscard]] std::string to_rgbf_string() const noexcept
|
[[nodiscard("string result should not be discarded")]] std::string to_rgbf_string() const noexcept
|
||||||
{
|
{
|
||||||
return std::format("[r:{}, g:{}, b:{}, a:{}]",
|
return std::format("[r:{}, g:{}, b:{}, a:{}]",
|
||||||
m_value.x, m_value.y, m_value.z, m_value.w);
|
m_value.x, m_value.y, m_value.z, m_value.w);
|
||||||
}
|
}
|
||||||
[[nodiscard]] std::string to_hsv_string() const noexcept
|
[[nodiscard("string result should not be discarded")]] std::string to_hsv_string() const noexcept
|
||||||
{
|
{
|
||||||
const auto [hue, saturation, value] = to_hsv();
|
const auto [hue, saturation, value] = to_hsv();
|
||||||
return std::format("[h:{}, s:{}, v:{}]", hue, saturation, value);
|
return std::format("[h:{}, s:{}, v:{}]", hue, saturation, value);
|
||||||
}
|
}
|
||||||
[[nodiscard]] std::wstring to_wstring() const noexcept
|
[[nodiscard("wide string result should not be discarded")]] std::wstring to_wstring() const noexcept
|
||||||
{
|
{
|
||||||
const auto ascii_string = to_string();
|
const auto ascii_string = to_string();
|
||||||
return {ascii_string.cbegin(), ascii_string.cend()};
|
return {ascii_string.cbegin(), ascii_string.cend()};
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReSharper disable once CppInconsistentNaming
|
// ReSharper disable once CppInconsistentNaming
|
||||||
[[nodiscard]] std::u8string to_u8string() const noexcept
|
[[nodiscard("UTF-8 string result should not be discarded")]] std::u8string to_u8string() const noexcept
|
||||||
{
|
{
|
||||||
const auto ascii_string = to_string();
|
const auto ascii_string = to_string();
|
||||||
return {ascii_string.cbegin(), ascii_string.cend()};
|
return {ascii_string.cbegin(), ascii_string.cend()};
|
||||||
|
|||||||
@@ -38,18 +38,22 @@ namespace omath
|
|||||||
friend unit_test_pattern_scan_consteval_spacing_and_case_Test;
|
friend unit_test_pattern_scan_consteval_spacing_and_case_Test;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
template<std::size_t N>
|
template<std::size_t Length>
|
||||||
struct ConstevalPattern final
|
struct ConstevalPattern final
|
||||||
{
|
{
|
||||||
char value[N]{};
|
char value[Length]{};
|
||||||
|
|
||||||
// ReSharper disable once CppNonExplicitConvertingConstructor
|
// ReSharper disable once CppNonExplicitConvertingConstructor
|
||||||
constexpr ConstevalPattern(const char (&text)[N]) // NOLINT(*-explicit-constructor)
|
constexpr ConstevalPattern(const char (&text)[Length]) // NOLINT(*-explicit-constructor)
|
||||||
{
|
{
|
||||||
std::ranges::copy(text, value);
|
std::ranges::copy(text, value);
|
||||||
}
|
}
|
||||||
|
[[nodiscard("You forgot to use string")]]
|
||||||
|
constexpr operator std::string_view() const noexcept // NOLINT(*-explicit-constructor)
|
||||||
|
{
|
||||||
|
return {value, Length - 1};
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
[[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);
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
module;
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
#include <array>
|
||||||
|
#include <cassert>
|
||||||
|
#include <cmath>
|
||||||
|
#include <cstddef>
|
||||||
|
#include <cstdint>
|
||||||
|
#include <expected>
|
||||||
|
#include <filesystem>
|
||||||
|
#include <format>
|
||||||
|
#include <functional>
|
||||||
|
#include <initializer_list>
|
||||||
|
#include <iomanip>
|
||||||
|
#include <iterator>
|
||||||
|
#include <limits>
|
||||||
|
#include <memory>
|
||||||
|
#include <memory_resource>
|
||||||
|
#include <numbers>
|
||||||
|
#include <numeric>
|
||||||
|
#include <optional>
|
||||||
|
#include <queue>
|
||||||
|
#include <ranges>
|
||||||
|
#include <span>
|
||||||
|
#include <sstream>
|
||||||
|
#include <stdexcept>
|
||||||
|
#include <string>
|
||||||
|
#include <string_view>
|
||||||
|
#include <tuple>
|
||||||
|
#include <type_traits>
|
||||||
|
#include <unordered_map>
|
||||||
|
#include <utility>
|
||||||
|
#include <variant>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#if defined(OMATH_USE_AVX2)
|
||||||
|
#include <immintrin.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(OMATH_IMGUI_INTEGRATION)
|
||||||
|
#include <imgui.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(_WIN32)
|
||||||
|
#ifndef NOMINMAX
|
||||||
|
#define NOMINMAX
|
||||||
|
#endif
|
||||||
|
#include <windows.h>
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
#include <mach-o/dyld.h>
|
||||||
|
#elif defined(__linux__) || defined(__unix__)
|
||||||
|
#include <link.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
export module omath;
|
||||||
|
|
||||||
|
export {
|
||||||
|
#include "omath/omath.hpp"
|
||||||
|
}
|
||||||
@@ -177,9 +177,7 @@ if command -v genhtml >/dev/null 2>&1; then
|
|||||||
--title "Omath Coverage Report" \
|
--title "Omath Coverage Report" \
|
||||||
--show-details \
|
--show-details \
|
||||||
--legend \
|
--legend \
|
||||||
--demangle-cpp \
|
|
||||||
--num-spaces 4 \
|
--num-spaces 4 \
|
||||||
--sort \
|
|
||||||
--function-coverage \
|
--function-coverage \
|
||||||
--branch-coverage
|
--branch-coverage
|
||||||
|
|
||||||
|
|||||||
@@ -1,70 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 3/22/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/cry_engine/formulas.hpp"
|
|
||||||
|
|
||||||
namespace omath::cry_engine
|
|
||||||
{
|
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return mat_camera_view<float, MatStoreType::ROW_MAJOR>(forward_vector(angles), right_vector(angles),
|
|
||||||
up_vector(angles), cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
return mat_rotation_axis_z<float, MatStoreType::ROW_MAJOR>(angles.yaw)
|
|
||||||
* mat_rotation_axis_y<float, MatStoreType::ROW_MAJOR>(angles.roll)
|
|
||||||
* mat_rotation_axis_x<float, MatStoreType::ROW_MAJOR>(angles.pitch);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_origin(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_scale(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
const auto angles = mat_extract_rotation_zyx(mat);
|
|
||||||
return {
|
|
||||||
PitchAngle::from_degrees(angles.x),
|
|
||||||
YawAngle::from_degrees(angles.z),
|
|
||||||
RollAngle::from_degrees(angles.y),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
Mat4X4 calc_perspective_projection_matrix(const float field_of_view, const float aspect_ratio, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
|
||||||
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
|
||||||
field_of_view, aspect_ratio, near, far);
|
|
||||||
|
|
||||||
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
|
||||||
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
|
||||||
field_of_view, aspect_ratio, near, far);
|
|
||||||
std::unreachable();
|
|
||||||
}
|
|
||||||
} // namespace omath::cry_engine
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 8/11/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/cry_engine/traits/camera_trait.hpp"
|
|
||||||
|
|
||||||
namespace omath::cry_engine
|
|
||||||
{
|
|
||||||
|
|
||||||
ViewAngles CameraTrait::calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept
|
|
||||||
{
|
|
||||||
const auto direction = (look_at - cam_origin).normalized();
|
|
||||||
|
|
||||||
return {PitchAngle::from_radians(std::asin(direction.z)),
|
|
||||||
YawAngle::from_radians(-std::atan2(direction.x, direction.y)), RollAngle::from_radians(0.f)};
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return cry_engine::calc_view_matrix(angles, cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_projection_matrix(const projection::FieldOfView& fov,
|
|
||||||
const projection::ViewPort& view_port, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near, far,
|
|
||||||
ndc_depth_range);
|
|
||||||
}
|
|
||||||
} // namespace omath::cry_engine
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 3/22/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/frostbite_engine/formulas.hpp"
|
|
||||||
|
|
||||||
namespace omath::frostbite_engine
|
|
||||||
{
|
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return mat_camera_view<float, MatStoreType::ROW_MAJOR>(forward_vector(angles), right_vector(angles),
|
|
||||||
up_vector(angles), cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
return mat_rotation_axis_z<float, MatStoreType::ROW_MAJOR>(angles.roll)
|
|
||||||
* mat_rotation_axis_y<float, MatStoreType::ROW_MAJOR>(angles.yaw)
|
|
||||||
* mat_rotation_axis_x<float, MatStoreType::ROW_MAJOR>(angles.pitch);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_origin(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_scale(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
const auto angles = mat_extract_rotation_zyx(mat);
|
|
||||||
return {
|
|
||||||
PitchAngle::from_degrees(angles.x),
|
|
||||||
YawAngle::from_degrees(angles.y),
|
|
||||||
RollAngle::from_degrees(angles.z),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
Mat4X4 calc_perspective_projection_matrix(const float field_of_view, const float aspect_ratio, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
|
||||||
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
|
||||||
field_of_view, aspect_ratio, near, far);
|
|
||||||
|
|
||||||
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
|
||||||
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
|
||||||
field_of_view, aspect_ratio, near, far);
|
|
||||||
|
|
||||||
std::unreachable();
|
|
||||||
}
|
|
||||||
} // namespace omath::unity_engine
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 8/11/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/frostbite_engine/traits/camera_trait.hpp"
|
|
||||||
|
|
||||||
namespace omath::frostbite_engine
|
|
||||||
{
|
|
||||||
|
|
||||||
ViewAngles CameraTrait::calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept
|
|
||||||
{
|
|
||||||
const auto direction = (look_at - cam_origin).normalized();
|
|
||||||
|
|
||||||
return {PitchAngle::from_radians(-std::asin(direction.y)),
|
|
||||||
YawAngle::from_radians(std::atan2(direction.x, direction.z)), RollAngle::from_radians(0.f)};
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return frostbite_engine::calc_view_matrix(angles, cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_projection_matrix(const projection::FieldOfView& fov,
|
|
||||||
const projection::ViewPort& view_port, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near, far,
|
|
||||||
ndc_depth_range);
|
|
||||||
}
|
|
||||||
} // namespace omath::unity_engine
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 3/19/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/iw_engine/formulas.hpp"
|
|
||||||
|
|
||||||
namespace omath::iw_engine
|
|
||||||
{
|
|
||||||
|
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
return mat_rotation_axis_z(angles.yaw) * mat_rotation_axis_y(angles.pitch) * mat_rotation_axis_x(angles.roll);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_origin(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_scale(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
const auto angles = mat_extract_rotation_zyx(mat);
|
|
||||||
return {
|
|
||||||
PitchAngle::from_degrees(angles.y),
|
|
||||||
YawAngle::from_degrees(angles.z),
|
|
||||||
RollAngle::from_degrees(angles.x),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return mat_camera_view(forward_vector(angles), right_vector(angles), up_vector(angles), cam_origin);
|
|
||||||
}
|
|
||||||
|
|
||||||
Mat4X4 calc_perspective_projection_matrix(const float field_of_view, const float aspect_ratio, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
// InfinityWard Engine (inherited from Quake) stores FOV as horizontal FOV at a 4:3
|
|
||||||
// reference aspect. Convert to true vertical FOV, then delegate to the
|
|
||||||
// standard vertical-FOV left-handed builder with the caller's actual
|
|
||||||
// aspect ratio.
|
|
||||||
// vfov = 2 · atan( tan(hfov_4:3 / 2) / (4/3) )
|
|
||||||
constexpr float k_source_reference_aspect = 4.f / 3.f;
|
|
||||||
const auto vertical_fov = angles::horizontal_fov_to_vertical(field_of_view, k_source_reference_aspect);
|
|
||||||
|
|
||||||
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
|
||||||
return mat_perspective_left_handed_vertical_fov<
|
|
||||||
float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
|
||||||
vertical_fov, aspect_ratio, near, far);
|
|
||||||
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
|
||||||
return mat_perspective_left_handed_vertical_fov<
|
|
||||||
float, MatStoreType::ROW_MAJOR, NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
|
||||||
vertical_fov, aspect_ratio, near, far);
|
|
||||||
std::unreachable();
|
|
||||||
};
|
|
||||||
} // namespace omath::iw_engine
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 8/11/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/iw_engine/traits/camera_trait.hpp"
|
|
||||||
#include "omath/engines/iw_engine/formulas.hpp"
|
|
||||||
namespace omath::iw_engine
|
|
||||||
{
|
|
||||||
|
|
||||||
ViewAngles CameraTrait::calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept
|
|
||||||
{
|
|
||||||
const auto direction = (look_at - cam_origin).normalized();
|
|
||||||
|
|
||||||
return {PitchAngle::from_radians(-std::asin(direction.z)),
|
|
||||||
YawAngle::from_radians(std::atan2(direction.y, direction.x)), RollAngle::from_radians(0.f)};
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return iw_engine::calc_view_matrix(angles, cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_projection_matrix(const projection::FieldOfView& fov,
|
|
||||||
const projection::ViewPort& view_port, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near, far,
|
|
||||||
ndc_depth_range);
|
|
||||||
}
|
|
||||||
} // namespace omath::iw_engine
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 3/19/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/opengl_engine/formulas.hpp"
|
|
||||||
|
|
||||||
namespace omath::opengl_engine
|
|
||||||
{
|
|
||||||
|
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec =
|
|
||||||
rotation_matrix(angles) * mat_column_from_vector<float, MatStoreType::COLUMN_MAJOR>(k_abs_forward);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec =
|
|
||||||
rotation_matrix(angles) * mat_column_from_vector<float, MatStoreType::COLUMN_MAJOR>(k_abs_right);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector<float, MatStoreType::COLUMN_MAJOR>(k_abs_up);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return mat_look_at_right_handed(cam_origin, cam_origin + forward_vector(angles), up_vector(angles));
|
|
||||||
}
|
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
return mat_rotation_axis_z<float, MatStoreType::COLUMN_MAJOR>(angles.roll)
|
|
||||||
* mat_rotation_axis_y<float, MatStoreType::COLUMN_MAJOR>(angles.yaw)
|
|
||||||
* mat_rotation_axis_x<float, MatStoreType::COLUMN_MAJOR>(angles.pitch);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_origin(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_scale(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
const auto angles = mat_extract_rotation_zyx(mat);
|
|
||||||
return {
|
|
||||||
PitchAngle::from_degrees(angles.x),
|
|
||||||
YawAngle::from_degrees(angles.y),
|
|
||||||
RollAngle::from_degrees(angles.z),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
Mat4X4 calc_perspective_projection_matrix(const float field_of_view, const float aspect_ratio, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
|
||||||
return mat_perspective_right_handed_vertical_fov<float, MatStoreType::COLUMN_MAJOR, NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
|
||||||
field_of_view, aspect_ratio, near, far);
|
|
||||||
|
|
||||||
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
|
||||||
return mat_perspective_right_handed_vertical_fov<float, MatStoreType::COLUMN_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
|
||||||
field_of_view, aspect_ratio, near, far);
|
|
||||||
|
|
||||||
std::unreachable();
|
|
||||||
}
|
|
||||||
} // namespace omath::opengl_engine
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 8/11/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/opengl_engine/traits/camera_trait.hpp"
|
|
||||||
#include "omath/engines/opengl_engine/formulas.hpp"
|
|
||||||
|
|
||||||
namespace omath::opengl_engine
|
|
||||||
{
|
|
||||||
|
|
||||||
ViewAngles CameraTrait::calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept
|
|
||||||
{
|
|
||||||
const auto direction = (look_at - cam_origin).normalized();
|
|
||||||
|
|
||||||
return {PitchAngle::from_radians(std::asin(direction.y)),
|
|
||||||
YawAngle::from_radians(-std::atan2(direction.x, -direction.z)), RollAngle::from_radians(0.f)};
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return opengl_engine::calc_view_matrix(angles, cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_projection_matrix(const projection::FieldOfView& fov,
|
|
||||||
const projection::ViewPort& view_port, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near, far,
|
|
||||||
ndc_depth_range);
|
|
||||||
}
|
|
||||||
} // namespace omath::opengl_engine
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Orange on 6/3/2026.
|
|
||||||
//
|
|
||||||
#include "omath/engines/rage_engine/formulas.hpp"
|
|
||||||
|
|
||||||
namespace omath::rage_engine
|
|
||||||
{
|
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return mat_camera_view<float, MatStoreType::ROW_MAJOR>(forward_vector(angles), right_vector(angles),
|
|
||||||
up_vector(angles), cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
return mat_rotation_axis_z<float, MatStoreType::ROW_MAJOR>(angles.yaw)
|
|
||||||
* mat_rotation_axis_y<float, MatStoreType::ROW_MAJOR>(angles.roll)
|
|
||||||
* mat_rotation_axis_x<float, MatStoreType::ROW_MAJOR>(angles.pitch);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_origin(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_scale(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
const auto angles = mat_extract_rotation_zyx(mat);
|
|
||||||
return {
|
|
||||||
PitchAngle::from_degrees(angles.x),
|
|
||||||
YawAngle::from_degrees(angles.z),
|
|
||||||
RollAngle::from_degrees(angles.y),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
Mat4X4 calc_perspective_projection_matrix(const float field_of_view, const float aspect_ratio, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
|
||||||
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
|
||||||
field_of_view, aspect_ratio, near, far);
|
|
||||||
|
|
||||||
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
|
||||||
return mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
|
||||||
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
|
||||||
field_of_view, aspect_ratio, near, far);
|
|
||||||
std::unreachable();
|
|
||||||
}
|
|
||||||
} // namespace omath::rage_engine
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Orange on 6/3/2026.
|
|
||||||
//
|
|
||||||
#include "omath/engines/rage_engine/traits/camera_trait.hpp"
|
|
||||||
|
|
||||||
namespace omath::rage_engine
|
|
||||||
{
|
|
||||||
|
|
||||||
ViewAngles CameraTrait::calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept
|
|
||||||
{
|
|
||||||
const auto direction = (look_at - cam_origin).normalized();
|
|
||||||
|
|
||||||
return {PitchAngle::from_radians(std::asin(direction.z)),
|
|
||||||
YawAngle::from_radians(-std::atan2(direction.x, direction.y)), RollAngle::from_radians(0.f)};
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return rage_engine::calc_view_matrix(angles, cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_projection_matrix(const projection::FieldOfView& fov,
|
|
||||||
const projection::ViewPort& view_port, const float near, const float far,
|
|
||||||
const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near, far,
|
|
||||||
ndc_depth_range);
|
|
||||||
}
|
|
||||||
} // namespace omath::rage_engine
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 3/19/2025.
|
|
||||||
//
|
|
||||||
#include <omath/engines/source_engine/formulas.hpp>
|
|
||||||
|
|
||||||
namespace omath::source_engine
|
|
||||||
{
|
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
|
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
return mat_rotation_axis_z(angles.yaw) * mat_rotation_axis_y(angles.pitch) * mat_rotation_axis_x(angles.roll);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_origin(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_scale(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
const auto angles = mat_extract_rotation_zyx(mat);
|
|
||||||
return {
|
|
||||||
PitchAngle::from_degrees(angles.y),
|
|
||||||
YawAngle::from_degrees(angles.z),
|
|
||||||
RollAngle::from_degrees(angles.x),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
|
|
||||||
Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return mat_camera_view(forward_vector(angles), right_vector(angles), up_vector(angles), cam_origin);
|
|
||||||
}
|
|
||||||
|
|
||||||
Mat4X4 calc_perspective_projection_matrix(const float field_of_view, const float aspect_ratio, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
// Source (inherited from Quake) stores FOV as horizontal FOV at a 4:3
|
|
||||||
// reference aspect. Convert to true vertical FOV, then delegate to the
|
|
||||||
// standard vertical-FOV left-handed builder with the caller's actual
|
|
||||||
// aspect ratio.
|
|
||||||
// vfov = 2 · atan( tan(hfov_4:3 / 2) / (4/3) )
|
|
||||||
constexpr float k_source_reference_aspect = 4.f / 3.f;
|
|
||||||
const auto vertical_fov = angles::horizontal_fov_to_vertical(field_of_view, k_source_reference_aspect);
|
|
||||||
|
|
||||||
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
|
||||||
return mat_perspective_left_handed_vertical_fov<
|
|
||||||
float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
|
||||||
vertical_fov, aspect_ratio, near, far);
|
|
||||||
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
|
||||||
return mat_perspective_left_handed_vertical_fov<
|
|
||||||
float, MatStoreType::ROW_MAJOR, NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
|
||||||
vertical_fov, aspect_ratio, near, far);
|
|
||||||
std::unreachable();
|
|
||||||
}
|
|
||||||
} // namespace omath::source_engine
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 8/11/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/source_engine/traits/camera_trait.hpp"
|
|
||||||
#include "omath/engines/source_engine/formulas.hpp"
|
|
||||||
namespace omath::source_engine
|
|
||||||
{
|
|
||||||
|
|
||||||
ViewAngles CameraTrait::calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept
|
|
||||||
{
|
|
||||||
const auto direction = (look_at - cam_origin).normalized();
|
|
||||||
|
|
||||||
|
|
||||||
return {PitchAngle::from_radians(-std::asin(direction.z)),
|
|
||||||
YawAngle::from_radians(std::atan2(direction.y, direction.x)), RollAngle::from_radians(0.f)};
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return source_engine::calc_view_matrix(angles, cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_projection_matrix(const projection::FieldOfView& fov,
|
|
||||||
const projection::ViewPort& view_port, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near, far,
|
|
||||||
ndc_depth_range);
|
|
||||||
}
|
|
||||||
} // namespace omath::source_engine
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 3/22/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/unity_engine/formulas.hpp"
|
|
||||||
|
|
||||||
namespace omath::unity_engine
|
|
||||||
{
|
|
||||||
Vector3<float> forward_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<float> right_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<float> up_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return mat_camera_view<float, MatStoreType::ROW_MAJOR>(-forward_vector(angles), right_vector(angles),
|
|
||||||
up_vector(angles), cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
return mat_rotation_axis_z<float, MatStoreType::ROW_MAJOR>(angles.roll)
|
|
||||||
* mat_rotation_axis_y<float, MatStoreType::ROW_MAJOR>(angles.yaw)
|
|
||||||
* mat_rotation_axis_x<float, MatStoreType::ROW_MAJOR>(angles.pitch);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_origin(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_origin(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<float> extract_scale(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_scale(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
const auto angles = mat_extract_rotation_zyx(mat);
|
|
||||||
return {
|
|
||||||
PitchAngle::from_degrees(angles.x),
|
|
||||||
YawAngle::from_degrees(angles.y),
|
|
||||||
RollAngle::from_degrees(angles.z),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
Mat4X4 calc_perspective_projection_matrix(const float field_of_view, const float aspect_ratio, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
|
||||||
return omath::mat_perspective_right_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
|
||||||
field_of_view, aspect_ratio, near, far);
|
|
||||||
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
|
||||||
return omath::mat_perspective_right_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
|
||||||
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(field_of_view, aspect_ratio,
|
|
||||||
near, far);
|
|
||||||
std::unreachable();
|
|
||||||
}
|
|
||||||
} // namespace omath::unity_engine
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 8/11/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/unity_engine/traits/camera_trait.hpp"
|
|
||||||
|
|
||||||
namespace omath::unity_engine
|
|
||||||
{
|
|
||||||
|
|
||||||
ViewAngles CameraTrait::calc_look_at_angle(const Vector3<float>& cam_origin, const Vector3<float>& look_at) noexcept
|
|
||||||
{
|
|
||||||
const auto direction = (look_at - cam_origin).normalized();
|
|
||||||
|
|
||||||
return {PitchAngle::from_radians(-std::asin(direction.y)),
|
|
||||||
YawAngle::from_radians(std::atan2(direction.x, direction.z)), RollAngle::from_radians(0.f)};
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_view_matrix(const ViewAngles& angles, const Vector3<float>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return unity_engine::calc_view_matrix(angles, cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_projection_matrix(const projection::FieldOfView& fov,
|
|
||||||
const projection::ViewPort& view_port, const float near,
|
|
||||||
const float far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near, far,
|
|
||||||
ndc_depth_range);
|
|
||||||
}
|
|
||||||
} // namespace omath::unity_engine
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 3/22/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/unreal_engine/formulas.hpp"
|
|
||||||
namespace omath::unreal_engine
|
|
||||||
{
|
|
||||||
Vector3<double> forward_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_forward);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<double> right_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_right);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Vector3<double> up_vector(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
const auto vec = rotation_matrix(angles) * mat_column_from_vector(k_abs_up);
|
|
||||||
|
|
||||||
return {vec.at(0, 0), vec.at(1, 0), vec.at(2, 0)};
|
|
||||||
}
|
|
||||||
Mat4X4 calc_view_matrix(const ViewAngles& angles, const Vector3<double>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return mat_camera_view<double, MatStoreType::ROW_MAJOR>(forward_vector(angles), right_vector(angles),
|
|
||||||
up_vector(angles), cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 rotation_matrix(const ViewAngles& angles) noexcept
|
|
||||||
{
|
|
||||||
// UE FRotator is intrinsic Z-Y-X (Yaw → Pitch → Roll applied in local
|
|
||||||
// frame), which for column-vector composition is Rz·Ry·Rx.
|
|
||||||
// Pitch and roll axes in omath spin opposite to UE's convention, so
|
|
||||||
// both carry a sign flip.
|
|
||||||
return mat_rotation_axis_z<double, MatStoreType::ROW_MAJOR>(angles.yaw)
|
|
||||||
* mat_rotation_axis_y<double, MatStoreType::ROW_MAJOR>(-angles.pitch)
|
|
||||||
* mat_rotation_axis_x<double, MatStoreType::ROW_MAJOR>(-angles.roll);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Vector3<double> extract_origin(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_origin(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
Vector3<double> extract_scale(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
return mat_extract_scale(mat);
|
|
||||||
}
|
|
||||||
|
|
||||||
ViewAngles extract_rotation_angles(const Mat4X4& mat) noexcept
|
|
||||||
{
|
|
||||||
const auto angles = mat_extract_rotation_zyx(mat);
|
|
||||||
return {
|
|
||||||
PitchAngle::from_degrees(-angles.y),
|
|
||||||
YawAngle::from_degrees(angles.z),
|
|
||||||
RollAngle::from_degrees(-angles.x),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
Mat4X4 calc_perspective_projection_matrix(const double field_of_view, const double aspect_ratio, const double near,
|
|
||||||
const double far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
// UE stores horizontal FOV in FMinimalViewInfo — use the left-handed
|
|
||||||
// horizontal-FOV builder directly.
|
|
||||||
if (ndc_depth_range == NDCDepthRange::ZERO_TO_ONE)
|
|
||||||
return mat_perspective_left_handed_horizontal_fov<
|
|
||||||
double, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
|
||||||
field_of_view, aspect_ratio, near, far);
|
|
||||||
if (ndc_depth_range == NDCDepthRange::NEGATIVE_ONE_TO_ONE)
|
|
||||||
return mat_perspective_left_handed_horizontal_fov<
|
|
||||||
double, MatStoreType::ROW_MAJOR, NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
|
||||||
field_of_view, aspect_ratio, near, far);
|
|
||||||
std::unreachable();
|
|
||||||
}
|
|
||||||
} // namespace omath::unreal_engine
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
//
|
|
||||||
// Created by Vlad on 8/11/2025.
|
|
||||||
//
|
|
||||||
#include "omath/engines/unreal_engine/traits/camera_trait.hpp"
|
|
||||||
|
|
||||||
namespace omath::unreal_engine
|
|
||||||
{
|
|
||||||
|
|
||||||
ViewAngles CameraTrait::calc_look_at_angle(const Vector3<double>& cam_origin, const Vector3<double>& look_at) noexcept
|
|
||||||
{
|
|
||||||
const auto direction = (look_at - cam_origin).normalized();
|
|
||||||
|
|
||||||
return {PitchAngle::from_radians(std::asin(direction.z)),
|
|
||||||
YawAngle::from_radians(std::atan2(direction.y, direction.x)), RollAngle::from_radians(0.f)};
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_view_matrix(const ViewAngles& angles, const Vector3<double>& cam_origin) noexcept
|
|
||||||
{
|
|
||||||
return unreal_engine::calc_view_matrix(angles, cam_origin);
|
|
||||||
}
|
|
||||||
Mat4X4 CameraTrait::calc_projection_matrix(const projection::FieldOfView& fov,
|
|
||||||
const projection::ViewPort& view_port, const double near,
|
|
||||||
const double far, const NDCDepthRange ndc_depth_range) noexcept
|
|
||||||
{
|
|
||||||
return calc_perspective_projection_matrix(fov.as_degrees(), view_port.aspect_ratio(), near, far,
|
|
||||||
ndc_depth_range);
|
|
||||||
}
|
|
||||||
} // namespace omath::unreal_engine
|
|
||||||
+331
-86
@@ -2,6 +2,7 @@
|
|||||||
// Created by orange on 13.03.2026.
|
// Created by orange on 13.03.2026.
|
||||||
//
|
//
|
||||||
#include "omath/hud/entity_overlay.hpp"
|
#include "omath/hud/entity_overlay.hpp"
|
||||||
|
#include <limits>
|
||||||
|
|
||||||
namespace omath::hud
|
namespace omath::hud
|
||||||
{
|
{
|
||||||
@@ -20,6 +21,20 @@ namespace omath::hud
|
|||||||
|
|
||||||
return *this;
|
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,
|
EntityOverlay& EntityOverlay::add_cornered_2d_box(const Color& box_color, const Color& fill_color,
|
||||||
const Color& outline_color, const float corner_ratio_len,
|
const Color& outline_color, const float corner_ratio_len,
|
||||||
const float thickness)
|
const float thickness)
|
||||||
@@ -38,11 +53,9 @@ namespace omath::hud
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Left Side
|
// Left Side
|
||||||
draw_corner_line(m_canvas.top_left_corner,
|
draw_corner_line(m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2<float>{corner_line_length, 0.f});
|
||||||
m_canvas.top_left_corner + Vector2<float>{corner_line_length, 0.f});
|
|
||||||
|
|
||||||
draw_corner_line(m_canvas.top_left_corner,
|
draw_corner_line(m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2<float>{0.f, corner_line_length});
|
||||||
m_canvas.top_left_corner + Vector2<float>{0.f, corner_line_length});
|
|
||||||
|
|
||||||
draw_corner_line(m_canvas.bottom_left_corner,
|
draw_corner_line(m_canvas.bottom_left_corner,
|
||||||
m_canvas.bottom_left_corner - Vector2<float>{0.f, corner_line_length});
|
m_canvas.bottom_left_corner - Vector2<float>{0.f, corner_line_length});
|
||||||
@@ -64,76 +77,84 @@ namespace omath::hud
|
|||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
EntityOverlay& EntityOverlay::add_right_bar(const Color& color, const Color& outline_color, const Color& bg_color,
|
EntityOverlay& EntityOverlay::add_right_bar(const widget::BarPaint& color, const Color& outline_color,
|
||||||
const float width, float ratio, const float offset)
|
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);
|
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 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};
|
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);
|
draw_glow_rectangle(fill_min, bar_max, glow);
|
||||||
m_renderer->add_rectangle(bar_start - Vector2<float>(1.f, 0.f),
|
draw_filled_rectangle(fill_min, bar_max, resolve_bar_paint(color, ratio, true));
|
||||||
bar_start + Vector2<float>(width, -max_bar_height), outline_color);
|
m_renderer->add_rectangle(bar_min, bar_max, outline_color);
|
||||||
|
|
||||||
m_text_cursor_right.x += offset + width;
|
m_text_cursor_right.x += offset + width;
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
EntityOverlay& EntityOverlay::add_left_bar(const Color& color, const Color& outline_color, const Color& bg_color,
|
EntityOverlay& EntityOverlay::add_left_bar(const widget::BarPaint& color, const Color& outline_color,
|
||||||
const float width, float ratio, const float offset)
|
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);
|
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 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};
|
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);
|
draw_glow_rectangle(fill_min, bar_max, glow);
|
||||||
m_renderer->add_rectangle(bar_start - Vector2<float>(1.f, 0.f),
|
draw_filled_rectangle(fill_min, bar_max, resolve_bar_paint(color, ratio, true));
|
||||||
bar_start + Vector2<float>(width, -max_bar_height), outline_color);
|
m_renderer->add_rectangle(bar_min, bar_max, outline_color);
|
||||||
|
|
||||||
m_text_cursor_left.x -= offset + width;
|
m_text_cursor_left.x -= offset + width;
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
EntityOverlay& EntityOverlay::add_right_label(const Color& color, const float offset,
|
EntityOverlay& EntityOverlay::add_right_label(const widget::Paint& color, const float offset,
|
||||||
const widget::Outlined outlined,
|
const widget::Outlined outlined, const std::string_view& text,
|
||||||
const std::string_view& text)
|
const std::optional<widget::Glow>& glow)
|
||||||
{
|
{
|
||||||
if (outlined == widget::Outlined::On)
|
draw_label(m_text_cursor_right + Vector2<float>{offset, 0.f}, color, outlined, text, glow);
|
||||||
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());
|
|
||||||
|
|
||||||
m_text_cursor_right.y += m_renderer->calc_text_size(text.data()).y;
|
m_text_cursor_right.y += m_renderer->calc_text_size(text.data()).y;
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
EntityOverlay& EntityOverlay::add_top_label(const Color& color, const float offset, const widget::Outlined outlined,
|
EntityOverlay& EntityOverlay::add_top_label(const widget::Paint& color, const float offset,
|
||||||
const std::string_view text)
|
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;
|
m_text_cursor_top.y -= m_renderer->calc_text_size(text.data()).y;
|
||||||
|
|
||||||
if (outlined == widget::Outlined::On)
|
draw_label(m_text_cursor_top + Vector2<float>{0.f, -offset}, color, outlined, text, glow);
|
||||||
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());
|
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
EntityOverlay& EntityOverlay::add_top_bar(const Color& color, const Color& outline_color, const Color& bg_color,
|
EntityOverlay& EntityOverlay::add_top_bar(const widget::BarPaint& color, const Color& outline_color,
|
||||||
const float height, float ratio, const float offset)
|
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);
|
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 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};
|
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);
|
draw_glow_rectangle(bar_min, fill_max, glow);
|
||||||
m_renderer->add_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, -height), outline_color);
|
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;
|
m_text_cursor_top.y -= offset + height;
|
||||||
|
|
||||||
@@ -316,6 +337,14 @@ namespace omath::hud
|
|||||||
return *this;
|
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,
|
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
|
const float dash_len, const float gap_len, const float thickness) const
|
||||||
{
|
{
|
||||||
@@ -366,84 +395,265 @@ namespace omath::hud
|
|||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
void EntityOverlay::draw_outlined_text(const Vector2<float>& position, const Color& color,
|
void EntityOverlay::draw_label(const Vector2<float>& position, const widget::Paint& paint,
|
||||||
const std::string_view& text)
|
const widget::Outlined outlined, const std::string_view& text,
|
||||||
|
const std::optional<widget::Glow>& glow)
|
||||||
{
|
{
|
||||||
static constexpr std::array outline_offsets = {
|
if (glow)
|
||||||
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}};
|
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)
|
if (outlined == widget::Outlined::On)
|
||||||
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());
|
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);
|
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 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};
|
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);
|
const auto bar_min = bar_start;
|
||||||
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width * ratio, height), color);
|
const auto bar_max = bar_start + Vector2<float>{max_bar_width, height};
|
||||||
m_renderer->add_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, height), outline_color);
|
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;
|
m_text_cursor_bottom.y += offset + height;
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
EntityOverlay& EntityOverlay::add_bottom_label(const Color& color, const float offset, const widget::Outlined outlined,
|
EntityOverlay& EntityOverlay::add_bottom_label(const widget::Paint& color, const float offset,
|
||||||
const std::string_view text)
|
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 text_size = m_renderer->calc_text_size(text);
|
||||||
|
|
||||||
if (outlined == widget::Outlined::On)
|
draw_label(m_text_cursor_bottom + Vector2<float>{0.f, offset}, color, outlined, text, glow);
|
||||||
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);
|
|
||||||
|
|
||||||
m_text_cursor_bottom.y += text_size.y;
|
m_text_cursor_bottom.y += text_size.y;
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
EntityOverlay& EntityOverlay::add_left_label(const Color& color, const float offset, const widget::Outlined outlined,
|
EntityOverlay& EntityOverlay::add_left_label(const widget::Paint& color, const float offset,
|
||||||
const std::string_view& text)
|
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 text_size = m_renderer->calc_text_size(text);
|
||||||
const auto pos = m_text_cursor_left + Vector2<float>{-(offset + text_size.x), 0.f};
|
const auto pos = m_text_cursor_left + Vector2<float>{-(offset + text_size.x), 0.f};
|
||||||
|
|
||||||
if (outlined == widget::Outlined::On)
|
draw_label(pos, color, outlined, text, glow);
|
||||||
draw_outlined_text(pos, color, text);
|
|
||||||
else
|
|
||||||
m_renderer->add_text(pos, color, text);
|
|
||||||
|
|
||||||
m_text_cursor_left.y += text_size.y;
|
m_text_cursor_left.y += text_size.y;
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
EntityOverlay& EntityOverlay::add_centered_bottom_label(const Color& color, const float offset, const widget::Outlined outlined,
|
EntityOverlay& EntityOverlay::add_centered_bottom_label(const widget::Paint& color, const float offset,
|
||||||
const std::string_view& text)
|
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 text_size = m_renderer->calc_text_size(text);
|
||||||
const auto box_center_x =
|
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;
|
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};
|
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_label(pos, color, outlined, text, glow);
|
||||||
draw_outlined_text(pos, color, text);
|
|
||||||
else
|
|
||||||
m_renderer->add_text(pos, color, text);
|
|
||||||
|
|
||||||
m_text_cursor_bottom.y += text_size.y;
|
m_text_cursor_bottom.y += text_size.y;
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
EntityOverlay& EntityOverlay::add_centered_top_label(const Color& color, const float offset, const widget::Outlined outlined,
|
EntityOverlay& EntityOverlay::add_centered_top_label(const widget::Paint& color, const float offset,
|
||||||
const std::string_view& text)
|
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 text_size = m_renderer->calc_text_size(text);
|
||||||
const auto box_center_x =
|
const auto box_center_x =
|
||||||
@@ -452,10 +662,7 @@ namespace omath::hud
|
|||||||
m_text_cursor_top.y -= text_size.y;
|
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};
|
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_label(pos, color, outlined, text, glow);
|
||||||
draw_outlined_text(pos, color, text);
|
|
||||||
else
|
|
||||||
m_renderer->add_text(pos, color, text);
|
|
||||||
|
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
@@ -601,11 +808,43 @@ namespace omath::hud
|
|||||||
// ── widget dispatch ───────────────────────────────────────────────────────
|
// ── widget dispatch ───────────────────────────────────────────────────────
|
||||||
void EntityOverlay::dispatch(const widget::Box& box)
|
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)
|
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,
|
add_cornered_2d_box(cornered_box.color, cornered_box.fill, cornered_box.outline, cornered_box.corner_ratio,
|
||||||
cornered_box.thickness);
|
cornered_box.thickness);
|
||||||
}
|
}
|
||||||
@@ -617,7 +856,10 @@ namespace omath::hud
|
|||||||
|
|
||||||
void EntityOverlay::dispatch(const widget::Skeleton& skeleton)
|
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)
|
void EntityOverlay::dispatch(const widget::SnapLine& snap_line)
|
||||||
@@ -704,7 +946,7 @@ namespace omath::hud
|
|||||||
},
|
},
|
||||||
[this](const widget::Bar& w)
|
[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)
|
[this](const widget::DashedBar& w)
|
||||||
{
|
{
|
||||||
@@ -713,11 +955,12 @@ namespace omath::hud
|
|||||||
},
|
},
|
||||||
[this](const widget::Label& w)
|
[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)
|
[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)
|
[this](const widget::SpaceVertical& w)
|
||||||
{
|
{
|
||||||
@@ -750,7 +993,7 @@ namespace omath::hud
|
|||||||
},
|
},
|
||||||
[this](const widget::Bar& w)
|
[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)
|
[this](const widget::DashedBar& w)
|
||||||
{
|
{
|
||||||
@@ -759,11 +1002,12 @@ namespace omath::hud
|
|||||||
},
|
},
|
||||||
[this](const widget::Label& w)
|
[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)
|
[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)
|
[this](const widget::SpaceVertical& w)
|
||||||
{
|
{
|
||||||
@@ -796,7 +1040,7 @@ namespace omath::hud
|
|||||||
},
|
},
|
||||||
[this](const widget::Bar& w)
|
[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)
|
[this](const widget::DashedBar& w)
|
||||||
{
|
{
|
||||||
@@ -805,11 +1049,12 @@ namespace omath::hud
|
|||||||
},
|
},
|
||||||
[this](const widget::Label& w)
|
[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)
|
[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)
|
[this](const widget::SpaceVertical& w)
|
||||||
{
|
{
|
||||||
@@ -841,7 +1086,7 @@ namespace omath::hud
|
|||||||
},
|
},
|
||||||
[this](const widget::Bar& w)
|
[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)
|
[this](const widget::DashedBar& w)
|
||||||
{
|
{
|
||||||
@@ -850,12 +1095,12 @@ namespace omath::hud
|
|||||||
},
|
},
|
||||||
[this](const widget::Label& w)
|
[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)
|
[this](const widget::Centered<widget::Label>& w)
|
||||||
{
|
{
|
||||||
add_centered_bottom_label(w.child.color, w.child.offset, w.child.outlined,
|
add_centered_bottom_label(w.child.color, w.child.offset, w.child.outlined, w.child.text,
|
||||||
w.child.text);
|
w.child.glow);
|
||||||
},
|
},
|
||||||
[this](const widget::SpaceVertical& w)
|
[this](const widget::SpaceVertical& w)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,7 +4,9 @@
|
|||||||
#include "omath/hud/renderer_realizations/imgui_renderer.hpp"
|
#include "omath/hud/renderer_realizations/imgui_renderer.hpp"
|
||||||
|
|
||||||
#ifdef OMATH_IMGUI_INTEGRATION
|
#ifdef OMATH_IMGUI_INTEGRATION
|
||||||
|
#include <cmath>
|
||||||
#include <imgui.h>
|
#include <imgui.h>
|
||||||
|
#include <imgui_internal.h>
|
||||||
|
|
||||||
namespace omath::hud
|
namespace omath::hud
|
||||||
{
|
{
|
||||||
@@ -25,10 +27,21 @@ namespace omath::hud
|
|||||||
ImDrawFlags_Closed, thickness);
|
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)
|
void ImguiHudRenderer::add_filled_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color)
|
||||||
{
|
{
|
||||||
ImGui::GetBackgroundDrawList()->AddConvexPolyFilled(reinterpret_cast<const ImVec2*>(vertexes.data()),
|
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)
|
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());
|
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,
|
void ImguiHudRenderer::add_gradient_rectangle(const Vector2<float>& min, const Vector2<float>& max,
|
||||||
const float thickness, const int segments)
|
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,
|
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);
|
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,
|
void ImguiHudRenderer::add_arc(const Vector2<float>& center, const float radius, const float a_min,
|
||||||
const Color& color, const float thickness, const int segments)
|
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()->PathArcTo(center.to_im_vec2(), radius, a_min, a_max, segments);
|
||||||
ImGui::GetBackgroundDrawList()->PathStroke(color.to_im_color(), ImDrawFlags_None, thickness);
|
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,
|
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(),
|
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)
|
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(),
|
ImGui::GetBackgroundDrawList()->AddText(position.to_im_vec2(), color.to_im_color(), text.data(),
|
||||||
text.data() + text.size());
|
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]]
|
[[nodiscard]]
|
||||||
Vector2<float> ImguiHudRenderer::calc_text_size(const std::string_view& text)
|
Vector2<float> ImguiHudRenderer::calc_text_size(const std::string_view& text)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -119,11 +119,11 @@ namespace
|
|||||||
switch (axis)
|
switch (axis)
|
||||||
{
|
{
|
||||||
case omath::primitives::UpAxis::X:
|
case omath::primitives::UpAxis::X:
|
||||||
return aabb.top<omath::primitives::UpAxis::X>();
|
return omath::primitives::Aabb<float, omath::primitives::UpAxis::X>{aabb.min, aabb.max}.top();
|
||||||
case omath::primitives::UpAxis::Y:
|
case omath::primitives::UpAxis::Y:
|
||||||
return aabb.top<omath::primitives::UpAxis::Y>();
|
return aabb.top();
|
||||||
case omath::primitives::UpAxis::Z:
|
case omath::primitives::UpAxis::Z:
|
||||||
return aabb.top<omath::primitives::UpAxis::Z>();
|
return omath::primitives::Aabb<float, omath::primitives::UpAxis::Z>{aabb.min, aabb.max}.top();
|
||||||
}
|
}
|
||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
@@ -133,11 +133,11 @@ namespace
|
|||||||
switch (axis)
|
switch (axis)
|
||||||
{
|
{
|
||||||
case omath::primitives::UpAxis::X:
|
case omath::primitives::UpAxis::X:
|
||||||
return aabb.bottom<omath::primitives::UpAxis::X>();
|
return omath::primitives::Aabb<float, omath::primitives::UpAxis::X>{aabb.min, aabb.max}.bottom();
|
||||||
case omath::primitives::UpAxis::Y:
|
case omath::primitives::UpAxis::Y:
|
||||||
return aabb.bottom<omath::primitives::UpAxis::Y>();
|
return aabb.bottom();
|
||||||
case omath::primitives::UpAxis::Z:
|
case omath::primitives::UpAxis::Z:
|
||||||
return aabb.bottom<omath::primitives::UpAxis::Z>();
|
return omath::primitives::Aabb<float, omath::primitives::UpAxis::Z>{aabb.min, aabb.max}.bottom();
|
||||||
}
|
}
|
||||||
std::unreachable();
|
std::unreachable();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -474,7 +474,7 @@ namespace omath
|
|||||||
{
|
{
|
||||||
const auto* section = section_table + i;
|
const auto* section = section_table + i;
|
||||||
|
|
||||||
if (std::string_view{section->name, sizeof(section->name)} != target_section_name
|
if (std::string_view{section->name} != target_section_name
|
||||||
|| section->size_raw_data == 0)
|
|| section->size_raw_data == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,11 @@ include(GoogleTest)
|
|||||||
file(GLOB_RECURSE UNIT_TESTS_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/general/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/engines/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
|
file(GLOB_RECURSE UNIT_TESTS_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/general/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/engines/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
|
||||||
add_executable(${PROJECT_NAME} ${UNIT_TESTS_SOURCES} main.cpp)
|
add_executable(${PROJECT_NAME} ${UNIT_TESTS_SOURCES} main.cpp)
|
||||||
|
|
||||||
|
if(OMATH_ENABLE_MODULES)
|
||||||
|
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_SCAN_FOR_MODULES ON)
|
||||||
|
target_sources(${PROJECT_NAME} PRIVATE modules/unit_test_module.cpp)
|
||||||
|
endif()
|
||||||
|
|
||||||
set_target_properties(
|
set_target_properties(
|
||||||
${PROJECT_NAME}
|
${PROJECT_NAME}
|
||||||
PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
|
PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/${CMAKE_BUILD_TYPE}"
|
||||||
|
|||||||
@@ -9,6 +9,96 @@
|
|||||||
#include <ranges>
|
#include <ranges>
|
||||||
|
|
||||||
using namespace omath;
|
using namespace omath;
|
||||||
|
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
constexpr bool close_to(const float actual, const float expected, const float epsilon)
|
||||||
|
{
|
||||||
|
const float diff = actual - expected;
|
||||||
|
return (diff < 0.0f ? -diff : diff) <= epsilon;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr bool vec_close_to(const Vector3<float>& actual, const Vector3<float>& expected, const float epsilon)
|
||||||
|
{
|
||||||
|
return close_to(actual.x, expected.x, epsilon) && close_to(actual.y, expected.y, epsilon)
|
||||||
|
&& close_to(actual.z, expected.z, epsilon);
|
||||||
|
}
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
static_assert(
|
||||||
|
[]
|
||||||
|
{
|
||||||
|
constexpr omath::cry_engine::ViewAngles angles{};
|
||||||
|
constexpr auto forward = omath::cry_engine::forward_vector(angles);
|
||||||
|
constexpr auto right = omath::cry_engine::right_vector(angles);
|
||||||
|
constexpr auto up = omath::cry_engine::up_vector(angles);
|
||||||
|
constexpr auto rotation = omath::cry_engine::rotation_matrix(angles);
|
||||||
|
|
||||||
|
return vec_close_to(forward, omath::cry_engine::k_abs_forward, 1e-5f)
|
||||||
|
&& vec_close_to(right, omath::cry_engine::k_abs_right, 1e-5f)
|
||||||
|
&& vec_close_to(up, omath::cry_engine::k_abs_up, 1e-5f) && close_to(rotation.at(0, 0), 1.0f, 1e-5f)
|
||||||
|
&& close_to(rotation.at(1, 1), 1.0f, 1e-5f) && close_to(rotation.at(2, 2), 1.0f, 1e-5f)
|
||||||
|
&& close_to(rotation.at(3, 3), 1.0f, 1e-5f);
|
||||||
|
}(),
|
||||||
|
"CryEngine basis vectors should be constexpr with embedded constexpr math");
|
||||||
|
|
||||||
|
static_assert(
|
||||||
|
[]
|
||||||
|
{
|
||||||
|
constexpr auto view = omath::cry_engine::calc_view_matrix({}, {});
|
||||||
|
return close_to(view.at(0, 0), 1.0f, 1e-5f) && close_to(view.at(1, 2), 1.0f, 1e-5f)
|
||||||
|
&& close_to(view.at(2, 1), 1.0f, 1e-5f) && close_to(view.at(3, 3), 1.0f, 1e-5f);
|
||||||
|
}(),
|
||||||
|
"CryEngine view matrix should be constexpr with embedded constexpr math");
|
||||||
|
|
||||||
|
static_assert(
|
||||||
|
[]
|
||||||
|
{
|
||||||
|
constexpr auto transform = mat_translation<float, MatStoreType::ROW_MAJOR>({1.0f, 2.0f, 3.0f})
|
||||||
|
* mat_scale<float, MatStoreType::ROW_MAJOR>({2.0f, 3.0f, 4.0f});
|
||||||
|
constexpr auto origin = omath::cry_engine::extract_origin(transform);
|
||||||
|
constexpr auto scale = omath::cry_engine::extract_scale(transform);
|
||||||
|
|
||||||
|
return vec_close_to(origin, {1.0f, 2.0f, 3.0f}, 1e-5f) && vec_close_to(scale, {2.0f, 3.0f, 4.0f}, 1e-5f);
|
||||||
|
}(),
|
||||||
|
"CryEngine transform extraction should be constexpr with embedded constexpr math");
|
||||||
|
|
||||||
|
static_assert(
|
||||||
|
[]
|
||||||
|
{
|
||||||
|
constexpr auto projection = omath::cry_engine::calc_perspective_projection_matrix(
|
||||||
|
90.0f, 1.0f, 1.0f, 11.0f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
|
return close_to(projection.at(0, 0), 1.0f, 1e-5f) && close_to(projection.at(1, 1), 1.0f, 1e-5f)
|
||||||
|
&& close_to(projection.at(2, 2), 1.1f, 1e-5f) && close_to(projection.at(2, 3), -1.1f, 1e-5f)
|
||||||
|
&& close_to(projection.at(3, 2), 1.0f, 1e-5f);
|
||||||
|
}(),
|
||||||
|
"CryEngine projection matrix should be constexpr with embedded constexpr math");
|
||||||
|
|
||||||
|
static_assert(
|
||||||
|
[]
|
||||||
|
{
|
||||||
|
constexpr auto angles =
|
||||||
|
omath::cry_engine::CameraTrait::calc_look_at_angle({}, omath::cry_engine::k_abs_forward);
|
||||||
|
constexpr auto view = omath::cry_engine::CameraTrait::calc_view_matrix(angles, {});
|
||||||
|
constexpr auto projection = omath::cry_engine::CameraTrait::calc_projection_matrix(
|
||||||
|
projection::FieldOfView::from_degrees(90.0f), {1.0f, 1.0f}, 1.0f, 11.0f,
|
||||||
|
NDCDepthRange::ZERO_TO_ONE);
|
||||||
|
|
||||||
|
return close_to(angles.pitch.as_degrees(), 0.0f, 1e-5f) && close_to(angles.yaw.as_degrees(), 0.0f, 1e-5f)
|
||||||
|
&& close_to(angles.roll.as_degrees(), 0.0f, 1e-5f) && close_to(view.at(0, 0), 1.0f, 1e-5f)
|
||||||
|
&& close_to(view.at(2, 1), 1.0f, 1e-5f) && close_to(projection.at(0, 0), 1.0f, 1e-5f)
|
||||||
|
&& close_to(projection.at(1, 1), 1.0f, 1e-5f) && close_to(projection.at(2, 2), 1.1f, 1e-5f)
|
||||||
|
&& close_to(projection.at(2, 3), -1.1f, 1e-5f) && close_to(projection.at(3, 2), 1.0f, 1e-5f);
|
||||||
|
}(),
|
||||||
|
"CryEngine CameraTrait should be constexpr with embedded constexpr math");
|
||||||
|
|
||||||
|
static_assert(omath::cry_engine::units_to_centimeters(100.0f) == 1.0f);
|
||||||
|
static_assert(omath::cry_engine::units_to_meters(2.0f) == 2.0f);
|
||||||
|
static_assert(omath::cry_engine::units_to_kilometers(2000.0f) == 2.0f);
|
||||||
|
static_assert(omath::cry_engine::centimeters_to_units(1.0f) == 100.0f);
|
||||||
|
static_assert(omath::cry_engine::meters_to_units(2.0f) == 2.0f);
|
||||||
|
static_assert(omath::cry_engine::kilometers_to_units(2.0f) == 2000.0f);
|
||||||
|
|
||||||
TEST(unit_test_cry_engine, look_at_forward)
|
TEST(unit_test_cry_engine, look_at_forward)
|
||||||
{
|
{
|
||||||
const auto angles = cry_engine::CameraTrait::calc_look_at_angle({}, cry_engine::k_abs_forward);
|
const auto angles = cry_engine::CameraTrait::calc_look_at_angle({}, cry_engine::k_abs_forward);
|
||||||
@@ -251,11 +341,9 @@ TEST(unit_test_cry_engine, ViewAnglesAsVector3Zero)
|
|||||||
|
|
||||||
TEST(unit_test_cry_engine, ViewAnglesAsVector3Values)
|
TEST(unit_test_cry_engine, ViewAnglesAsVector3Values)
|
||||||
{
|
{
|
||||||
const omath::cry_engine::ViewAngles angles{
|
const omath::cry_engine::ViewAngles angles{omath::cry_engine::PitchAngle::from_degrees(45.f),
|
||||||
omath::cry_engine::PitchAngle::from_degrees(45.f),
|
omath::cry_engine::YawAngle::from_degrees(-90.f),
|
||||||
omath::cry_engine::YawAngle::from_degrees(-90.f),
|
omath::cry_engine::RollAngle::from_degrees(30.f)};
|
||||||
omath::cry_engine::RollAngle::from_degrees(30.f)
|
|
||||||
};
|
|
||||||
const auto vec = angles.as_vector3();
|
const auto vec = angles.as_vector3();
|
||||||
|
|
||||||
EXPECT_FLOAT_EQ(vec.x, 45.f);
|
EXPECT_FLOAT_EQ(vec.x, 45.f);
|
||||||
@@ -266,11 +354,9 @@ TEST(unit_test_cry_engine, ViewAnglesAsVector3Values)
|
|||||||
TEST(unit_test_cry_engine, ViewAnglesAsVector3ClampedPitch)
|
TEST(unit_test_cry_engine, ViewAnglesAsVector3ClampedPitch)
|
||||||
{
|
{
|
||||||
// Pitch is clamped to [-90, 90]
|
// Pitch is clamped to [-90, 90]
|
||||||
const omath::cry_engine::ViewAngles angles{
|
const omath::cry_engine::ViewAngles angles{omath::cry_engine::PitchAngle::from_degrees(120.f),
|
||||||
omath::cry_engine::PitchAngle::from_degrees(120.f),
|
omath::cry_engine::YawAngle::from_degrees(0.f),
|
||||||
omath::cry_engine::YawAngle::from_degrees(0.f),
|
omath::cry_engine::RollAngle::from_degrees(0.f)};
|
||||||
omath::cry_engine::RollAngle::from_degrees(0.f)
|
|
||||||
};
|
|
||||||
const auto vec = angles.as_vector3();
|
const auto vec = angles.as_vector3();
|
||||||
|
|
||||||
EXPECT_FLOAT_EQ(vec.x, 90.f);
|
EXPECT_FLOAT_EQ(vec.x, 90.f);
|
||||||
@@ -279,11 +365,9 @@ TEST(unit_test_cry_engine, ViewAnglesAsVector3ClampedPitch)
|
|||||||
TEST(unit_test_cry_engine, ViewAnglesAsVector3NormalizedYaw)
|
TEST(unit_test_cry_engine, ViewAnglesAsVector3NormalizedYaw)
|
||||||
{
|
{
|
||||||
// Yaw is normalized to [-180, 180], 270 wraps to -90
|
// Yaw is normalized to [-180, 180], 270 wraps to -90
|
||||||
const omath::cry_engine::ViewAngles angles{
|
const omath::cry_engine::ViewAngles angles{omath::cry_engine::PitchAngle::from_degrees(0.f),
|
||||||
omath::cry_engine::PitchAngle::from_degrees(0.f),
|
omath::cry_engine::YawAngle::from_degrees(270.f),
|
||||||
omath::cry_engine::YawAngle::from_degrees(270.f),
|
omath::cry_engine::RollAngle::from_degrees(0.f)};
|
||||||
omath::cry_engine::RollAngle::from_degrees(0.f)
|
|
||||||
};
|
|
||||||
const auto vec = angles.as_vector3();
|
const auto vec = angles.as_vector3();
|
||||||
|
|
||||||
EXPECT_NEAR(vec.y, -90.f, 0.01f);
|
EXPECT_NEAR(vec.y, -90.f, 0.01f);
|
||||||
|
|||||||
@@ -1,30 +1,32 @@
|
|||||||
// Tests for engine trait headers to improve header coverage
|
// Tests for engine trait headers to improve header coverage
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include <omath/engines/frostbite_engine/traits/pred_engine_trait.hpp>
|
#include <omath/engines/cry_engine/camera.hpp>
|
||||||
#include <omath/engines/frostbite_engine/traits/mesh_trait.hpp>
|
|
||||||
#include <omath/engines/frostbite_engine/traits/camera_trait.hpp>
|
|
||||||
|
|
||||||
#include <omath/engines/iw_engine/traits/pred_engine_trait.hpp>
|
|
||||||
#include <omath/engines/iw_engine/traits/mesh_trait.hpp>
|
|
||||||
#include <omath/engines/iw_engine/traits/camera_trait.hpp>
|
|
||||||
|
|
||||||
#include <omath/engines/opengl_engine/traits/pred_engine_trait.hpp>
|
|
||||||
#include <omath/engines/opengl_engine/traits/mesh_trait.hpp>
|
|
||||||
#include <omath/engines/opengl_engine/traits/camera_trait.hpp>
|
|
||||||
|
|
||||||
#include <omath/engines/unity_engine/traits/pred_engine_trait.hpp>
|
|
||||||
#include <omath/engines/unity_engine/traits/mesh_trait.hpp>
|
|
||||||
#include <omath/engines/unity_engine/traits/camera_trait.hpp>
|
|
||||||
|
|
||||||
#include <omath/engines/unreal_engine/traits/pred_engine_trait.hpp>
|
|
||||||
#include <omath/engines/unreal_engine/traits/mesh_trait.hpp>
|
|
||||||
#include <omath/engines/unreal_engine/traits/camera_trait.hpp>
|
|
||||||
|
|
||||||
#include <omath/engines/source_engine/traits/pred_engine_trait.hpp>
|
|
||||||
#include <omath/engines/source_engine/traits/camera_trait.hpp>
|
|
||||||
|
|
||||||
#include <omath/engines/cry_engine/traits/camera_trait.hpp>
|
#include <omath/engines/cry_engine/traits/camera_trait.hpp>
|
||||||
|
#include <omath/engines/frostbite_engine/camera.hpp>
|
||||||
|
#include <omath/engines/frostbite_engine/traits/camera_trait.hpp>
|
||||||
|
#include <omath/engines/frostbite_engine/traits/mesh_trait.hpp>
|
||||||
|
#include <omath/engines/frostbite_engine/traits/pred_engine_trait.hpp>
|
||||||
|
#include <omath/engines/iw_engine/camera.hpp>
|
||||||
|
#include <omath/engines/iw_engine/traits/camera_trait.hpp>
|
||||||
|
#include <omath/engines/iw_engine/traits/mesh_trait.hpp>
|
||||||
|
#include <omath/engines/iw_engine/traits/pred_engine_trait.hpp>
|
||||||
|
#include <omath/engines/opengl_engine/camera.hpp>
|
||||||
|
#include <omath/engines/opengl_engine/traits/camera_trait.hpp>
|
||||||
|
#include <omath/engines/opengl_engine/traits/mesh_trait.hpp>
|
||||||
|
#include <omath/engines/opengl_engine/traits/pred_engine_trait.hpp>
|
||||||
|
#include <omath/engines/rage_engine/camera.hpp>
|
||||||
|
#include <omath/engines/rage_engine/traits/camera_trait.hpp>
|
||||||
|
#include <omath/engines/source_engine/camera.hpp>
|
||||||
|
#include <omath/engines/source_engine/traits/camera_trait.hpp>
|
||||||
|
#include <omath/engines/source_engine/traits/pred_engine_trait.hpp>
|
||||||
|
#include <omath/engines/unity_engine/camera.hpp>
|
||||||
|
#include <omath/engines/unity_engine/traits/camera_trait.hpp>
|
||||||
|
#include <omath/engines/unity_engine/traits/mesh_trait.hpp>
|
||||||
|
#include <omath/engines/unity_engine/traits/pred_engine_trait.hpp>
|
||||||
|
#include <omath/engines/unreal_engine/camera.hpp>
|
||||||
|
#include <omath/engines/unreal_engine/traits/camera_trait.hpp>
|
||||||
|
#include <omath/engines/unreal_engine/traits/mesh_trait.hpp>
|
||||||
|
#include <omath/engines/unreal_engine/traits/pred_engine_trait.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 <optional>
|
#include <optional>
|
||||||
@@ -41,6 +43,41 @@ static void expect_matrix_near(const MatT& a, const MatT& b, float eps = 1e-5f)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ── Launch offset tests for all engines ──────────────────────────────────────
|
// ── Launch offset tests for all engines ──────────────────────────────────────
|
||||||
|
template<class MatType, class NumericType>
|
||||||
|
constexpr bool matrix_has_non_zero_element(const MatType& mat)
|
||||||
|
{
|
||||||
|
for (std::size_t r = 0; r < 4; ++r)
|
||||||
|
for (std::size_t c = 0; c < 4; ++c)
|
||||||
|
if (mat.at(r, c) != NumericType{0})
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
template<class CameraType, class NumericType>
|
||||||
|
constexpr bool camera_can_calculate_matrices_at_compile_time()
|
||||||
|
{
|
||||||
|
using FieldOfView = projection::FieldOfView;
|
||||||
|
|
||||||
|
CameraType camera{{}, {}, {1280.f, 720.f}, FieldOfView::from_degrees(90.f), NumericType{0.01}, NumericType{1000}};
|
||||||
|
const auto view = camera.get_view_matrix();
|
||||||
|
const auto projection = camera.get_projection_matrix();
|
||||||
|
const auto view_projection = camera.get_view_projection_matrix();
|
||||||
|
|
||||||
|
return matrix_has_non_zero_element<decltype(view), NumericType>(view)
|
||||||
|
&& matrix_has_non_zero_element<decltype(projection), NumericType>(projection)
|
||||||
|
&& matrix_has_non_zero_element<decltype(view_projection), NumericType>(view_projection);
|
||||||
|
}
|
||||||
|
|
||||||
|
static_assert(camera_can_calculate_matrices_at_compile_time<source_engine::Camera, float>());
|
||||||
|
static_assert(camera_can_calculate_matrices_at_compile_time<iw_engine::Camera, float>());
|
||||||
|
static_assert(camera_can_calculate_matrices_at_compile_time<frostbite_engine::Camera, float>());
|
||||||
|
static_assert(camera_can_calculate_matrices_at_compile_time<opengl_engine::Camera, float>());
|
||||||
|
static_assert(camera_can_calculate_matrices_at_compile_time<unity_engine::Camera, float>());
|
||||||
|
static_assert(camera_can_calculate_matrices_at_compile_time<cry_engine::Camera, float>());
|
||||||
|
static_assert(camera_can_calculate_matrices_at_compile_time<rage_engine::Camera, float>());
|
||||||
|
static_assert(camera_can_calculate_matrices_at_compile_time<unreal_engine::Camera, double>());
|
||||||
|
|
||||||
#include <omath/engines/cry_engine/traits/pred_engine_trait.hpp>
|
#include <omath/engines/cry_engine/traits/pred_engine_trait.hpp>
|
||||||
|
|
||||||
// Helper: verify that zero offset matches default-initialized offset behavior
|
// Helper: verify that zero offset matches default-initialized offset behavior
|
||||||
@@ -74,8 +111,10 @@ static void verify_zero_offset_matches_default()
|
|||||||
p2.m_launch_speed = static_cast<AT>(50);
|
p2.m_launch_speed = static_cast<AT>(50);
|
||||||
p2.m_gravity_scale = static_cast<AT>(1);
|
p2.m_gravity_scale = static_cast<AT>(1);
|
||||||
|
|
||||||
const auto pos1 = Trait::predict_projectile_position(p, static_cast<AT>(15), static_cast<AT>(30), static_cast<AT>(1), static_cast<AT>(9.81));
|
const auto pos1 = Trait::predict_projectile_position(p, static_cast<AT>(15), static_cast<AT>(30),
|
||||||
const auto pos2 = Trait::predict_projectile_position(p2, static_cast<AT>(15), static_cast<AT>(30), static_cast<AT>(1), static_cast<AT>(9.81));
|
static_cast<AT>(1), static_cast<AT>(9.81));
|
||||||
|
const auto pos2 = Trait::predict_projectile_position(p2, static_cast<AT>(15), static_cast<AT>(30),
|
||||||
|
static_cast<AT>(1), static_cast<AT>(9.81));
|
||||||
#if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64)
|
#if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64)
|
||||||
constexpr double tol = 1e-6;
|
constexpr double tol = 1e-6;
|
||||||
#else
|
#else
|
||||||
@@ -158,7 +197,8 @@ TEST(LaunchOffsetTests, OffsetShiftsTrajectory)
|
|||||||
p_with_offset.m_gravity_scale = 1.f;
|
p_with_offset.m_gravity_scale = 1.f;
|
||||||
|
|
||||||
const auto pos1 = source_engine::PredEngineTrait::predict_projectile_position(p_no_offset, 20.f, 45.f, 2.f, 9.81f);
|
const auto pos1 = source_engine::PredEngineTrait::predict_projectile_position(p_no_offset, 20.f, 45.f, 2.f, 9.81f);
|
||||||
const auto pos2 = source_engine::PredEngineTrait::predict_projectile_position(p_with_offset, 20.f, 45.f, 2.f, 9.81f);
|
const auto pos2 =
|
||||||
|
source_engine::PredEngineTrait::predict_projectile_position(p_with_offset, 20.f, 45.f, 2.f, 9.81f);
|
||||||
|
|
||||||
// The difference should be exactly the launch offset
|
// The difference should be exactly the launch offset
|
||||||
EXPECT_NEAR(pos2.x - pos1.x, 10.f, 1e-4f);
|
EXPECT_NEAR(pos2.x - pos1.x, 10.f, 1e-4f);
|
||||||
@@ -221,12 +261,16 @@ TEST(TraitTests, Frostbite_Pred_And_Mesh_And_Camera)
|
|||||||
// CameraTrait look at should be callable
|
// CameraTrait look at should be callable
|
||||||
const auto angles = e::CameraTrait::calc_look_at_angle({0, 0, 0}, {0, 1, 1});
|
const auto angles = e::CameraTrait::calc_look_at_angle({0, 0, 0}, {0, 1, 1});
|
||||||
(void)angles;
|
(void)angles;
|
||||||
const auto proj = e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
const auto proj =
|
||||||
|
e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f,
|
||||||
|
1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
const auto expected = e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f);
|
const auto expected = e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f);
|
||||||
expect_matrix_near(proj, expected);
|
expect_matrix_near(proj, expected);
|
||||||
|
|
||||||
const auto proj_zo = e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
const auto proj_zo = e::CameraTrait::calc_projection_matrix(
|
||||||
const auto expected_zo = e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
|
const auto expected_zo =
|
||||||
|
e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
expect_matrix_near(proj_zo, expected_zo);
|
expect_matrix_near(proj_zo, expected_zo);
|
||||||
EXPECT_NE(proj, proj_zo);
|
EXPECT_NE(proj, proj_zo);
|
||||||
}
|
}
|
||||||
@@ -272,12 +316,16 @@ TEST(TraitTests, IW_Pred_And_Mesh_And_Camera)
|
|||||||
e::ViewAngles va;
|
e::ViewAngles va;
|
||||||
expect_matrix_near(e::MeshTrait::rotation_matrix(va), e::rotation_matrix(va));
|
expect_matrix_near(e::MeshTrait::rotation_matrix(va), e::rotation_matrix(va));
|
||||||
|
|
||||||
const auto proj = e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(45.f), {1920.f, 1080.f}, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
const auto proj =
|
||||||
|
e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(45.f), {1920.f, 1080.f}, 0.1f,
|
||||||
|
1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
const auto expected = e::calc_perspective_projection_matrix(45.f, 1920.f / 1080.f, 0.1f, 1000.f);
|
const auto expected = e::calc_perspective_projection_matrix(45.f, 1920.f / 1080.f, 0.1f, 1000.f);
|
||||||
expect_matrix_near(proj, expected);
|
expect_matrix_near(proj, expected);
|
||||||
|
|
||||||
const auto proj_zo = e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(45.f), {1920.f, 1080.f}, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
const auto proj_zo = e::CameraTrait::calc_projection_matrix(
|
||||||
const auto expected_zo = e::calc_perspective_projection_matrix(45.f, 1920.f / 1080.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
projection::FieldOfView::from_degrees(45.f), {1920.f, 1080.f}, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
|
const auto expected_zo =
|
||||||
|
e::calc_perspective_projection_matrix(45.f, 1920.f / 1080.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
expect_matrix_near(proj_zo, expected_zo);
|
expect_matrix_near(proj_zo, expected_zo);
|
||||||
EXPECT_NE(proj, proj_zo);
|
EXPECT_NE(proj, proj_zo);
|
||||||
|
|
||||||
@@ -327,12 +375,16 @@ TEST(TraitTests, OpenGL_Pred_And_Mesh_And_Camera)
|
|||||||
e::ViewAngles va;
|
e::ViewAngles va;
|
||||||
expect_matrix_near(e::MeshTrait::rotation_matrix(va), e::rotation_matrix(va));
|
expect_matrix_near(e::MeshTrait::rotation_matrix(va), e::rotation_matrix(va));
|
||||||
|
|
||||||
const auto proj = e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
const auto proj =
|
||||||
|
e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f,
|
||||||
|
1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
const auto expected = e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f);
|
const auto expected = e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f);
|
||||||
expect_matrix_near(proj, expected);
|
expect_matrix_near(proj, expected);
|
||||||
|
|
||||||
const auto proj_zo = e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
const auto proj_zo = e::CameraTrait::calc_projection_matrix(
|
||||||
const auto expected_zo = e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
|
const auto expected_zo =
|
||||||
|
e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
expect_matrix_near(proj_zo, expected_zo);
|
expect_matrix_near(proj_zo, expected_zo);
|
||||||
EXPECT_NE(proj, proj_zo);
|
EXPECT_NE(proj, proj_zo);
|
||||||
|
|
||||||
@@ -382,12 +434,16 @@ TEST(TraitTests, Unity_Pred_And_Mesh_And_Camera)
|
|||||||
e::ViewAngles va;
|
e::ViewAngles va;
|
||||||
expect_matrix_near(e::MeshTrait::rotation_matrix(va), e::rotation_matrix(va));
|
expect_matrix_near(e::MeshTrait::rotation_matrix(va), e::rotation_matrix(va));
|
||||||
|
|
||||||
const auto proj = e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
const auto proj =
|
||||||
|
e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f,
|
||||||
|
1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
const auto expected = e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f);
|
const auto expected = e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f);
|
||||||
expect_matrix_near(proj, expected);
|
expect_matrix_near(proj, expected);
|
||||||
|
|
||||||
const auto proj_zo = e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
const auto proj_zo = e::CameraTrait::calc_projection_matrix(
|
||||||
const auto expected_zo = e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
|
const auto expected_zo =
|
||||||
|
e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
expect_matrix_near(proj_zo, expected_zo);
|
expect_matrix_near(proj_zo, expected_zo);
|
||||||
EXPECT_NE(proj, proj_zo);
|
EXPECT_NE(proj, proj_zo);
|
||||||
|
|
||||||
@@ -437,12 +493,16 @@ TEST(TraitTests, Unreal_Pred_And_Mesh_And_Camera)
|
|||||||
e::ViewAngles va;
|
e::ViewAngles va;
|
||||||
expect_matrix_near(e::MeshTrait::rotation_matrix(va), e::rotation_matrix(va));
|
expect_matrix_near(e::MeshTrait::rotation_matrix(va), e::rotation_matrix(va));
|
||||||
|
|
||||||
const auto proj = e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
const auto proj =
|
||||||
|
e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f,
|
||||||
|
1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
const auto expected = e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f);
|
const auto expected = e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f);
|
||||||
expect_matrix_near(proj, expected);
|
expect_matrix_near(proj, expected);
|
||||||
|
|
||||||
const auto proj_zo = e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
const auto proj_zo = e::CameraTrait::calc_projection_matrix(
|
||||||
const auto expected_zo = e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
projection::FieldOfView::from_degrees(60.f), {1280.f, 720.f}, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
|
const auto expected_zo =
|
||||||
|
e::calc_perspective_projection_matrix(60.f, 1280.f / 720.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
expect_matrix_near(proj_zo, expected_zo);
|
expect_matrix_near(proj_zo, expected_zo);
|
||||||
EXPECT_NE(proj, proj_zo);
|
EXPECT_NE(proj, proj_zo);
|
||||||
|
|
||||||
@@ -458,18 +518,17 @@ TEST(NDCDepthRangeTests, Source_BothDepthRanges)
|
|||||||
{
|
{
|
||||||
namespace e = omath::source_engine;
|
namespace e = omath::source_engine;
|
||||||
|
|
||||||
const auto proj_no = e::CameraTrait::calc_projection_matrix(
|
const auto proj_no =
|
||||||
projection::FieldOfView::from_degrees(90.f), {1920.f, 1080.f}, 0.1f, 1000.f,
|
e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(90.f), {1920.f, 1080.f}, 0.1f,
|
||||||
NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
const auto expected_no = e::calc_perspective_projection_matrix(
|
const auto expected_no = e::calc_perspective_projection_matrix(90.f, 1920.f / 1080.f, 0.1f, 1000.f,
|
||||||
90.f, 1920.f / 1080.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
expect_matrix_near(proj_no, expected_no);
|
expect_matrix_near(proj_no, expected_no);
|
||||||
|
|
||||||
const auto proj_zo = e::CameraTrait::calc_projection_matrix(
|
const auto proj_zo = e::CameraTrait::calc_projection_matrix(
|
||||||
projection::FieldOfView::from_degrees(90.f), {1920.f, 1080.f}, 0.1f, 1000.f,
|
projection::FieldOfView::from_degrees(90.f), {1920.f, 1080.f}, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
NDCDepthRange::ZERO_TO_ONE);
|
const auto expected_zo =
|
||||||
const auto expected_zo = e::calc_perspective_projection_matrix(
|
e::calc_perspective_projection_matrix(90.f, 1920.f / 1080.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
90.f, 1920.f / 1080.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
|
||||||
expect_matrix_near(proj_zo, expected_zo);
|
expect_matrix_near(proj_zo, expected_zo);
|
||||||
|
|
||||||
EXPECT_NE(proj_no, proj_zo);
|
EXPECT_NE(proj_no, proj_zo);
|
||||||
@@ -479,18 +538,17 @@ TEST(NDCDepthRangeTests, CryEngine_BothDepthRanges)
|
|||||||
{
|
{
|
||||||
namespace e = omath::cry_engine;
|
namespace e = omath::cry_engine;
|
||||||
|
|
||||||
const auto proj_no = e::CameraTrait::calc_projection_matrix(
|
const auto proj_no =
|
||||||
projection::FieldOfView::from_degrees(90.f), {1920.f, 1080.f}, 0.1f, 1000.f,
|
e::CameraTrait::calc_projection_matrix(projection::FieldOfView::from_degrees(90.f), {1920.f, 1080.f}, 0.1f,
|
||||||
NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
const auto expected_no = e::calc_perspective_projection_matrix(
|
const auto expected_no = e::calc_perspective_projection_matrix(90.f, 1920.f / 1080.f, 0.1f, 1000.f,
|
||||||
90.f, 1920.f / 1080.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
expect_matrix_near(proj_no, expected_no);
|
expect_matrix_near(proj_no, expected_no);
|
||||||
|
|
||||||
const auto proj_zo = e::CameraTrait::calc_projection_matrix(
|
const auto proj_zo = e::CameraTrait::calc_projection_matrix(
|
||||||
projection::FieldOfView::from_degrees(90.f), {1920.f, 1080.f}, 0.1f, 1000.f,
|
projection::FieldOfView::from_degrees(90.f), {1920.f, 1080.f}, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
NDCDepthRange::ZERO_TO_ONE);
|
const auto expected_zo =
|
||||||
const auto expected_zo = e::calc_perspective_projection_matrix(
|
e::calc_perspective_projection_matrix(90.f, 1920.f / 1080.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
90.f, 1920.f / 1080.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
|
||||||
expect_matrix_near(proj_zo, expected_zo);
|
expect_matrix_near(proj_zo, expected_zo);
|
||||||
|
|
||||||
EXPECT_NE(proj_no, proj_zo);
|
EXPECT_NE(proj_no, proj_zo);
|
||||||
@@ -537,7 +595,8 @@ TEST(NDCDepthRangeTests, OpenGL_ZeroToOne_ZRange)
|
|||||||
const auto proj = e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
const auto proj = e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
|
|
||||||
// OpenGL engine uses column-major matrices, project manually
|
// OpenGL engine uses column-major matrices, project manually
|
||||||
auto proj_z = [&](float z) {
|
auto proj_z = [&](float z)
|
||||||
|
{
|
||||||
auto clip = proj * mat_column_from_vector<float, MatStoreType::COLUMN_MAJOR>({0, 0, z});
|
auto clip = proj * mat_column_from_vector<float, MatStoreType::COLUMN_MAJOR>({0, 0, z});
|
||||||
return clip.at(2, 0) / clip.at(3, 0);
|
return clip.at(2, 0) / clip.at(3, 0);
|
||||||
};
|
};
|
||||||
@@ -565,7 +624,8 @@ TEST(NDCDepthRangeTests, Unity_ZeroToOne_ZRange)
|
|||||||
// Unity is right-handed, row-major
|
// Unity is right-handed, row-major
|
||||||
const auto proj = e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
const auto proj = e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::ZERO_TO_ONE);
|
||||||
|
|
||||||
auto proj_z = [&](float z) {
|
auto proj_z = [&](float z)
|
||||||
|
{
|
||||||
auto clip = proj * mat_column_from_vector<float>({0, 0, z});
|
auto clip = proj * mat_column_from_vector<float>({0, 0, z});
|
||||||
return clip.at(2, 0) / clip.at(3, 0);
|
return clip.at(2, 0) / clip.at(3, 0);
|
||||||
};
|
};
|
||||||
@@ -603,7 +663,8 @@ TEST(NDCDepthRangeTests, CryEngine_ZeroToOne_ZRange)
|
|||||||
TEST(NDCDepthRangeTests, Source_NegativeOneToOne_ZRange)
|
TEST(NDCDepthRangeTests, Source_NegativeOneToOne_ZRange)
|
||||||
{
|
{
|
||||||
namespace e = omath::source_engine;
|
namespace e = omath::source_engine;
|
||||||
const auto proj = e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
const auto proj =
|
||||||
|
e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
|
|
||||||
EXPECT_NEAR(project_z_lh(proj, 0.1f), -1.0f, 1e-3f);
|
EXPECT_NEAR(project_z_lh(proj, 0.1f), -1.0f, 1e-3f);
|
||||||
EXPECT_NEAR(project_z_lh(proj, 1000.f), 1.0f, 1e-3f);
|
EXPECT_NEAR(project_z_lh(proj, 1000.f), 1.0f, 1e-3f);
|
||||||
@@ -612,7 +673,8 @@ TEST(NDCDepthRangeTests, Source_NegativeOneToOne_ZRange)
|
|||||||
TEST(NDCDepthRangeTests, IW_NegativeOneToOne_ZRange)
|
TEST(NDCDepthRangeTests, IW_NegativeOneToOne_ZRange)
|
||||||
{
|
{
|
||||||
namespace e = omath::iw_engine;
|
namespace e = omath::iw_engine;
|
||||||
const auto proj = e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
const auto proj =
|
||||||
|
e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
|
|
||||||
EXPECT_NEAR(project_z_lh(proj, 0.1f), -1.0f, 1e-3f);
|
EXPECT_NEAR(project_z_lh(proj, 0.1f), -1.0f, 1e-3f);
|
||||||
EXPECT_NEAR(project_z_lh(proj, 1000.f), 1.0f, 1e-3f);
|
EXPECT_NEAR(project_z_lh(proj, 1000.f), 1.0f, 1e-3f);
|
||||||
@@ -621,7 +683,8 @@ TEST(NDCDepthRangeTests, IW_NegativeOneToOne_ZRange)
|
|||||||
TEST(NDCDepthRangeTests, Frostbite_NegativeOneToOne_ZRange)
|
TEST(NDCDepthRangeTests, Frostbite_NegativeOneToOne_ZRange)
|
||||||
{
|
{
|
||||||
namespace e = omath::frostbite_engine;
|
namespace e = omath::frostbite_engine;
|
||||||
const auto proj = e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
const auto proj =
|
||||||
|
e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
|
|
||||||
EXPECT_NEAR(project_z_lh(proj, 0.1f), -1.0f, 1e-3f);
|
EXPECT_NEAR(project_z_lh(proj, 0.1f), -1.0f, 1e-3f);
|
||||||
EXPECT_NEAR(project_z_lh(proj, 1000.f), 1.0f, 1e-3f);
|
EXPECT_NEAR(project_z_lh(proj, 1000.f), 1.0f, 1e-3f);
|
||||||
@@ -630,7 +693,8 @@ TEST(NDCDepthRangeTests, Frostbite_NegativeOneToOne_ZRange)
|
|||||||
TEST(NDCDepthRangeTests, Unreal_NegativeOneToOne_ZRange)
|
TEST(NDCDepthRangeTests, Unreal_NegativeOneToOne_ZRange)
|
||||||
{
|
{
|
||||||
namespace e = omath::unreal_engine;
|
namespace e = omath::unreal_engine;
|
||||||
const auto proj = e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
const auto proj =
|
||||||
|
e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
|
|
||||||
EXPECT_NEAR(project_z_lh(proj, 0.1f), -1.0f, 1e-3f);
|
EXPECT_NEAR(project_z_lh(proj, 0.1f), -1.0f, 1e-3f);
|
||||||
EXPECT_NEAR(project_z_lh(proj, 1000.f), 1.0f, 1e-3f);
|
EXPECT_NEAR(project_z_lh(proj, 1000.f), 1.0f, 1e-3f);
|
||||||
@@ -639,7 +703,8 @@ TEST(NDCDepthRangeTests, Unreal_NegativeOneToOne_ZRange)
|
|||||||
TEST(NDCDepthRangeTests, CryEngine_NegativeOneToOne_ZRange)
|
TEST(NDCDepthRangeTests, CryEngine_NegativeOneToOne_ZRange)
|
||||||
{
|
{
|
||||||
namespace e = omath::cry_engine;
|
namespace e = omath::cry_engine;
|
||||||
const auto proj = e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
const auto proj =
|
||||||
|
e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
|
|
||||||
EXPECT_NEAR(project_z_lh(proj, 0.1f), -1.0f, 1e-3f);
|
EXPECT_NEAR(project_z_lh(proj, 0.1f), -1.0f, 1e-3f);
|
||||||
EXPECT_NEAR(project_z_lh(proj, 1000.f), 1.0f, 1e-3f);
|
EXPECT_NEAR(project_z_lh(proj, 1000.f), 1.0f, 1e-3f);
|
||||||
@@ -648,9 +713,11 @@ TEST(NDCDepthRangeTests, CryEngine_NegativeOneToOne_ZRange)
|
|||||||
TEST(NDCDepthRangeTests, OpenGL_NegativeOneToOne_ZRange)
|
TEST(NDCDepthRangeTests, OpenGL_NegativeOneToOne_ZRange)
|
||||||
{
|
{
|
||||||
namespace e = omath::opengl_engine;
|
namespace e = omath::opengl_engine;
|
||||||
const auto proj = e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
const auto proj =
|
||||||
|
e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
|
|
||||||
auto proj_z = [&](float z) {
|
auto proj_z = [&](float z)
|
||||||
|
{
|
||||||
auto clip = proj * mat_column_from_vector<float, MatStoreType::COLUMN_MAJOR>({0, 0, z});
|
auto clip = proj * mat_column_from_vector<float, MatStoreType::COLUMN_MAJOR>({0, 0, z});
|
||||||
return clip.at(2, 0) / clip.at(3, 0);
|
return clip.at(2, 0) / clip.at(3, 0);
|
||||||
};
|
};
|
||||||
@@ -662,9 +729,11 @@ TEST(NDCDepthRangeTests, OpenGL_NegativeOneToOne_ZRange)
|
|||||||
TEST(NDCDepthRangeTests, Unity_NegativeOneToOne_ZRange)
|
TEST(NDCDepthRangeTests, Unity_NegativeOneToOne_ZRange)
|
||||||
{
|
{
|
||||||
namespace e = omath::unity_engine;
|
namespace e = omath::unity_engine;
|
||||||
const auto proj = e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
const auto proj =
|
||||||
|
e::calc_perspective_projection_matrix(90.f, 16.f / 9.f, 0.1f, 1000.f, NDCDepthRange::NEGATIVE_ONE_TO_ONE);
|
||||||
|
|
||||||
auto proj_z = [&](float z) {
|
auto proj_z = [&](float z)
|
||||||
|
{
|
||||||
auto clip = proj * mat_column_from_vector<float>({0, 0, z});
|
auto clip = proj * mat_column_from_vector<float>({0, 0, z});
|
||||||
return clip.at(2, 0) / clip.at(3, 0);
|
return clip.at(2, 0) / clip.at(3, 0);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,7 +4,9 @@
|
|||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include "omath/3d_primitives/aabb.hpp"
|
#include "omath/3d_primitives/aabb.hpp"
|
||||||
|
|
||||||
|
using UpAxis = omath::primitives::UpAxis;
|
||||||
using AABB = omath::primitives::Aabb<float>;
|
using AABB = omath::primitives::Aabb<float>;
|
||||||
|
using AABBZ = omath::primitives::Aabb<float, UpAxis::Z>;
|
||||||
using Vec3 = omath::Vector3<float>;
|
using Vec3 = omath::Vector3<float>;
|
||||||
|
|
||||||
// --- center() ---
|
// --- center() ---
|
||||||
@@ -65,14 +67,12 @@ TEST(AabbTests, ExtentsOfDegenerateBox)
|
|||||||
EXPECT_FLOAT_EQ(e.z, 0.f);
|
EXPECT_FLOAT_EQ(e.z, 0.f);
|
||||||
}
|
}
|
||||||
|
|
||||||
using UpAxis = omath::primitives::UpAxis;
|
|
||||||
|
|
||||||
// --- top() ---
|
// --- top() ---
|
||||||
|
|
||||||
TEST(AabbTests, TopYUpSymmetricBox)
|
TEST(AabbTests, TopYUpSymmetricBox)
|
||||||
{
|
{
|
||||||
constexpr AABB box{{-1.f, -2.f, -3.f}, {1.f, 2.f, 3.f}};
|
constexpr AABB box{{-1.f, -2.f, -3.f}, {1.f, 2.f, 3.f}};
|
||||||
constexpr auto t = box.top<UpAxis::Y>();
|
constexpr auto t = box.top();
|
||||||
EXPECT_FLOAT_EQ(t.x, 0.f);
|
EXPECT_FLOAT_EQ(t.x, 0.f);
|
||||||
EXPECT_FLOAT_EQ(t.y, 2.f);
|
EXPECT_FLOAT_EQ(t.y, 2.f);
|
||||||
EXPECT_FLOAT_EQ(t.z, 0.f);
|
EXPECT_FLOAT_EQ(t.z, 0.f);
|
||||||
@@ -81,7 +81,7 @@ TEST(AabbTests, TopYUpSymmetricBox)
|
|||||||
TEST(AabbTests, TopYUpOffsetBox)
|
TEST(AabbTests, TopYUpOffsetBox)
|
||||||
{
|
{
|
||||||
constexpr AABB box{{1.f, 4.f, 2.f}, {3.f, 10.f, 6.f}};
|
constexpr AABB box{{1.f, 4.f, 2.f}, {3.f, 10.f, 6.f}};
|
||||||
constexpr auto t = box.top<UpAxis::Y>();
|
constexpr auto t = box.top();
|
||||||
EXPECT_FLOAT_EQ(t.x, 2.f);
|
EXPECT_FLOAT_EQ(t.x, 2.f);
|
||||||
EXPECT_FLOAT_EQ(t.y, 10.f);
|
EXPECT_FLOAT_EQ(t.y, 10.f);
|
||||||
EXPECT_FLOAT_EQ(t.z, 4.f);
|
EXPECT_FLOAT_EQ(t.z, 4.f);
|
||||||
@@ -89,8 +89,8 @@ TEST(AabbTests, TopYUpOffsetBox)
|
|||||||
|
|
||||||
TEST(AabbTests, TopZUpSymmetricBox)
|
TEST(AabbTests, TopZUpSymmetricBox)
|
||||||
{
|
{
|
||||||
constexpr AABB box{{-1.f, -2.f, -3.f}, {1.f, 2.f, 3.f}};
|
constexpr AABBZ box{{-1.f, -2.f, -3.f}, {1.f, 2.f, 3.f}};
|
||||||
constexpr auto t = box.top<UpAxis::Z>();
|
constexpr auto t = box.top();
|
||||||
EXPECT_FLOAT_EQ(t.x, 0.f);
|
EXPECT_FLOAT_EQ(t.x, 0.f);
|
||||||
EXPECT_FLOAT_EQ(t.y, 0.f);
|
EXPECT_FLOAT_EQ(t.y, 0.f);
|
||||||
EXPECT_FLOAT_EQ(t.z, 3.f);
|
EXPECT_FLOAT_EQ(t.z, 3.f);
|
||||||
@@ -98,8 +98,8 @@ TEST(AabbTests, TopZUpSymmetricBox)
|
|||||||
|
|
||||||
TEST(AabbTests, TopZUpOffsetBox)
|
TEST(AabbTests, TopZUpOffsetBox)
|
||||||
{
|
{
|
||||||
constexpr AABB box{{1.f, 4.f, 2.f}, {3.f, 10.f, 6.f}};
|
constexpr AABBZ box{{1.f, 4.f, 2.f}, {3.f, 10.f, 6.f}};
|
||||||
constexpr auto t = box.top<UpAxis::Z>();
|
constexpr auto t = box.top();
|
||||||
EXPECT_FLOAT_EQ(t.x, 2.f);
|
EXPECT_FLOAT_EQ(t.x, 2.f);
|
||||||
EXPECT_FLOAT_EQ(t.y, 7.f);
|
EXPECT_FLOAT_EQ(t.y, 7.f);
|
||||||
EXPECT_FLOAT_EQ(t.z, 6.f);
|
EXPECT_FLOAT_EQ(t.z, 6.f);
|
||||||
@@ -108,7 +108,8 @@ TEST(AabbTests, TopZUpOffsetBox)
|
|||||||
TEST(AabbTests, TopDefaultIsYUp)
|
TEST(AabbTests, TopDefaultIsYUp)
|
||||||
{
|
{
|
||||||
constexpr AABB box{{0.f, 0.f, 0.f}, {2.f, 4.f, 6.f}};
|
constexpr AABB box{{0.f, 0.f, 0.f}, {2.f, 4.f, 6.f}};
|
||||||
EXPECT_EQ(box.top(), box.top<UpAxis::Y>());
|
EXPECT_EQ(AABB::get_up_axis(), UpAxis::Y);
|
||||||
|
EXPECT_FLOAT_EQ(box.top().y, 4.f);
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- bottom() ---
|
// --- bottom() ---
|
||||||
@@ -116,7 +117,7 @@ TEST(AabbTests, TopDefaultIsYUp)
|
|||||||
TEST(AabbTests, BottomYUpSymmetricBox)
|
TEST(AabbTests, BottomYUpSymmetricBox)
|
||||||
{
|
{
|
||||||
constexpr AABB box{{-1.f, -2.f, -3.f}, {1.f, 2.f, 3.f}};
|
constexpr AABB box{{-1.f, -2.f, -3.f}, {1.f, 2.f, 3.f}};
|
||||||
constexpr auto b = box.bottom<UpAxis::Y>();
|
constexpr auto b = box.bottom();
|
||||||
EXPECT_FLOAT_EQ(b.x, 0.f);
|
EXPECT_FLOAT_EQ(b.x, 0.f);
|
||||||
EXPECT_FLOAT_EQ(b.y, -2.f);
|
EXPECT_FLOAT_EQ(b.y, -2.f);
|
||||||
EXPECT_FLOAT_EQ(b.z, 0.f);
|
EXPECT_FLOAT_EQ(b.z, 0.f);
|
||||||
@@ -125,7 +126,7 @@ TEST(AabbTests, BottomYUpSymmetricBox)
|
|||||||
TEST(AabbTests, BottomYUpOffsetBox)
|
TEST(AabbTests, BottomYUpOffsetBox)
|
||||||
{
|
{
|
||||||
constexpr AABB box{{1.f, 4.f, 2.f}, {3.f, 10.f, 6.f}};
|
constexpr AABB box{{1.f, 4.f, 2.f}, {3.f, 10.f, 6.f}};
|
||||||
constexpr auto b = box.bottom<UpAxis::Y>();
|
constexpr auto b = box.bottom();
|
||||||
EXPECT_FLOAT_EQ(b.x, 2.f);
|
EXPECT_FLOAT_EQ(b.x, 2.f);
|
||||||
EXPECT_FLOAT_EQ(b.y, 4.f);
|
EXPECT_FLOAT_EQ(b.y, 4.f);
|
||||||
EXPECT_FLOAT_EQ(b.z, 4.f);
|
EXPECT_FLOAT_EQ(b.z, 4.f);
|
||||||
@@ -133,8 +134,8 @@ TEST(AabbTests, BottomYUpOffsetBox)
|
|||||||
|
|
||||||
TEST(AabbTests, BottomZUpSymmetricBox)
|
TEST(AabbTests, BottomZUpSymmetricBox)
|
||||||
{
|
{
|
||||||
constexpr AABB box{{-1.f, -2.f, -3.f}, {1.f, 2.f, 3.f}};
|
constexpr AABBZ box{{-1.f, -2.f, -3.f}, {1.f, 2.f, 3.f}};
|
||||||
constexpr auto b = box.bottom<UpAxis::Z>();
|
constexpr auto b = box.bottom();
|
||||||
EXPECT_FLOAT_EQ(b.x, 0.f);
|
EXPECT_FLOAT_EQ(b.x, 0.f);
|
||||||
EXPECT_FLOAT_EQ(b.y, 0.f);
|
EXPECT_FLOAT_EQ(b.y, 0.f);
|
||||||
EXPECT_FLOAT_EQ(b.z, -3.f);
|
EXPECT_FLOAT_EQ(b.z, -3.f);
|
||||||
@@ -142,8 +143,8 @@ TEST(AabbTests, BottomZUpSymmetricBox)
|
|||||||
|
|
||||||
TEST(AabbTests, BottomZUpOffsetBox)
|
TEST(AabbTests, BottomZUpOffsetBox)
|
||||||
{
|
{
|
||||||
constexpr AABB box{{1.f, 4.f, 2.f}, {3.f, 10.f, 6.f}};
|
constexpr AABBZ box{{1.f, 4.f, 2.f}, {3.f, 10.f, 6.f}};
|
||||||
constexpr auto b = box.bottom<UpAxis::Z>();
|
constexpr auto b = box.bottom();
|
||||||
EXPECT_FLOAT_EQ(b.x, 2.f);
|
EXPECT_FLOAT_EQ(b.x, 2.f);
|
||||||
EXPECT_FLOAT_EQ(b.y, 7.f);
|
EXPECT_FLOAT_EQ(b.y, 7.f);
|
||||||
EXPECT_FLOAT_EQ(b.z, 2.f);
|
EXPECT_FLOAT_EQ(b.z, 2.f);
|
||||||
@@ -152,14 +153,33 @@ TEST(AabbTests, BottomZUpOffsetBox)
|
|||||||
TEST(AabbTests, BottomDefaultIsYUp)
|
TEST(AabbTests, BottomDefaultIsYUp)
|
||||||
{
|
{
|
||||||
constexpr AABB box{{0.f, 0.f, 0.f}, {2.f, 4.f, 6.f}};
|
constexpr AABB box{{0.f, 0.f, 0.f}, {2.f, 4.f, 6.f}};
|
||||||
EXPECT_EQ(box.bottom(), box.bottom<UpAxis::Y>());
|
EXPECT_EQ(AABB::get_up_axis(), UpAxis::Y);
|
||||||
|
EXPECT_FLOAT_EQ(box.bottom().y, 0.f);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(AabbTests, TopAndBottomAreSymmetric)
|
TEST(AabbTests, TopAndBottomAreSymmetric)
|
||||||
{
|
{
|
||||||
constexpr AABB box{{-1.f, -2.f, -3.f}, {1.f, 2.f, 3.f}};
|
constexpr AABB box{{-1.f, -2.f, -3.f}, {1.f, 2.f, 3.f}};
|
||||||
EXPECT_FLOAT_EQ(box.top<UpAxis::Y>().y, -box.bottom<UpAxis::Y>().y);
|
constexpr AABBZ z_up_box{{-1.f, -2.f, -3.f}, {1.f, 2.f, 3.f}};
|
||||||
EXPECT_FLOAT_EQ(box.top<UpAxis::Z>().z, -box.bottom<UpAxis::Z>().z);
|
EXPECT_FLOAT_EQ(box.top().y, -box.bottom().y);
|
||||||
|
EXPECT_FLOAT_EQ(z_up_box.top().z, -z_up_box.bottom().z);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- vertices() ---
|
||||||
|
|
||||||
|
TEST(AabbTests, VerticesReturnsAllCorners)
|
||||||
|
{
|
||||||
|
constexpr AABB box{{1.f, 2.f, 3.f}, {4.f, 6.f, 8.f}};
|
||||||
|
constexpr auto v = box.vertices();
|
||||||
|
|
||||||
|
EXPECT_EQ(v[0], Vec3(1.f, 2.f, 3.f));
|
||||||
|
EXPECT_EQ(v[1], Vec3(4.f, 2.f, 3.f));
|
||||||
|
EXPECT_EQ(v[2], Vec3(1.f, 6.f, 3.f));
|
||||||
|
EXPECT_EQ(v[3], Vec3(4.f, 6.f, 3.f));
|
||||||
|
EXPECT_EQ(v[4], Vec3(1.f, 2.f, 8.f));
|
||||||
|
EXPECT_EQ(v[5], Vec3(4.f, 2.f, 8.f));
|
||||||
|
EXPECT_EQ(v[6], Vec3(1.f, 6.f, 8.f));
|
||||||
|
EXPECT_EQ(v[7], Vec3(4.f, 6.f, 8.f));
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- is_collide() ---
|
// --- is_collide() ---
|
||||||
|
|||||||
@@ -2,10 +2,10 @@
|
|||||||
// Created by Orange on 11/30/2024.
|
// Created by Orange on 11/30/2024.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <omath/trigonometry/angle.hpp>
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include <numbers>
|
#include <numbers>
|
||||||
|
#include <omath/trigonometry/angle.hpp>
|
||||||
|
|
||||||
using namespace omath;
|
using namespace omath;
|
||||||
|
|
||||||
@@ -14,11 +14,22 @@ namespace
|
|||||||
|
|
||||||
// Handy aliases (defaults: Type=float, [0,360], Normalized)
|
// Handy aliases (defaults: Type=float, [0,360], Normalized)
|
||||||
using Deg = Angle<float, static_cast<float>(0), static_cast<float>(360), AngleFlags::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 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>;
|
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 float k_eps = 1e-5f;
|
||||||
|
|
||||||
|
constexpr bool close_to(const float actual, const float expected, const float epsilon)
|
||||||
|
{
|
||||||
|
const float diff = actual - expected;
|
||||||
|
return (diff < 0.0f ? -diff : diff) <= epsilon;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
// ---------- Construction / factories ----------
|
// ---------- Construction / factories ----------
|
||||||
@@ -30,6 +41,12 @@ TEST(UnitTestAngle, DefaultConstructor_IsZeroDegrees)
|
|||||||
EXPECT_FLOAT_EQ(a.as_degrees(), 0.0f);
|
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)
|
TEST(UnitTestAngle, FromDegrees_Normalized_WrapsAboveMax)
|
||||||
{
|
{
|
||||||
const Deg a = Deg::from_degrees(370.0f);
|
const Deg a = Deg::from_degrees(370.0f);
|
||||||
@@ -60,6 +77,14 @@ TEST(UnitTestAngle, FromRadians_And_AsRadians)
|
|||||||
EXPECT_NEAR(b.as_radians(), std::numbers::pi_v<float>, 1e-6f);
|
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 ----------
|
// ---------- Unary minus & deref ----------
|
||||||
|
|
||||||
TEST(UnitTestAngle, UnaryMinus_Normalized)
|
TEST(UnitTestAngle, UnaryMinus_Normalized)
|
||||||
@@ -95,17 +120,6 @@ TEST(UnitTestAngle, SinCosTanCot_BasicCases)
|
|||||||
EXPECT_NEAR(a90.cos(), 0.0f, 1e-4f);
|
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 ----------
|
// ---------- Compound arithmetic ----------
|
||||||
|
|
||||||
TEST(UnitTestAngle, PlusEquals_Normalized_Wraps)
|
TEST(UnitTestAngle, PlusEquals_Normalized_Wraps)
|
||||||
@@ -136,6 +150,16 @@ TEST(UnitTestAngle, MinusEquals_Clamped_Clamps)
|
|||||||
EXPECT_FLOAT_EQ(p.as_degrees(), -90.0f);
|
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 ----------
|
// ---------- Alternative ranges ----------
|
||||||
|
|
||||||
TEST(UnitTestAngle, NormalizedRange_Neg180To180)
|
TEST(UnitTestAngle, NormalizedRange_Neg180To180)
|
||||||
@@ -177,7 +201,7 @@ TEST(UnitTestAngle, Formatter_PrintsDegreesWithSuffix)
|
|||||||
|
|
||||||
TEST(UnitTestAngle, BinaryPlus_ReturnsWrappedSum)
|
TEST(UnitTestAngle, BinaryPlus_ReturnsWrappedSum)
|
||||||
{
|
{
|
||||||
Angle<> a = Deg::from_degrees(350.0f);
|
const Angle<> a = Deg::from_degrees(350.0f);
|
||||||
const Deg b = Deg::from_degrees(20.0f);
|
const Deg b = Deg::from_degrees(20.0f);
|
||||||
const Deg c = a + b; // expect 10°
|
const Deg c = a + b; // expect 10°
|
||||||
EXPECT_FLOAT_EQ(c.as_degrees(), 10.0f);
|
EXPECT_FLOAT_EQ(c.as_degrees(), 10.0f);
|
||||||
@@ -185,8 +209,26 @@ TEST(UnitTestAngle, BinaryPlus_ReturnsWrappedSum)
|
|||||||
|
|
||||||
TEST(UnitTestAngle, BinaryMinus_ReturnsWrappedDiff)
|
TEST(UnitTestAngle, BinaryMinus_ReturnsWrappedDiff)
|
||||||
{
|
{
|
||||||
Angle<> a = Deg::from_degrees(10.0f);
|
const Angle<> a = Deg::from_degrees(10.0f);
|
||||||
const Deg b = Deg::from_degrees(30.0f);
|
const Deg b = Deg::from_degrees(30.0f);
|
||||||
const Deg c = a - b; // expect 340°
|
const Deg c = a - b; // expect 340°
|
||||||
EXPECT_FLOAT_EQ(c.as_degrees(), 340.0f);
|
EXPECT_FLOAT_EQ(c.as_degrees(), 340.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static_assert(close_to(Pitch::from_degrees(0.0f).sin(), 0.0f, k_eps),
|
||||||
|
"Sin should be constexpr with embedded constexpr math");
|
||||||
|
static_assert(close_to(Pitch::from_degrees(0.0f).cos(), 1.0f, k_eps),
|
||||||
|
"Cos should be constexpr with embedded constexpr math");
|
||||||
|
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_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);
|
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);
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
//
|
||||||
|
// Created by orange on 30.06.2026.
|
||||||
|
//
|
||||||
|
#include <gtest/gtest.h>
|
||||||
|
#include <memory>
|
||||||
|
#include <omath/3d_primitives/aabb.hpp>
|
||||||
|
#include <omath/engines/unreal_engine/camera.hpp>
|
||||||
|
#include <omath/hud/entity_overlay.hpp>
|
||||||
|
|
||||||
|
TEST(EntityOverlayTests, FromAabbSupportsDoubleCameraCoordinates)
|
||||||
|
{
|
||||||
|
constexpr auto fov = omath::projection::FieldOfView::from_degrees(90.f);
|
||||||
|
const omath::unreal_engine::Camera camera{{0.0, 0.0, 0.0}, {}, {1920.f, 1080.f}, fov, 0.01, 1000.0};
|
||||||
|
const omath::primitives::Aabb<double> aabb{{90.0, -1.0, -1.0}, {110.0, 1.0, 1.0}};
|
||||||
|
|
||||||
|
const auto overlay = omath::hud::EntityOverlay::from_aabb(camera, aabb, 0.5f,
|
||||||
|
std::shared_ptr<omath::hud::HudRendererInterface>{});
|
||||||
|
|
||||||
|
ASSERT_TRUE(overlay.has_value());
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(EntityOverlayTests, FromAabbReturnsErrorCodeIfNoVertexProjects)
|
||||||
|
{
|
||||||
|
constexpr auto fov = omath::projection::FieldOfView::from_degrees(90.f);
|
||||||
|
const omath::unreal_engine::Camera camera{{0.0, 0.0, 0.0}, {}, {1920.f, 1080.f}, fov, 0.01, 1000.0};
|
||||||
|
const omath::primitives::Aabb<double> aabb{{-110.0, -1.0, -1.0}, {-90.0, 1.0, 1.0}};
|
||||||
|
|
||||||
|
const auto overlay = omath::hud::EntityOverlay::from_aabb(camera, aabb, 0.5f,
|
||||||
|
std::shared_ptr<omath::hud::HudRendererInterface>{});
|
||||||
|
|
||||||
|
ASSERT_FALSE(overlay.has_value());
|
||||||
|
EXPECT_EQ(overlay.error(), omath::hud::EntityOverlayError::NO_PROJECTED_VERTEX);
|
||||||
|
}
|
||||||
+152
-35
@@ -1,11 +1,38 @@
|
|||||||
// UnitTestMat.cpp
|
// UnitTestMat.cpp
|
||||||
#include "omath/linear_algebra/mat.hpp"
|
#include "omath/linear_algebra/mat.hpp"
|
||||||
#include "omath/linear_algebra/vector3.hpp"
|
#include "omath/linear_algebra/vector3.hpp"
|
||||||
|
#include "omath/trigonometry/angle.hpp"
|
||||||
#include "omath/trigonometry/angles.hpp"
|
#include "omath/trigonometry/angles.hpp"
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
|
|
||||||
using namespace omath;
|
using namespace omath;
|
||||||
|
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
using Pitch = Angle<float, static_cast<float>(-90), static_cast<float>(90), AngleFlags::Clamped>;
|
||||||
|
|
||||||
|
constexpr bool close_to(const float actual, const float expected, const float epsilon)
|
||||||
|
{
|
||||||
|
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
|
class UnitTestMat : public ::testing::Test
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
@@ -80,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;
|
||||||
@@ -163,7 +229,6 @@ TEST_F(UnitTestMat, StaticMethod_ToScreenMat)
|
|||||||
EXPECT_FLOAT_EQ(screen_mat.at(3, 3), 1.0f);
|
EXPECT_FLOAT_EQ(screen_mat.at(3, 3), 1.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Test exception handling in At() method
|
// Test exception handling in At() method
|
||||||
TEST_F(UnitTestMat, Method_At_OutOfRange)
|
TEST_F(UnitTestMat, Method_At_OutOfRange)
|
||||||
{
|
{
|
||||||
@@ -211,7 +276,7 @@ TEST(UnitTestMatStandalone, Transpose_NonSquare)
|
|||||||
TEST(UnitTestMatStandalone, Enverse)
|
TEST(UnitTestMatStandalone, Enverse)
|
||||||
{
|
{
|
||||||
constexpr Mat<2, 2> m{{1.0f, 3.0f}, {2.0f, 5.0f}};
|
constexpr Mat<2, 2> m{{1.0f, 3.0f}, {2.0f, 5.0f}};
|
||||||
constexpr Mat<2,2> mv{{-5.0f, 3.0f}, {2.0f, -1.0f}};
|
constexpr Mat<2, 2> mv{{-5.0f, 3.0f}, {2.0f, -1.0f}};
|
||||||
|
|
||||||
EXPECT_EQ(mv, m.inverted());
|
EXPECT_EQ(mv, m.inverted());
|
||||||
}
|
}
|
||||||
@@ -234,9 +299,8 @@ TEST(UnitTestMatStandalone, Equanity)
|
|||||||
}
|
}
|
||||||
TEST(UnitTestMatStandalone, MatPerspectiveLeftHanded)
|
TEST(UnitTestMatStandalone, MatPerspectiveLeftHanded)
|
||||||
{
|
{
|
||||||
const auto perspective_proj = mat_perspective_left_handed_vertical_fov(90.f, 16.f/9.f, 0.1f, 1000.f);
|
const auto perspective_proj = mat_perspective_left_handed_vertical_fov(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
auto projected = perspective_proj
|
auto projected = perspective_proj * mat_column_from_vector<float>({0, 0, 0.1001});
|
||||||
* mat_column_from_vector<float>({0, 0, 0.1001});
|
|
||||||
|
|
||||||
projected /= projected.at(3, 0);
|
projected /= projected.at(3, 0);
|
||||||
|
|
||||||
@@ -245,8 +309,9 @@ TEST(UnitTestMatStandalone, MatPerspectiveLeftHanded)
|
|||||||
|
|
||||||
TEST(UnitTestMatStandalone, MatPerspectiveLeftHandedZeroToOne)
|
TEST(UnitTestMatStandalone, MatPerspectiveLeftHandedZeroToOne)
|
||||||
{
|
{
|
||||||
const auto proj = mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
const auto proj =
|
||||||
90.f, 16.f / 9.f, 0.1f, 1000.f);
|
mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
||||||
|
90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
|
|
||||||
// Near plane point should map to z ~ 0
|
// Near plane point should map to z ~ 0
|
||||||
auto near_pt = proj * mat_column_from_vector<float>({0, 0, 0.1f});
|
auto near_pt = proj * mat_column_from_vector<float>({0, 0, 0.1f});
|
||||||
@@ -267,8 +332,9 @@ TEST(UnitTestMatStandalone, MatPerspectiveLeftHandedZeroToOne)
|
|||||||
|
|
||||||
TEST(UnitTestMatStandalone, MatPerspectiveRightHandedZeroToOne)
|
TEST(UnitTestMatStandalone, MatPerspectiveRightHandedZeroToOne)
|
||||||
{
|
{
|
||||||
const auto proj = mat_perspective_right_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
const auto proj =
|
||||||
90.f, 16.f / 9.f, 0.1f, 1000.f);
|
mat_perspective_right_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
||||||
|
90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
|
|
||||||
// Near plane point (negative z for right-handed) should map to z ~ 0
|
// Near plane point (negative z for right-handed) should map to z ~ 0
|
||||||
auto near_pt = proj * mat_column_from_vector<float>({0, 0, -0.1f});
|
auto near_pt = proj * mat_column_from_vector<float>({0, 0, -0.1f});
|
||||||
@@ -292,7 +358,8 @@ TEST(UnitTestMatStandalone, MatPerspectiveNegativeOneToOneRange)
|
|||||||
// Verify existing [-1, 1] behavior with explicit template arg matches default
|
// Verify existing [-1, 1] behavior with explicit template arg matches default
|
||||||
const auto proj_default = mat_perspective_left_handed_vertical_fov(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
const auto proj_default = mat_perspective_left_handed_vertical_fov(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
const auto proj_explicit = mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
const auto proj_explicit = mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(
|
||||||
|
90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
|
|
||||||
EXPECT_EQ(proj_default, proj_explicit);
|
EXPECT_EQ(proj_default, proj_explicit);
|
||||||
|
|
||||||
@@ -310,7 +377,8 @@ TEST(UnitTestMatStandalone, MatPerspectiveNegativeOneToOneRange)
|
|||||||
TEST(UnitTestMatStandalone, MatPerspectiveRightHandedNegOneToOne)
|
TEST(UnitTestMatStandalone, MatPerspectiveRightHandedNegOneToOne)
|
||||||
{
|
{
|
||||||
const auto proj = mat_perspective_right_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
const auto proj = mat_perspective_right_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(90.f, 16.f / 9.f,
|
||||||
|
0.1f, 1000.f);
|
||||||
|
|
||||||
// Near plane (negative z for RH) should map to z ~ -1
|
// Near plane (negative z for RH) should map to z ~ -1
|
||||||
auto near_pt = proj * mat_column_from_vector<float>({0, 0, -0.1f});
|
auto near_pt = proj * mat_column_from_vector<float>({0, 0, -0.1f});
|
||||||
@@ -326,14 +394,15 @@ TEST(UnitTestMatStandalone, MatPerspectiveRightHandedNegOneToOne)
|
|||||||
auto mid_pt = proj * mat_column_from_vector<float>({0, 0, -500.f});
|
auto mid_pt = proj * mat_column_from_vector<float>({0, 0, -500.f});
|
||||||
mid_pt /= mid_pt.at(3, 0);
|
mid_pt /= mid_pt.at(3, 0);
|
||||||
EXPECT_GT(mid_pt.at(2, 0), -1.0f);
|
EXPECT_GT(mid_pt.at(2, 0), -1.0f);
|
||||||
EXPECT_LT(mid_pt.at(2, 0), 1.0f);
|
EXPECT_LT(mid_pt.at(2, 0), 1.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(UnitTestMatStandalone, MatPerspectiveLeftHandedHorizontalFovZeroToOne)
|
TEST(UnitTestMatStandalone, MatPerspectiveLeftHandedHorizontalFovZeroToOne)
|
||||||
{
|
{
|
||||||
// hfov=90 deg, aspect=16/9 => tan(hfov/2)=1, so x_axis=1 and y_axis=aspect
|
// hfov=90 deg, aspect=16/9 => tan(hfov/2)=1, so x_axis=1 and y_axis=aspect
|
||||||
const auto proj = mat_perspective_left_handed_horizontal_fov<float, MatStoreType::ROW_MAJOR,
|
const auto proj =
|
||||||
NDCDepthRange::ZERO_TO_ONE>(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
mat_perspective_left_handed_horizontal_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
||||||
|
90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
|
|
||||||
// Near plane should map to z ~ 0
|
// Near plane should map to z ~ 0
|
||||||
auto near_pt = proj * mat_column_from_vector<float>({0, 0, 0.1f});
|
auto near_pt = proj * mat_column_from_vector<float>({0, 0, 0.1f});
|
||||||
@@ -354,7 +423,8 @@ TEST(UnitTestMatStandalone, MatPerspectiveLeftHandedHorizontalFovZeroToOne)
|
|||||||
TEST(UnitTestMatStandalone, MatPerspectiveLeftHandedHorizontalFovNegOneToOne)
|
TEST(UnitTestMatStandalone, MatPerspectiveLeftHandedHorizontalFovNegOneToOne)
|
||||||
{
|
{
|
||||||
const auto proj = mat_perspective_left_handed_horizontal_fov<float, MatStoreType::ROW_MAJOR,
|
const auto proj = mat_perspective_left_handed_horizontal_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(90.f, 16.f / 9.f,
|
||||||
|
0.1f, 1000.f);
|
||||||
|
|
||||||
auto near_pt = proj * mat_column_from_vector<float>({0, 0, 0.1f});
|
auto near_pt = proj * mat_column_from_vector<float>({0, 0, 0.1f});
|
||||||
near_pt /= near_pt.at(3, 0);
|
near_pt /= near_pt.at(3, 0);
|
||||||
@@ -371,8 +441,9 @@ TEST(UnitTestMatStandalone, MatPerspectiveLeftHandedHorizontalFovNegOneToOne)
|
|||||||
|
|
||||||
TEST(UnitTestMatStandalone, MatPerspectiveRightHandedHorizontalFovZeroToOne)
|
TEST(UnitTestMatStandalone, MatPerspectiveRightHandedHorizontalFovZeroToOne)
|
||||||
{
|
{
|
||||||
const auto proj = mat_perspective_right_handed_horizontal_fov<float, MatStoreType::ROW_MAJOR,
|
const auto proj =
|
||||||
NDCDepthRange::ZERO_TO_ONE>(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
mat_perspective_right_handed_horizontal_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
||||||
|
90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
|
|
||||||
auto near_pt = proj * mat_column_from_vector<float>({0, 0, -0.1f});
|
auto near_pt = proj * mat_column_from_vector<float>({0, 0, -0.1f});
|
||||||
near_pt /= near_pt.at(3, 0);
|
near_pt /= near_pt.at(3, 0);
|
||||||
@@ -390,7 +461,8 @@ TEST(UnitTestMatStandalone, MatPerspectiveRightHandedHorizontalFovZeroToOne)
|
|||||||
TEST(UnitTestMatStandalone, MatPerspectiveRightHandedHorizontalFovNegOneToOne)
|
TEST(UnitTestMatStandalone, MatPerspectiveRightHandedHorizontalFovNegOneToOne)
|
||||||
{
|
{
|
||||||
const auto proj = mat_perspective_right_handed_horizontal_fov<float, MatStoreType::ROW_MAJOR,
|
const auto proj = mat_perspective_right_handed_horizontal_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(90.f, 16.f / 9.f,
|
||||||
|
0.1f, 1000.f);
|
||||||
|
|
||||||
auto near_pt = proj * mat_column_from_vector<float>({0, 0, -0.1f});
|
auto near_pt = proj * mat_column_from_vector<float>({0, 0, -0.1f});
|
||||||
near_pt /= near_pt.at(3, 0);
|
near_pt /= near_pt.at(3, 0);
|
||||||
@@ -408,7 +480,7 @@ TEST(UnitTestMatStandalone, MatPerspectiveRightHandedHorizontalFovNegOneToOne)
|
|||||||
TEST(UnitTestMatStandalone, MatPerspectiveHorizontalVsVerticalFovEquivalence)
|
TEST(UnitTestMatStandalone, MatPerspectiveHorizontalVsVerticalFovEquivalence)
|
||||||
{
|
{
|
||||||
constexpr float hfov_deg = 90.f;
|
constexpr float hfov_deg = 90.f;
|
||||||
constexpr float aspect = 16.f / 9.f;
|
constexpr float aspect = 16.f / 9.f;
|
||||||
const float vfov_deg = angles::horizontal_fov_to_vertical(hfov_deg, aspect);
|
const float vfov_deg = angles::horizontal_fov_to_vertical(hfov_deg, aspect);
|
||||||
|
|
||||||
const auto proj_h = mat_perspective_left_handed_horizontal_fov(hfov_deg, aspect, 0.1f, 1000.f);
|
const auto proj_h = mat_perspective_left_handed_horizontal_fov(hfov_deg, aspect, 0.1f, 1000.f);
|
||||||
@@ -426,11 +498,11 @@ TEST(UnitTestMatStandalone, MatPerspectiveLeftHandedVerticalFovHandedness)
|
|||||||
{
|
{
|
||||||
const auto proj = mat_perspective_left_handed_vertical_fov(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
const auto proj = mat_perspective_left_handed_vertical_fov(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
|
|
||||||
const auto in_front = proj * mat_column_from_vector<float>({0, 0, 1.f});
|
const auto in_front = proj * mat_column_from_vector<float>({0, 0, 1.f});
|
||||||
const auto behind = proj * mat_column_from_vector<float>({0, 0, -1.f});
|
const auto behind = proj * mat_column_from_vector<float>({0, 0, -1.f});
|
||||||
|
|
||||||
EXPECT_GT(in_front.at(3, 0), 0.0f);
|
EXPECT_GT(in_front.at(3, 0), 0.0f);
|
||||||
EXPECT_LT(behind.at(3, 0), 0.0f);
|
EXPECT_LT(behind.at(3, 0), 0.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(UnitTestMatStandalone, MatPerspectiveRightHandedVerticalFovHandedness)
|
TEST(UnitTestMatStandalone, MatPerspectiveRightHandedVerticalFovHandedness)
|
||||||
@@ -438,21 +510,21 @@ TEST(UnitTestMatStandalone, MatPerspectiveRightHandedVerticalFovHandedness)
|
|||||||
const auto proj = mat_perspective_right_handed_vertical_fov(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
const auto proj = mat_perspective_right_handed_vertical_fov(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
|
|
||||||
const auto in_front = proj * mat_column_from_vector<float>({0, 0, -1.f});
|
const auto in_front = proj * mat_column_from_vector<float>({0, 0, -1.f});
|
||||||
const auto behind = proj * mat_column_from_vector<float>({0, 0, 1.f});
|
const auto behind = proj * mat_column_from_vector<float>({0, 0, 1.f});
|
||||||
|
|
||||||
EXPECT_GT(in_front.at(3, 0), 0.0f);
|
EXPECT_GT(in_front.at(3, 0), 0.0f);
|
||||||
EXPECT_LT(behind.at(3, 0), 0.0f);
|
EXPECT_LT(behind.at(3, 0), 0.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(UnitTestMatStandalone, MatPerspectiveLeftHandedHorizontalFovHandedness)
|
TEST(UnitTestMatStandalone, MatPerspectiveLeftHandedHorizontalFovHandedness)
|
||||||
{
|
{
|
||||||
const auto proj = mat_perspective_left_handed_horizontal_fov(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
const auto proj = mat_perspective_left_handed_horizontal_fov(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
|
|
||||||
const auto in_front = proj * mat_column_from_vector<float>({0, 0, 1.f});
|
const auto in_front = proj * mat_column_from_vector<float>({0, 0, 1.f});
|
||||||
const auto behind = proj * mat_column_from_vector<float>({0, 0, -1.f});
|
const auto behind = proj * mat_column_from_vector<float>({0, 0, -1.f});
|
||||||
|
|
||||||
EXPECT_GT(in_front.at(3, 0), 0.0f);
|
EXPECT_GT(in_front.at(3, 0), 0.0f);
|
||||||
EXPECT_LT(behind.at(3, 0), 0.0f);
|
EXPECT_LT(behind.at(3, 0), 0.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(UnitTestMatStandalone, MatPerspectiveRightHandedHorizontalFovHandedness)
|
TEST(UnitTestMatStandalone, MatPerspectiveRightHandedHorizontalFovHandedness)
|
||||||
@@ -460,10 +532,10 @@ TEST(UnitTestMatStandalone, MatPerspectiveRightHandedHorizontalFovHandedness)
|
|||||||
const auto proj = mat_perspective_right_handed_horizontal_fov(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
const auto proj = mat_perspective_right_handed_horizontal_fov(90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
|
|
||||||
const auto in_front = proj * mat_column_from_vector<float>({0, 0, -1.f});
|
const auto in_front = proj * mat_column_from_vector<float>({0, 0, -1.f});
|
||||||
const auto behind = proj * mat_column_from_vector<float>({0, 0, 1.f});
|
const auto behind = proj * mat_column_from_vector<float>({0, 0, 1.f});
|
||||||
|
|
||||||
EXPECT_GT(in_front.at(3, 0), 0.0f);
|
EXPECT_GT(in_front.at(3, 0), 0.0f);
|
||||||
EXPECT_LT(behind.at(3, 0), 0.0f);
|
EXPECT_LT(behind.at(3, 0), 0.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(UnitTestMatStandalone, MatPerspectiveZeroToOneEquanity)
|
TEST(UnitTestMatStandalone, MatPerspectiveZeroToOneEquanity)
|
||||||
@@ -472,10 +544,12 @@ TEST(UnitTestMatStandalone, MatPerspectiveZeroToOneEquanity)
|
|||||||
constexpr omath::Vector3<float> left_handed = {0, 2, 10};
|
constexpr omath::Vector3<float> left_handed = {0, 2, 10};
|
||||||
constexpr omath::Vector3<float> right_handed = {0, 2, -10};
|
constexpr omath::Vector3<float> right_handed = {0, 2, -10};
|
||||||
|
|
||||||
const auto proj_lh = mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
const auto proj_lh =
|
||||||
90.f, 16.f / 9.f, 0.1f, 1000.f);
|
mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
||||||
const auto proj_rh = mat_perspective_right_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
90.f, 16.f / 9.f, 0.1f, 1000.f);
|
const auto proj_rh =
|
||||||
|
mat_perspective_right_handed_vertical_fov<float, MatStoreType::ROW_MAJOR, NDCDepthRange::ZERO_TO_ONE>(
|
||||||
|
90.f, 16.f / 9.f, 0.1f, 1000.f);
|
||||||
|
|
||||||
auto ndc_lh = proj_lh * mat_column_from_vector(left_handed);
|
auto ndc_lh = proj_lh * mat_column_from_vector(left_handed);
|
||||||
auto ndc_rh = proj_rh * mat_column_from_vector(right_handed);
|
auto ndc_rh = proj_rh * mat_column_from_vector(right_handed);
|
||||||
@@ -518,8 +592,51 @@ TEST(UnitTestMatStandalone, MatOrthoNegativeOneToOneDefault)
|
|||||||
{
|
{
|
||||||
// Verify explicit [-1, 1] matches default
|
// Verify explicit [-1, 1] matches default
|
||||||
const auto ortho_default = mat_ortho_left_handed(-1.f, 1.f, -1.f, 1.f, 0.1f, 100.f);
|
const auto ortho_default = mat_ortho_left_handed(-1.f, 1.f, -1.f, 1.f, 0.1f, 100.f);
|
||||||
const auto ortho_explicit = mat_ortho_left_handed<float, MatStoreType::ROW_MAJOR,
|
const auto ortho_explicit =
|
||||||
NDCDepthRange::NEGATIVE_ONE_TO_ONE>(-1.f, 1.f, -1.f, 1.f, 0.1f, 100.f);
|
mat_ortho_left_handed<float, MatStoreType::ROW_MAJOR, NDCDepthRange::NEGATIVE_ONE_TO_ONE>(-1.f, 1.f, -1.f,
|
||||||
|
1.f, 0.1f, 100.f);
|
||||||
|
|
||||||
EXPECT_EQ(ortho_default, ortho_explicit);
|
EXPECT_EQ(ortho_default, ortho_explicit);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static_assert(
|
||||||
|
[]
|
||||||
|
{
|
||||||
|
constexpr auto scale = mat_extract_scale(mat_scale(Vector3{2.0f, 3.0f, 4.0f}));
|
||||||
|
return close_to(scale.x, 2.0f, 1e-5f) && close_to(scale.y, 3.0f, 1e-5f) && close_to(scale.z, 4.0f, 1e-5f);
|
||||||
|
}(),
|
||||||
|
"Mat scale extraction should be constexpr with embedded constexpr math");
|
||||||
|
|
||||||
|
static_assert(
|
||||||
|
[]
|
||||||
|
{
|
||||||
|
constexpr auto rotation = mat_rotation_axis_z<float>(Pitch::from_degrees(90.0f));
|
||||||
|
return close_to(rotation.at(0, 0), 0.0f, 1e-5f) && close_to(rotation.at(0, 1), -1.0f, 1e-5f)
|
||||||
|
&& close_to(rotation.at(1, 0), 1.0f, 1e-5f) && close_to(rotation.at(1, 1), 0.0f, 1e-5f)
|
||||||
|
&& close_to(rotation.at(2, 2), 1.0f, 1e-5f) && close_to(rotation.at(3, 3), 1.0f, 1e-5f);
|
||||||
|
}(),
|
||||||
|
"Mat rotation should be constexpr with embedded constexpr math");
|
||||||
|
|
||||||
|
static_assert(
|
||||||
|
[]
|
||||||
|
{
|
||||||
|
constexpr auto projection =
|
||||||
|
mat_perspective_left_handed_vertical_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
|
NDCDepthRange::ZERO_TO_ONE>(90.0f, 1.0f, 1.0f, 11.0f);
|
||||||
|
return close_to(projection.at(0, 0), 1.0f, 1e-5f) && close_to(projection.at(1, 1), 1.0f, 1e-5f)
|
||||||
|
&& close_to(projection.at(2, 2), 1.1f, 1e-5f) && close_to(projection.at(2, 3), -1.1f, 1e-5f)
|
||||||
|
&& close_to(projection.at(3, 2), 1.0f, 1e-5f);
|
||||||
|
}(),
|
||||||
|
"Mat vertical-FOV perspective should be constexpr with embedded constexpr math");
|
||||||
|
|
||||||
|
static_assert(
|
||||||
|
[]
|
||||||
|
{
|
||||||
|
constexpr auto projection =
|
||||||
|
mat_perspective_right_handed_horizontal_fov<float, MatStoreType::ROW_MAJOR,
|
||||||
|
NDCDepthRange::ZERO_TO_ONE>(90.0f, 2.0f, 1.0f, 11.0f);
|
||||||
|
return close_to(projection.at(0, 0), 1.0f, 1e-5f) && close_to(projection.at(1, 1), 2.0f, 1e-5f)
|
||||||
|
&& close_to(projection.at(2, 2), -1.1f, 1e-5f) && close_to(projection.at(2, 3), -1.1f, 1e-5f)
|
||||||
|
&& close_to(projection.at(3, 2), -1.0f, 1e-5f);
|
||||||
|
}(),
|
||||||
|
"Mat horizontal-FOV perspective should be constexpr with embedded constexpr math");
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user