Compare commits

..

35 Commits

Author SHA1 Message Date
orange 43e2af556f 5.5.2 2026-08-04 23:00:40 +03:00
orange 550a08c24e fix 2026-08-04 22:39:04 +03:00
orange 70fba5addd fix freebsd 2026-08-04 16:08:01 +03:00
orange d9815cd757 fix 2026-08-04 03:20:05 +03:00
orange ee00767147 fixed for kf3 2026-08-02 23:45:45 +03:00
orange 91090342bf Auto stash before checking out "origin/main" 2026-07-29 12:54:51 +03:00
orange 34a5bf0ce1 paralel build 2026-07-29 03:48:27 +03:00
orange f1fbd5ac3f fix 2026-07-29 03:05:26 +03:00
orange 4a79f260c5 added hashing/base64 functions 2026-07-29 02:58:25 +03:00
orange ac57e8da9e improvement 2026-07-20 01:00:50 +03:00
orange ecc9852cd8 improved angle class 2026-07-19 23:44:50 +03:00
orange 5591eb6f88 mingw fix 2026-07-19 17:13:59 +03:00
orange 4a6d7c458b patch 2026-07-19 16:55:17 +03:00
orange a791ac1a84 fix 2026-07-19 16:47:25 +03:00
orange 56b10d3d9c fix 2026-07-19 16:36:37 +03:00
orange c068e3e0d8 updated vcpkg base line 2026-07-19 16:16:06 +03:00
orange 078e00db0d added final 2026-07-19 14:49:56 +03:00
orange b3c8438bf1 improved matrix multiplication 2026-07-16 01:10:55 +03:00
orange 335096d0c8 fix 2026-07-15 20:38:04 +03:00
orange 9f4cc99790 5.5.1 2026-07-15 20:03:10 +03:00
orange f2ff761823 umped version 2026-07-15 19:50:16 +03:00
orange 4cd5e8f829 improved stuff 2026-07-15 19:42:44 +03:00
orange eac3adba2a Merge pull request #203 from BillyONeal/find-dependency
Add missing `find_dependency` calls.
2026-07-15 19:42:11 +03:00
Billy Robert O'Neal III 4e413d977a Add missing find_dependency calls.
This was detected in reviewing https://github.com/microsoft/vcpkg/pull/52901/ by GPT 5.6 Sol.

(Also the file VERSION in this repo still claims 5.4.0 rather than 5.5.0 but I have not tried to fix that in this PR as I'm not sure what you want your next version to be)
2026-07-14 16:29:45 -07:00
orange d4c86dacc7 added gradient dir 2026-07-12 22:51:36 +03:00
orange 945f80241c Merge pull request #202 from orange-cpp/feature/gradient
Feature/gradient
2026-07-12 18:09:44 +03:00
orange 238d6aef4e improve skeleton esp 2026-07-12 11:27:34 +03:00
orange feb26e01c6 improved bars 2026-07-12 11:17:50 +03:00
orange 2c6d7c2dfa bar fixes 2026-07-12 11:10:13 +03:00
orange fb1ffac240 improvement 2026-07-11 23:17:14 +03:00
orange cbe220664f added outside glow 2026-07-11 22:39:18 +03:00
orange 1618a41318 added blur 2026-07-11 22:20:26 +03:00
orange 26823609e7 added glow 2026-07-11 18:50:59 +03:00
orange 1c89b12d32 improved stuff 2026-07-11 18:17:59 +03:00
orange 176f5b2aa1 gradient text + box fill 2026-07-11 18:05:20 +03:00
48 changed files with 1868 additions and 678 deletions
+50 -79
View File
@@ -87,6 +87,9 @@ jobs:
shell: bash
run: ${{ matrix.install_cmd }}
- name: Set up CMake and Ninja
uses: lukka/get-cmake@v4.3.4
- name: Checkout repository (with sub-modules)
uses: actions/checkout@v4
with:
@@ -245,72 +248,37 @@ jobs:
run: |
./out/Debug/unit_tests.exe
- name: Process Coverage (llvm-profdata & llvm-cov)
- name: Process and render coverage
if: ${{ matrix.triplet == 'x64-windows' }}
shell: pwsh
run: |
$BUILD_DIR = "cmake-build/build/${{ matrix.preset }}"
$EXE_PATH = "./out/Debug/unit_tests.exe"
# 1. Merge raw profile data (essential step)
$buildDir = "cmake-build/build/${{ matrix.preset }}"
$exePath = "./out/Debug/unit_tests.exe"
$profile = "$buildDir/unit_tests.profdata"
$htmlDir = "$buildDir/coverage-html"
& "C:/Program Files/LLVM/bin/llvm-profdata.exe" merge `
-sparse "$BUILD_DIR/unit_tests.profraw" `
-o "$BUILD_DIR/unit_tests.profdata"
-sparse "$buildDir/unit_tests.profraw" `
-o $profile
# 2. Export to LCOV format
# NOTE: We explicitly ignore vcpkg_installed and system headers
& "C:/Program Files/LLVM/bin/llvm-cov.exe" export "$EXE_PATH" `
-instr-profile="$BUILD_DIR/unit_tests.profdata" `
-format=lcov `
-ignore-filename-regex="vcpkg_installed|external|tests" `
> "$BUILD_DIR/lcov.info"
if (Test-Path "$BUILD_DIR/lcov.info") {
Write-Host "✅ LCOV info created at $BUILD_DIR/lcov.info"
} else {
Write-Error "Failed to create LCOV info"
exit 1
if ($LASTEXITCODE -ne 0) {
exit $LASTEXITCODE
}
- name: Install LCOV (for genhtml)
if: ${{ matrix.triplet == 'x64-windows' }}
run: choco install lcov -y
& "C:/Program Files/LLVM/bin/llvm-cov.exe" show $exePath `
"-instr-profile=$profile" `
"-format=html" `
"-output-dir=$htmlDir" `
"-ignore-filename-regex=vcpkg_installed|external|tests" `
"-show-branches=count"
- name: Generate HTML Report
if: ${{ matrix.triplet == 'x64-windows' }}
shell: bash
run: |
BUILD_DIR="cmake-build/build/${{ matrix.preset }}"
LCOV_INFO="${BUILD_DIR}/lcov.info"
HTML_DIR="${BUILD_DIR}/coverage-html"
if ($LASTEXITCODE -ne 0) {
exit $LASTEXITCODE
}
# Fix paths for genhtml (Perl hates backslashes)
sed -i 's|\\|/|g' "${LCOV_INFO}"
# Locate genhtml provided by 'choco install lcov'
# It is typically in ProgramData/chocolatey/lib/lcov/tools/bin
GENHTML=$(find /c/ProgramData/chocolatey -name genhtml -print -quit)
if [ -z "$GENHTML" ]; then
echo "Error: genhtml executable not found"
exit 1
fi
echo "Using genhtml: $GENHTML"
mkdir -p "$HTML_DIR"
# Run genhtml
# Added --demangle-cpp if your version supports it, otherwise remove it
perl "$GENHTML" \
"${LCOV_INFO}" \
--output-directory "$HTML_DIR" \
--title "OMath Coverage Report" \
--legend \
--show-details \
--branch-coverage \
--ignore-errors source
echo "✅ LCOV HTML report generated at $HTML_DIR"
if (-not (Test-Path "$htmlDir/index.html")) {
throw "LLVM coverage report was not generated"
}
- name: Upload Coverage (HTML Report)
if: ${{ matrix.triplet == 'x64-windows' }}
@@ -490,32 +458,36 @@ jobs:
with:
submodules: recursive
- name: Build and Test
uses: cross-platform-actions/action@v0.31.0
- name: Start FreeBSD VM
uses: cross-platform-actions/action@v1.3.0
with:
operating_system: freebsd
architecture: ${{ matrix.arch }}
version: '15.0'
memory: '12G'
cpu_count: 4
run: |
sudo pkg install -y git curl zip unzip gmake llvm gsed bash perl5 openssl 7-zip coreutils cmake ninja pkgconf patchelf
git config --global --add safe.directory `pwd`
# Build vcpkg in /tmp to avoid sshfs timestamp sync issues
export VCPKG_ROOT=/tmp/vcpkg
rm -rf "$VCPKG_ROOT"
git clone https://github.com/microsoft/vcpkg "$VCPKG_ROOT"
cd "$VCPKG_ROOT"
./bootstrap-vcpkg.sh
cd -
export VCPKG_FORCE_SYSTEM_BINARIES=0
cmake --preset ${{ matrix.preset }} \
-DOMATH_BUILD_TESTS=ON \
-DOMATH_BUILD_BENCHMARK=OFF \
-DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests;lua" \
-DVCPKG_INSTALL_OPTIONS="--allow-unsupported"
cmake --build cmake-build/build/${{ matrix.preset }} --target unit_tests omath
./out/Release/unit_tests
- name: Build and Test
shell: cpa.sh {0}
run: |
sudo pkg install -y git curl zip unzip gmake llvm gsed bash perl5 openssl 7-zip coreutils cmake ninja pkgconf patchelf
git config --global --add safe.directory `pwd`
# Build vcpkg in /tmp to avoid sshfs timestamp sync issues
export VCPKG_ROOT=/tmp/vcpkg
rm -rf "$VCPKG_ROOT"
# FreeBSD 15 packages CMake 3.31; newer vcpkg requires CMake 4.3.
git clone --branch 2026.06.24 --depth 1 https://github.com/microsoft/vcpkg "$VCPKG_ROOT"
cd "$VCPKG_ROOT"
./bootstrap-vcpkg.sh
cd -
export VCPKG_FORCE_SYSTEM_BINARIES=0
cmake --preset ${{ matrix.preset }} \
-DOMATH_BUILD_TESTS=ON \
-DOMATH_BUILD_BENCHMARK=OFF \
-DVCPKG_MANIFEST_FEATURES="imgui;avx2;tests;lua" \
-DVCPKG_INSTALL_OPTIONS="--allow-unsupported"
cmake --build cmake-build/build/${{ matrix.preset }} --target unit_tests omath
./out/Release/unit_tests
- name: Upload logs on failure
if: ${{ failure() }}
@@ -741,8 +713,7 @@ jobs:
-DVCPKG_MANIFEST_FEATURES="imgui;tests;lua"
- name: Build
run: |
cmake --build cmake-build/build/${{ matrix.preset }} --target unit_tests omath
run: cmake --build cmake-build/build/${{ matrix.preset }} --target unit_tests omath
- name: Run unit_tests.exe
run: |
+28 -21
View File
@@ -116,6 +116,9 @@ jobs:
shell: bash
run: ${{ matrix.install_cmd }}
- name: Set up CMake and Ninja
uses: lukka/get-cmake@v4.3.4
- name: Checkout repository (with sub-modules)
uses: actions/checkout@v4
with:
@@ -372,33 +375,37 @@ jobs:
with:
submodules: recursive
- name: Build and Package
uses: cross-platform-actions/action@v0.31.0
- name: Start FreeBSD VM
uses: cross-platform-actions/action@v1.3.0
with:
operating_system: freebsd
architecture: ${{ matrix.arch }}
version: '15.0'
memory: '12G'
cpu_count: 4
run: |
sudo pkg install -y git curl zip unzip gmake llvm gsed bash perl5 openssl 7-zip coreutils cmake ninja pkgconf patchelf
git config --global --add safe.directory `pwd`
# Build vcpkg in /tmp to avoid sshfs timestamp sync issues
export VCPKG_ROOT=/tmp/vcpkg
rm -rf "$VCPKG_ROOT"
git clone https://github.com/microsoft/vcpkg "$VCPKG_ROOT"
cd "$VCPKG_ROOT"
./bootstrap-vcpkg.sh
cd -
export VCPKG_FORCE_SYSTEM_BINARIES=0
cmake --preset ${{ matrix.preset }} \
-DOMATH_BUILD_TESTS=OFF \
-DOMATH_BUILD_BENCHMARK=OFF \
-DVCPKG_MANIFEST_FEATURES="imgui;avx2" \
-DVCPKG_INSTALL_OPTIONS="--allow-unsupported"
cmake --build cmake-build/build/${{ matrix.preset }} --target omath
cmake --install cmake-build/build/${{ matrix.preset }} --prefix staging
tar -czf ${{ matrix.archive }}.tar.gz -C staging .
- name: Build and Package
shell: cpa.sh {0}
run: |
sudo pkg install -y git curl zip unzip gmake llvm gsed bash perl5 openssl 7-zip coreutils cmake ninja pkgconf patchelf
git config --global --add safe.directory `pwd`
# Build vcpkg in /tmp to avoid sshfs timestamp sync issues
export VCPKG_ROOT=/tmp/vcpkg
rm -rf "$VCPKG_ROOT"
# FreeBSD 15 packages CMake 3.31; newer vcpkg requires CMake 4.3.
git clone --branch 2026.06.24 --depth 1 https://github.com/microsoft/vcpkg "$VCPKG_ROOT"
cd "$VCPKG_ROOT"
./bootstrap-vcpkg.sh
cd -
export VCPKG_FORCE_SYSTEM_BINARIES=0
cmake --preset ${{ matrix.preset }} \
-DOMATH_BUILD_TESTS=OFF \
-DOMATH_BUILD_BENCHMARK=OFF \
-DVCPKG_MANIFEST_FEATURES="imgui;avx2" \
-DVCPKG_INSTALL_OPTIONS="--allow-unsupported"
cmake --build cmake-build/build/${{ matrix.preset }} --target omath
cmake --install cmake-build/build/${{ matrix.preset }} --prefix staging
tar -czf ${{ matrix.archive }}.tar.gz -C staging .
- name: Upload release asset
env:
+1 -1
View File
@@ -1 +1 @@
5.4.0
5.5.2
+21 -11
View File
@@ -2,11 +2,9 @@
// Created by Vlad on 9/17/2025.
//
#include <benchmark/benchmark.h>
#include <omath/omath.hpp>
using namespace omath;
void mat_float_multiplication_col_major(benchmark::State& state)
{
using MatType = Mat<128, 128, float, MatStoreType::COLUMN_MAJOR>;
@@ -15,9 +13,12 @@ void mat_float_multiplication_col_major(benchmark::State& state)
a.set(3.f);
b.set(7.f);
for ([[maybe_unused]] const auto _ : state)
std::ignore = a * b;
{
benchmark::DoNotOptimize(a);
benchmark::DoNotOptimize(b);
benchmark::DoNotOptimize(a * b);
}
}
void mat_float_multiplication_row_major(benchmark::State& state)
{
@@ -27,9 +28,12 @@ void mat_float_multiplication_row_major(benchmark::State& state)
a.set(3.f);
b.set(7.f);
for ([[maybe_unused]] const auto _ : state)
std::ignore = a * b;
{
benchmark::DoNotOptimize(a);
benchmark::DoNotOptimize(b);
benchmark::DoNotOptimize(a * b);
}
}
void mat_double_multiplication_row_major(benchmark::State& state)
@@ -40,9 +44,12 @@ void mat_double_multiplication_row_major(benchmark::State& state)
a.set(3.f);
b.set(7.f);
for ([[maybe_unused]] const auto _ : state)
std::ignore = a * b;
{
benchmark::DoNotOptimize(a);
benchmark::DoNotOptimize(b);
benchmark::DoNotOptimize(a * b);
}
}
void mat_double_multiplication_col_major(benchmark::State& state)
@@ -53,13 +60,16 @@ void mat_double_multiplication_col_major(benchmark::State& state)
a.set(3.f);
b.set(7.f);
for ([[maybe_unused]] const auto _ : state)
std::ignore = a * b;
{
benchmark::DoNotOptimize(a);
benchmark::DoNotOptimize(b);
benchmark::DoNotOptimize(a * b);
}
}
BENCHMARK(mat_float_multiplication_col_major)->Iterations(5000);
BENCHMARK(mat_float_multiplication_row_major)->Iterations(5000);
BENCHMARK(mat_double_multiplication_col_major)->Iterations(5000);
BENCHMARK(mat_double_multiplication_row_major)->Iterations(5000);
BENCHMARK(mat_double_multiplication_row_major)->Iterations(5000);
+11
View File
@@ -6,6 +6,17 @@ if (@OMATH_IMGUI_INTEGRATION@)
find_dependency(imgui CONFIG)
endif()
if (@OMATH_ENABLE_LUA@)
find_dependency(Lua)
endif()
if (@OMATH_ENABLE_HOOKING@)
find_dependency(safetyhook CONFIG)
if (NOT WIN32 AND (UNIX AND NOT APPLE))
find_dependency(OpenGL)
endif()
endif()
# Load the targets for the omath library
include("${CMAKE_CURRENT_LIST_DIR}/omathTargets.cmake")
check_required_components(omath)
+12 -10
View File
@@ -3,8 +3,8 @@
> Header: `omath/trigonometry/angle.hpp`
> Namespace: `omath`
> Template: `Angle<Type = float, min = 0, max = 360, flags = AngleFlags::Normalized>`
> Requires: `std::is_arithmetic_v<Type>`
> Formatters: `std::formatter` for `char`, `wchar_t`, `char8_t` → `"{}deg"`
> Requires: `std::is_floating_point_v<Type>`
> Formatters: `std::formatter` for `char` and `wchar_t` → `"{}deg"`
---
@@ -14,7 +14,7 @@
Two behaviors via `AngleFlags`:
* `AngleFlags::Normalized` (default): values are wrapped into `[min, max]` using `angles::wrap_angle`.
* `AngleFlags::Normalized` (default): values are wrapped into `[min, max)` using `angles::wrap_angle`.
* `AngleFlags::Clamped`: values are clamped to `[min, max]` using `std::clamp`.
---
@@ -28,12 +28,16 @@ enum class AngleFlags { Normalized = 0, Clamped = 1 };
template<class Type = float, Type min = Type(0), Type max = Type(360),
AngleFlags flags = AngleFlags::Normalized>
requires std::is_arithmetic_v<Type>
requires std::is_floating_point_v<Type>
class Angle {
public:
// Construction
static constexpr Angle from_degrees(const Type& deg) noexcept;
static constexpr Angle from_radians(const Type& rad) noexcept;
static constexpr Angle from_asin(const Type& value) noexcept;
static constexpr Angle from_acos(const Type& value) noexcept;
static constexpr Angle from_atan(const Type& value) noexcept;
static constexpr Angle from_atan2(const Type& y, const Type& x) noexcept;
constexpr Angle() noexcept; // 0 deg, adjusted by flags/range
// Accessors / conversions (degrees stored internally)
@@ -45,10 +49,9 @@ public:
Type sin() const noexcept;
Type cos() const noexcept;
Type tan() const noexcept;
Type atan() const noexcept; // atan(as_radians()) (rarely used)
Type cot() const noexcept; // cos()/sin() (watch sin≈0)
// Arithmetic (wraps or clamps per flags and [min,max])
// Arithmetic (wraps or clamps per flags and configured range)
constexpr Angle& operator+=(const Angle&) noexcept;
constexpr Angle& operator-=(const Angle&) noexcept;
constexpr Angle operator+(const Angle&) noexcept;
@@ -68,7 +71,7 @@ public:
std::format("{}", Angle<float>::from_degrees(45)); // "45deg"
```
Formatters exist for `char`, `wchar_t`, and `char8_t`.
Formatters exist for `char` and `wchar_t`.
---
@@ -116,10 +119,9 @@ float deg = *yaw; // same as yaw.as_degrees()
## Semantics & notes
* **Storage & units:** Internally stores **degrees** (`Type m_angle`). `as_radians()`/`from_radians()` use the project helpers in `omath::angles`.
* **Arithmetic honors policy:** `operator+=`/`-=` and the binary `+`/`-` apply **wrap** or **clamp** in `[min,max]`, mirroring construction behavior.
* **`atan()`**: returns `std::atan(as_radians())` (the arctangent of the *radian value*). This is mathematically unusual for an angle type and is rarely useful; prefer `tan()`/`atan2` in client code when solving geometry problems.
* **Arithmetic honors policy:** `operator+=`/`-=` and the binary `+`/`-` apply **wrap** or **clamp**, mirroring construction behavior.
* **`cot()` / `tan()` singularities:** Near multiples where `sin() ≈ 0` or `cos() ≈ 0`, results blow up. Guard in your usage if inputs can approach these points.
* **Comparison:** `operator<=>` is defaulted. With normalization, distinct representatives can compare as expected (e.g., `-180` vs `180` in signed ranges are distinct endpoints).
* **Comparison:** `operator<=>` is defaulted. Normalization canonicalizes the maximum endpoint to the minimum endpoint.
* **No implicit numeric conversion:** Theres **no `operator Type()`**. Use `as_degrees()`/`as_radians()` (or `*angle`) explicitly—this intentional friction avoids unit mistakes.
---
+8 -8
View File
@@ -4,7 +4,7 @@
> Namespace: `omath::angles`
> All functions are `[[nodiscard]]` and `noexcept` where applicable.
A small set of constexpr-friendly utilities for converting between degrees/radians, converting horizontal/vertical field of view, and wrapping angles into a closed interval.
A small set of constexpr-friendly utilities for converting between degrees/radians, converting horizontal/vertical field of view, and wrapping angles into a half-open interval.
---
@@ -29,9 +29,9 @@ template<class Type>
requires std::is_floating_point_v<Type>
Type vertical_fov_to_horizontal(const Type& vertical_fov, const Type& aspect) noexcept;
// Wrap angle into [min, max] (any arithmetic type)
// Wrap angle into [min, max) (floating-point types)
template<class Type>
requires std::is_arithmetic_v<Type>
requires std::is_floating_point_v<Type>
Type wrap_angle(const Type& angle, const Type& min, const Type& max) noexcept;
```
@@ -66,10 +66,10 @@ Formulas (in radians):
### Wrapping angles (or any periodic value)
Wrap any numeric `angle` into `[min, max]`:
Wrap any floating-point `angle` into `[min, max)`:
```cpp
// Wrap degrees into [0, 360]
// Wrap degrees into [0, 360)
float a = omath::angles::wrap_angle( 370.0f, 0.0f, 360.0f); // 10
float b = omath::angles::wrap_angle( -15.0f, 0.0f, 360.0f); // 345
// Signed range [-180,180]
@@ -83,10 +83,10 @@ float c = omath::angles::wrap_angle( 200.0f, -180.0f, 180.0f); // -160
* **Type requirements**
* Converters & FOV helpers require **floating-point** `Type`.
* `wrap_angle` accepts any arithmetic `Type` (floats or integers).
* `wrap_angle` accepts floating-point types.
* **Aspect ratio** must be **positive** and finite. For `aspect == 0` the FOV helpers are undefined.
* **Units**: FOV functions accept/return **degrees** but compute internally in radians.
* **Wrapping interval**: Behavior assumes `max > min`. The result lies in the **closed interval** `[min, max]` with modulo arithmetic; if you need half-open behavior (e.g., `[min,max)`), adjust your range or post-process endpoint cases.
* **Wrapping interval**: Behavior assumes `max > min`. The result lies in the half-open interval `[min, max)`.
* **constexpr**: Converters are `constexpr`; FOV helpers are runtime constexpr-compatible except for `std::atan/std::tan` constraints on some standard libraries.
---
@@ -103,5 +103,5 @@ float v = horizontal_fov_to_vertical(90.0f, 16.0f/9.0f);
float h = vertical_fov_to_horizontal(v, 16.0f/9.0f);
assert(std::abs(h - 90.0f) < 1e-5f);
assert(wrap_angle(360.0f, 0.0f, 360.0f) == 0.0f || wrap_angle(360.0f, 0.0f, 360.0f) == 360.0f);
assert(wrap_angle(360.0f, 0.0f, 360.0f) == 0.0f);
```
+171 -20
View File
@@ -5,6 +5,7 @@
#include <imgui.h>
#include <imgui_impl_dx12.h>
#include <imgui_impl_win32.h>
#include <mutex>
#include <tuple>
#include <vector>
@@ -13,6 +14,8 @@ bool show_menu = true;
namespace
{
constexpr UINT srv_heap_size = 64;
struct frame_context
{
ID3D12Resource* render_target = nullptr;
@@ -27,15 +30,95 @@ namespace
ID3D12Device* g_device = nullptr;
ID3D12CommandQueue* g_command_queue = nullptr;
ID3D12CommandQueue* g_pending_command_queue = nullptr;
IDXGISwapChain3* g_swap_chain = nullptr;
IUnknown* g_swap_chain_identity = nullptr;
ID3D12DescriptorHeap* g_rtv_heap = nullptr;
ID3D12DescriptorHeap* g_srv_heap = nullptr;
ID3D12GraphicsCommandList* g_command_list = nullptr;
ID3D12Fence* g_fence = nullptr;
HANDLE g_fence_event = nullptr;
UINT64 g_fence_value = 0;
UINT g_srv_descriptor_size = 0;
bool g_command_queue_selected = false;
std::mutex g_command_queue_mutex;
std::vector<UINT> g_free_srv_indices;
std::vector<frame_context> g_frames;
void allocate_srv_descriptor(ImGui_ImplDX12_InitInfo*, D3D12_CPU_DESCRIPTOR_HANDLE* cpu_handle,
D3D12_GPU_DESCRIPTOR_HANDLE* gpu_handle)
{
IM_ASSERT(!g_free_srv_indices.empty());
const UINT index = g_free_srv_indices.back();
g_free_srv_indices.pop_back();
*cpu_handle = g_srv_heap->GetCPUDescriptorHandleForHeapStart();
*gpu_handle = g_srv_heap->GetGPUDescriptorHandleForHeapStart();
cpu_handle->ptr += static_cast<SIZE_T>(index) * g_srv_descriptor_size;
gpu_handle->ptr += static_cast<UINT64>(index) * g_srv_descriptor_size;
}
void free_srv_descriptor(ImGui_ImplDX12_InitInfo*, D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle,
D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle)
{
const D3D12_CPU_DESCRIPTOR_HANDLE cpu_start = g_srv_heap->GetCPUDescriptorHandleForHeapStart();
const D3D12_GPU_DESCRIPTOR_HANDLE gpu_start = g_srv_heap->GetGPUDescriptorHandleForHeapStart();
const UINT cpu_index = static_cast<UINT>((cpu_handle.ptr - cpu_start.ptr) / g_srv_descriptor_size);
const UINT gpu_index = static_cast<UINT>((gpu_handle.ptr - gpu_start.ptr) / g_srv_descriptor_size);
IM_ASSERT(cpu_index == gpu_index && cpu_index < srv_heap_size);
g_free_srv_indices.push_back(cpu_index);
}
void remember_direct_command_queue(ID3D12CommandQueue* queue)
{
if (queue->GetDesc().Type != D3D12_COMMAND_LIST_TYPE_DIRECT)
return;
std::scoped_lock lock(g_command_queue_mutex);
if (g_command_queue_selected || g_pending_command_queue == queue)
return;
queue->AddRef();
if (g_pending_command_queue)
g_pending_command_queue->Release();
g_pending_command_queue = queue;
}
ID3D12CommandQueue* take_command_queue_for_device(ID3D12Device* device)
{
std::scoped_lock lock(g_command_queue_mutex);
if (!g_pending_command_queue)
return nullptr;
ID3D12Device* queue_device = nullptr;
if (FAILED(g_pending_command_queue->GetDevice(IID_PPV_ARGS(&queue_device))))
return nullptr;
const bool matches = queue_device == device;
queue_device->Release();
if (!matches)
return nullptr;
ID3D12CommandQueue* queue = g_pending_command_queue;
g_pending_command_queue = nullptr;
g_command_queue_selected = true;
return queue;
}
bool is_target_swap_chain(IDXGISwapChain* swap_chain)
{
if (!g_swap_chain_identity)
return false;
IUnknown* identity = nullptr;
if (FAILED(swap_chain->QueryInterface(IID_PPV_ARGS(&identity))))
return false;
const bool matches = identity == g_swap_chain_identity;
identity->Release();
return matches;
}
// This fence tracks only the overlay work submitted by this DLL, not the game's whole frame.
bool create_sync_objects()
{
@@ -215,25 +298,62 @@ namespace
void init(IDXGISwapChain* swap_chain)
{
g_init_attempted = true;
if (FAILED(swap_chain->QueryInterface(IID_PPV_ARGS(&g_swap_chain))))
IDXGISwapChain3* swap_chain3 = nullptr;
if (FAILED(swap_chain->QueryInterface(IID_PPV_ARGS(&swap_chain3))))
return;
if (FAILED(swap_chain->GetDevice(IID_PPV_ARGS(&g_device))))
ID3D12Device* device = nullptr;
if (FAILED(swap_chain->GetDevice(IID_PPV_ARGS(&device))))
{
swap_chain3->Release();
return;
}
IUnknown* swap_chain_identity = nullptr;
if (FAILED(swap_chain->QueryInterface(IID_PPV_ARGS(&swap_chain_identity))))
{
device->Release();
swap_chain3->Release();
return;
}
DXGI_SWAP_CHAIN_DESC desc{};
swap_chain->GetDesc(&desc);
if (FAILED(swap_chain->GetDesc(&desc)))
{
swap_chain_identity->Release();
device->Release();
swap_chain3->Release();
return;
}
ID3D12CommandQueue* command_queue = take_command_queue_for_device(device);
if (!command_queue)
{
swap_chain_identity->Release();
device->Release();
swap_chain3->Release();
return;
}
g_init_attempted = true;
g_swap_chain = swap_chain3;
g_swap_chain_identity = swap_chain_identity;
g_device = device;
g_command_queue = command_queue;
const UINT buffer_count = desc.BufferCount;
{
D3D12_DESCRIPTOR_HEAP_DESC heap_desc{};
heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV;
heap_desc.NumDescriptors = buffer_count;
heap_desc.NumDescriptors = srv_heap_size;
heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
if (FAILED(g_device->CreateDescriptorHeap(&heap_desc, IID_PPV_ARGS(&g_srv_heap))))
return;
g_srv_descriptor_size = g_device->GetDescriptorHandleIncrementSize(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
g_free_srv_indices.reserve(srv_heap_size);
for (UINT i = srv_heap_size; i > 0; --i)
g_free_srv_indices.push_back(i - 1);
}
if (!create_render_targets(swap_chain))
@@ -252,9 +372,17 @@ namespace
ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
ImGui_ImplWin32_Init(desc.OutputWindow);
ImGui_ImplDX12_Init(g_device, static_cast<int>(buffer_count), desc.BufferDesc.Format, g_srv_heap,
g_srv_heap->GetCPUDescriptorHandleForHeapStart(),
g_srv_heap->GetGPUDescriptorHandleForHeapStart());
ImGui_ImplDX12_InitInfo init_info{};
init_info.Device = g_device;
init_info.CommandQueue = g_command_queue;
init_info.NumFramesInFlight = static_cast<int>(buffer_count);
init_info.RTVFormat = desc.BufferDesc.Format;
init_info.DSVFormat = DXGI_FORMAT_UNKNOWN;
init_info.SrvDescriptorHeap = g_srv_heap;
init_info.SrvDescriptorAllocFn = allocate_srv_descriptor;
init_info.SrvDescriptorFreeFn = free_srv_descriptor;
ImGui_ImplDX12_Init(&init_info);
ImGui_ImplDX12_CreateDeviceObjects();
auto& mgr = omath::hooks::HooksManager::get();
@@ -264,8 +392,10 @@ namespace
if (!show_menu)
return std::nullopt;
ImGui_ImplWin32_WndProcHandler(h, msg, wp, lp);
return true;
if (ImGui_ImplWin32_WndProcHandler(h, msg, wp, lp))
return true;
return std::nullopt;
});
std::ignore = mgr.hook_wnd_proc(desc.OutputWindow);
@@ -274,13 +404,8 @@ namespace
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)
{
const D3D12_COMMAND_QUEUE_DESC desc = queue->GetDesc();
if (desc.Type == D3D12_COMMAND_LIST_TYPE_DIRECT)
g_command_queue = queue;
}
// The most recently used DIRECT queue is the best available proxy for the swap chain's presentation queue.
remember_direct_command_queue(queue);
}
bool ensure_initialized(IDXGISwapChain* swap_chain)
@@ -288,7 +413,7 @@ namespace
if (g_initialized)
return true;
if (!g_init_attempted && g_command_queue)
if (!g_init_attempted)
init(swap_chain);
return false;
@@ -402,6 +527,9 @@ namespace
void on_present(IDXGISwapChain* swap_chain, UINT, UINT)
{
if (g_initialized && !is_target_swap_chain(swap_chain))
return;
if (!ensure_present_resources(swap_chain) || !begin_imgui_frame())
return;
@@ -413,8 +541,11 @@ namespace
std::ignore = submit_overlay_commands(*fc);
}
void on_resize_buffers(IDXGISwapChain*, UINT, UINT, UINT, DXGI_FORMAT, UINT)
void on_resize_buffers(IDXGISwapChain* swap_chain, UINT, UINT, UINT, DXGI_FORMAT, UINT)
{
if (!is_target_swap_chain(swap_chain))
return;
wait_for_gpu();
release_command_objects();
release_frame_contexts();
@@ -431,16 +562,36 @@ namespace
g_srv_heap->Release();
g_srv_heap = nullptr;
}
g_srv_descriptor_size = 0;
g_free_srv_indices.clear();
if (g_swap_chain)
{
g_swap_chain->Release();
g_swap_chain = nullptr;
}
if (g_swap_chain_identity)
{
g_swap_chain_identity->Release();
g_swap_chain_identity = nullptr;
}
if (g_device)
{
g_device->Release();
g_device = nullptr;
}
if (g_command_queue)
{
g_command_queue->Release();
g_command_queue = nullptr;
}
std::scoped_lock lock(g_command_queue_mutex);
if (g_pending_command_queue)
{
g_pending_command_queue->Release();
g_pending_command_queue = nullptr;
}
g_command_queue_selected = false;
}
} // namespace
+132 -7
View File
@@ -4,6 +4,7 @@
#include "main_window.hpp"
#include "omath/hud/renderer_realizations/imgui_renderer.hpp"
#include <GLFW/glfw3.h>
#include <cmath>
#include <imgui.h>
#include <imgui_impl_glfw.h>
#include <imgui_impl_opengl3.h>
@@ -65,6 +66,19 @@ namespace imgui_desktop::gui
ImGui::Begin("Controls", &m_opened,
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse);
ImGui::PushItemWidth(160.f);
const auto draw_glow_controls = [](const char* label, GlowSettings& settings)
{
ImGui::PushID(label);
ImGui::TextUnformatted(label);
ImGui::Checkbox("Glow", &settings.enabled);
if (settings.enabled)
{
ImGui::ColorEdit4("Color", reinterpret_cast<float*>(&settings.color), ImGuiColorEditFlags_NoInputs);
ImGui::InputFloat("Radius", &settings.radius);
ImGui::InputFloat("Intensity", &settings.intensity);
}
ImGui::PopID();
};
if (ImGui::CollapsingHeader("Entity", ImGuiTreeNodeFlags_DefaultOpen))
{
@@ -72,6 +86,12 @@ namespace imgui_desktop::gui
ImGui::SliderFloat("Top Y", &m_entity_top_y, 20.f, m_entity_bottom_y - 20.f);
ImGui::SliderFloat("Bottom Y", &m_entity_bottom_y, m_entity_top_y + 20.f, vp->Size.y - 20.f);
ImGui::SliderFloat("Aspect", &m_entity_aspect, 1.f, 10.f);
draw_glow_controls("Canvas light", m_canvas_glow);
if (m_canvas_glow.enabled)
{
ImGui::InputInt("Blur layers##canvas", &m_canvas_glow_layers);
ImGui::InputFloat("Rounding##canvas", &m_canvas_glow_rounding);
}
}
if (ImGui::CollapsingHeader("Box", ImGuiTreeNodeFlags_DefaultOpen))
@@ -83,9 +103,20 @@ namespace imgui_desktop::gui
ImGui::Checkbox("Dashed", &m_show_dashed_box);
ImGui::ColorEdit4("Color##box", reinterpret_cast<float*>(&m_box_color), ImGuiColorEditFlags_NoInputs);
ImGui::ColorEdit4("Fill##box", reinterpret_cast<float*>(&m_box_fill), ImGuiColorEditFlags_NoInputs);
ImGui::Checkbox("Gradient fill", &m_gradient_box_fill);
ImGui::Checkbox("Animate gradients", &m_animate_gradients);
if (m_gradient_box_fill)
{
ImGui::ColorEdit4("Gradient top##box", reinterpret_cast<float*>(&m_box_gradient_top),
ImGuiColorEditFlags_NoInputs);
ImGui::ColorEdit4("Gradient bottom##box", reinterpret_cast<float*>(&m_box_gradient_bottom),
ImGuiColorEditFlags_NoInputs);
}
ImGui::ColorEdit4("Outline##box", reinterpret_cast<float*>(&m_box_outline), ImGuiColorEditFlags_NoInputs);
ImGui::SliderFloat("Thickness", &m_box_thickness, 0.5f, 5.f);
ImGui::SliderFloat("Corner ratio", &m_corner_ratio, 0.05f, 0.5f);
draw_glow_controls("Box glow", m_box_glow);
draw_glow_controls("Cornered box glow", m_cornered_box_glow);
ImGui::Separator();
ImGui::ColorEdit4("Dash color", reinterpret_cast<float*>(&m_dash_color), ImGuiColorEditFlags_NoInputs);
ImGui::SliderFloat("Dash length", &m_dash_len, 2.f, 30.f);
@@ -99,6 +130,7 @@ namespace imgui_desktop::gui
ImGui::ColorEdit4("BG##bar", reinterpret_cast<float*>(&m_bar_bg_color), ImGuiColorEditFlags_NoInputs);
ImGui::ColorEdit4("Outline##bar", reinterpret_cast<float*>(&m_bar_outline_color),
ImGuiColorEditFlags_NoInputs);
ImGui::Checkbox("Gradient bars", &m_gradient_bars);
ImGui::SliderFloat("Width##bar", &m_bar_width, 1.f, 20.f);
ImGui::SliderFloat("Value##bar", &m_bar_value, 0.f, 1.f);
ImGui::SliderFloat("Offset##bar", &m_bar_offset, 1.f, 20.f);
@@ -116,11 +148,26 @@ namespace imgui_desktop::gui
ImGui::Checkbox("Bot dashed##bar", &m_show_bottom_dashed_bar);
ImGui::SliderFloat("Dash len##bar", &m_bar_dash_len, 2.f, 20.f);
ImGui::SliderFloat("Dash gap##bar", &m_bar_dash_gap, 1.f, 15.f);
draw_glow_controls("Bar glow", m_bar_glow);
}
if (ImGui::CollapsingHeader("Labels", ImGuiTreeNodeFlags_DefaultOpen))
{
ImGui::Checkbox("Outlined", &m_outlined);
ImGui::Checkbox("Gradient centered label", &m_gradient_label);
if (m_gradient_label)
{
ImGui::ColorEdit4("Gradient left##lbl", reinterpret_cast<float*>(&m_label_gradient_left),
ImGuiColorEditFlags_NoInputs);
ImGui::ColorEdit4("Gradient right##lbl", reinterpret_cast<float*>(&m_label_gradient_right),
ImGuiColorEditFlags_NoInputs);
if (m_animate_gradients)
{
int direction = static_cast<int>(m_label_gradient_direction);
if (ImGui::Combo("Direction##lbl", &direction, "Right to left\0Left to right\0"))
m_label_gradient_direction = static_cast<omath::hud::GradientDirection>(direction);
}
}
ImGui::SliderFloat("Offset##lbl", &m_label_offset, 0.f, 15.f);
ImGui::Checkbox("Right##lbl", &m_show_right_labels);
ImGui::SameLine();
@@ -131,6 +178,7 @@ namespace imgui_desktop::gui
ImGui::Checkbox("Ctr top##lbl", &m_show_centered_top);
ImGui::SameLine();
ImGui::Checkbox("Ctr bot##lbl", &m_show_centered_bottom);
draw_glow_controls("Label glow", m_label_glow);
}
if (ImGui::CollapsingHeader("Skeleton"))
@@ -193,9 +241,83 @@ namespace imgui_desktop::gui
using namespace omath::hud::widget;
using omath::hud::when;
const auto* vp = ImGui::GetMainViewport();
const Bar bar{m_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, m_bar_value, m_bar_offset};
const DashedBar dbar{m_bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width,
m_bar_value, m_bar_dash_len, m_bar_dash_gap, m_bar_offset};
const float entity_height = m_entity_bottom_y - m_entity_top_y;
const float entity_half_width = entity_height / m_entity_aspect;
const auto joint = [&](const float x, const float y)
{
return omath::Vector2<float>{m_entity_x + (x * 2.f - 1.f) * entity_half_width,
m_entity_top_y + y * entity_height};
};
const auto head = joint(0.5f, 0.1f);
const auto neck = joint(0.5f, 0.22f);
const auto torso = joint(0.5f, 0.5f);
const auto left_shoulder = joint(0.3f, 0.25f);
const auto right_shoulder = joint(0.7f, 0.25f);
const auto left_elbow = joint(0.18f, 0.42f);
const auto right_elbow = joint(0.82f, 0.42f);
const auto left_hand = joint(0.1f, 0.58f);
const auto right_hand = joint(0.9f, 0.58f);
const auto left_hip = joint(0.4f, 0.55f);
const auto right_hip = joint(0.6f, 0.55f);
const auto left_knee = joint(0.36f, 0.75f);
const auto right_knee = joint(0.64f, 0.75f);
const auto left_foot = joint(0.3f, 0.95f);
const auto right_foot = joint(0.7f, 0.95f);
const std::array skeleton_bones = {
Bone{head, neck},
Bone{neck, torso},
Bone{neck, left_shoulder},
Bone{left_shoulder, left_elbow},
Bone{left_elbow, left_hand},
Bone{neck, right_shoulder},
Bone{right_shoulder, right_elbow},
Bone{right_elbow, right_hand},
Bone{torso, left_hip},
Bone{left_hip, left_knee},
Bone{left_knee, left_foot},
Bone{torso, right_hip},
Bone{right_hip, right_knee},
Bone{right_knee, right_foot},
};
const auto animated_color = [&](const omath::Color& color, const float hue_offset)
{
if (!m_animate_gradients)
return color;
auto hsv = color.to_hsv();
hsv.hue = std::fmod(hsv.hue + static_cast<float>(ImGui::GetTime()) * 0.15f + hue_offset, 1.f);
const auto animated = omath::Color::from_hsv(hsv).value();
return omath::Color{animated.x, animated.y, animated.z, color.value().w};
};
const auto box_gradient_top = animated_color(m_box_gradient_top, 0.f);
const auto box_gradient_bottom = animated_color(m_box_gradient_bottom, 0.5f);
const auto red = omath::Color{1.f, 0.f, 0.f, 1.f};
const auto green = omath::Color{0.f, 1.f, 0.f, 1.f};
const auto make_glow = [](const GlowSettings& settings) -> std::optional<Glow>
{
if (!settings.enabled)
return std::nullopt;
return Glow{settings.color, settings.radius, settings.intensity};
};
const auto box_glow = make_glow(m_box_glow);
const auto cornered_box_glow = make_glow(m_cornered_box_glow);
const auto bar_glow = make_glow(m_bar_glow);
const auto label_glow = make_glow(m_label_glow);
const auto canvas_glow = make_glow(m_canvas_glow);
const BarPaint bar_color = m_gradient_bars ? BarPaint{BarGradient{red, green}} : BarPaint{m_bar_color};
const Bar bar{bar_color, m_bar_outline_color, m_bar_bg_color, m_bar_width, m_bar_value, m_bar_offset, bar_glow};
const Paint box_fill = m_gradient_box_fill
? Paint{omath::hud::Gradient{box_gradient_top, box_gradient_top,
box_gradient_bottom, box_gradient_bottom}}
: Paint{m_box_fill};
const Paint centered_label_color =
m_gradient_label ? Paint{omath::hud::Gradient{m_label_gradient_left, m_label_gradient_right,
m_label_gradient_right, m_label_gradient_left,
m_animate_gradients, 4.f, 0.7f,
m_label_gradient_direction}}
: Paint{omath::Color::from_rgba(255, 255, 255, 255)};
auto outline_helper = [](const bool is_outline) -> Outlined
{
@@ -204,10 +326,13 @@ namespace imgui_desktop::gui
omath::hud::EntityOverlay({m_entity_x, m_entity_top_y}, {m_entity_x, m_entity_bottom_y}, m_entity_aspect,
std::make_shared<omath::hud::ImguiHudRenderer>())
.contents(
when(canvas_glow.has_value(), CanvasGlow{canvas_glow.value_or(Glow{m_canvas_glow.color}),
m_canvas_glow_layers, m_canvas_glow_rounding}),
// ── Boxes ────────────────────────────────────────────────────
when(m_show_box, Box{m_box_color, m_box_fill, m_box_outline, m_box_thickness}),
when(m_show_cornered_box, CorneredBox{omath::Color::from_rgba(255, 0, 255, 255), m_box_fill,
m_box_outline, m_corner_ratio, m_box_thickness}),
when(m_show_box, Box{m_box_color, box_fill, m_box_outline, m_box_thickness, box_glow}),
when(m_show_cornered_box,
CorneredBox{omath::Color::from_rgba(255, 0, 255, 255), m_box_fill, m_box_outline,
m_corner_ratio, m_box_thickness, cornered_box_glow}),
when(m_show_dashed_box, DashedBox{m_dash_color, m_dash_len, m_dash_gap, m_dash_thickness}),
RightSide{
when(m_show_right_bar, bar),
@@ -254,14 +379,14 @@ namespace imgui_desktop::gui
when(m_show_bottom_bar, bar),
when(m_show_bottom_dashed_bar, dbar),
when(m_show_centered_bottom,
Centered{Label{omath::Color::from_rgba(255, 255, 255, 255), m_label_offset,
outline_helper(m_outlined), "PlayerName"}}),
Centered{Label{centered_label_color, m_label_offset, outline_helper(m_outlined),
"Gradient PlayerName", label_glow}}),
when(m_show_bottom_labels, Label{omath::Color::from_rgba(200, 200, 0, 255),
m_label_offset, outline_helper(m_outlined), "42m"}),
},
when(m_show_aim, AimDot{{m_entity_x, m_entity_top_y + 40.f}, m_aim_color, m_aim_radius}),
when(m_show_scan, ScanMarker{m_scan_color, m_scan_outline, m_scan_outline_thickness}),
when(m_show_skeleton, Skeleton{m_skel_color, m_skel_thickness}),
when(m_show_skeleton, Skeleton{skeleton_bones, m_skel_color, m_skel_thickness}),
when(m_show_proj, ProjectileAim{{m_proj_pos_x, m_proj_pos_y},
m_proj_color,
m_proj_size,
+29 -4
View File
@@ -17,6 +17,14 @@ namespace imgui_desktop::gui
void Run();
private:
struct GlowSettings
{
omath::Color color{0.f, 0.7f, 1.f, 0.8f};
float radius = 4.f;
float intensity = 0.8f;
bool enabled = false;
};
void draw_controls();
void draw_overlay();
void present();
@@ -30,8 +38,12 @@ namespace imgui_desktop::gui
// Box
omath::Color m_box_color{1.f, 1.f, 1.f, 1.f};
omath::Color m_box_fill{0.f, 0.f, 0.f, 0.f};
omath::Color m_box_gradient_top{0.1f, 0.6f, 1.f, 0.55f};
omath::Color m_box_gradient_bottom{0.7f, 0.1f, 1.f, 0.15f};
omath::Color m_box_outline{0.f, 0.f, 0.f, 0.f};
float m_box_thickness = 1.f, m_corner_ratio = 0.2f;
bool m_gradient_box_fill = true;
bool m_animate_gradients = false;
bool m_show_box = true, m_show_cornered_box = true, m_show_dashed_box = false;
// Dashed box
@@ -43,19 +55,32 @@ namespace imgui_desktop::gui
omath::Color m_bar_bg_color{0.f, 0.f, 0.f, 0.5f};
omath::Color m_bar_outline_color{0.f, 0.f, 0.f, 1.f};
float m_bar_width = 4.f, m_bar_value = 0.75f, m_bar_offset = 5.f;
bool m_show_right_bar = true, m_show_left_bar = true;
bool m_show_top_bar = true, m_show_bottom_bar = true;
bool m_gradient_bars = true;
bool m_show_right_bar = true, m_show_left_bar = true;
bool m_show_top_bar = true, m_show_bottom_bar = true;
bool m_show_right_dashed_bar = false, m_show_left_dashed_bar = false;
bool m_show_top_dashed_bar = false, m_show_bottom_dashed_bar = false;
bool m_show_top_dashed_bar = false, m_show_bottom_dashed_bar = false;
float m_bar_dash_len = 6.f, m_bar_dash_gap = 4.f;
// Labels
float m_label_offset = 3.f;
omath::Color m_label_gradient_left{0.f, 0.8f, 1.f, 1.f};
omath::Color m_label_gradient_right{1.f, 0.2f, 0.7f, 1.f};
bool m_outlined = true;
bool m_gradient_label = true;
omath::hud::GradientDirection m_label_gradient_direction = omath::hud::GradientDirection::RightToLeft;
bool m_show_right_labels = true, m_show_left_labels = true;
bool m_show_top_labels = true, m_show_bottom_labels = true;
bool m_show_top_labels = true, m_show_bottom_labels = true;
bool m_show_centered_top = true, m_show_centered_bottom = true;
GlowSettings m_box_glow;
GlowSettings m_cornered_box_glow{{1.f, 0.f, 1.f, 0.8f}};
GlowSettings m_bar_glow{{1.f, 0.f, 0.f, 0.8f}};
GlowSettings m_label_glow;
GlowSettings m_canvas_glow{{1.f, 0.5f, 0.f, 0.8f}, 100.f};
int m_canvas_glow_layers = 64;
float m_canvas_glow_rounding = 40.f;
// Skeleton
omath::Color m_skel_color = omath::Color::from_rgba(255, 255, 255, 200);
float m_skel_thickness = 1.f;
@@ -4,7 +4,6 @@
#pragma once
#include "omath/engines/cry_engine/formulas.hpp"
#include "omath/internal/constexpr_math.hpp"
#include "omath/projection/camera.hpp"
namespace omath::cry_engine
{
@@ -16,8 +15,8 @@ namespace omath::cry_engine
const Vector3<float>& look_at) noexcept
{
const auto direction = (look_at - cam_origin).normalized();
return {PitchAngle::from_radians(internal::asin(direction.z)),
YawAngle::from_radians(-internal::atan2(direction.x, direction.y)), RollAngle::from_radians(0.f)};
return {PitchAngle::from_asin(direction.z), -YawAngle::from_atan2(direction.x, direction.y),
RollAngle::from_radians(0.f)};
}
[[nodiscard("view matrix result should not be discarded")]]
@@ -4,7 +4,6 @@
#pragma once
#include "omath/engines/frostbite_engine/formulas.hpp"
#include "omath/internal/constexpr_math.hpp"
#include "omath/projection/camera.hpp"
namespace omath::frostbite_engine
@@ -18,8 +17,8 @@ namespace omath::frostbite_engine
{
const auto direction = (look_at - cam_origin).normalized();
return {PitchAngle::from_radians(-internal::asin(direction.y)),
YawAngle::from_radians(internal::atan2(direction.x, direction.z)), RollAngle::from_radians(0.f)};
return {-PitchAngle::from_asin(direction.y), YawAngle::from_atan2(direction.x, direction.z),
RollAngle::from_radians(0.f)};
}
[[nodiscard("view matrix result should not be discarded")]]
@@ -4,7 +4,6 @@
#pragma once
#include "omath/engines/iw_engine/formulas.hpp"
#include "omath/internal/constexpr_math.hpp"
#include "omath/projection/camera.hpp"
namespace omath::iw_engine
@@ -18,8 +17,8 @@ namespace omath::iw_engine
{
const auto direction = (look_at - cam_origin).normalized();
return {PitchAngle::from_radians(-internal::asin(direction.z)),
YawAngle::from_radians(internal::atan2(direction.y, direction.x)), RollAngle::from_radians(0.f)};
return {-PitchAngle::from_asin(direction.z), YawAngle::from_atan2(direction.y, direction.x),
RollAngle::from_radians(0.f)};
}
[[nodiscard("view matrix result should not be discarded")]]
@@ -4,7 +4,6 @@
#pragma once
#include "omath/engines/opengl_engine/formulas.hpp"
#include "omath/internal/constexpr_math.hpp"
#include "omath/projection/camera.hpp"
namespace omath::opengl_engine
@@ -18,8 +17,8 @@ namespace omath::opengl_engine
{
const auto direction = (look_at - cam_origin).normalized();
return {PitchAngle::from_radians(internal::asin(direction.y)),
YawAngle::from_radians(-internal::atan2(direction.x, -direction.z)), RollAngle::from_radians(0.f)};
return {PitchAngle::from_asin(direction.y), -YawAngle::from_atan2(direction.x, -direction.z),
RollAngle::from_radians(0.f)};
}
[[nodiscard("view matrix result should not be discarded")]]
@@ -4,7 +4,6 @@
#pragma once
#include "omath/engines/rage_engine/formulas.hpp"
#include "omath/internal/constexpr_math.hpp"
#include "omath/projection/camera.hpp"
namespace omath::rage_engine
@@ -18,8 +17,8 @@ namespace omath::rage_engine
{
const auto direction = (look_at - cam_origin).normalized();
return {PitchAngle::from_radians(internal::asin(direction.z)),
YawAngle::from_radians(-internal::atan2(direction.x, direction.y)), RollAngle::from_radians(0.f)};
return {PitchAngle::from_asin(direction.z), -YawAngle::from_atan2(direction.x, direction.y),
RollAngle::from_radians(0.f)};
}
[[nodiscard("view matrix result should not be discarded")]]
@@ -4,7 +4,6 @@
#pragma once
#include "omath/engines/source_engine/formulas.hpp"
#include "omath/internal/constexpr_math.hpp"
#include "omath/projection/camera.hpp"
namespace omath::source_engine
@@ -18,8 +17,8 @@ namespace omath::source_engine
{
const auto direction = (look_at - cam_origin).normalized();
return {PitchAngle::from_radians(-internal::asin(direction.z)),
YawAngle::from_radians(internal::atan2(direction.y, direction.x)), RollAngle::from_radians(0.f)};
return {-PitchAngle::from_asin(direction.z),
YawAngle::from_atan2(direction.y, direction.x), RollAngle::from_radians(0.f)};
}
[[nodiscard("view matrix result should not be discarded")]]
@@ -4,7 +4,6 @@
#pragma once
#include "omath/engines/unity_engine/formulas.hpp"
#include "omath/internal/constexpr_math.hpp"
#include "omath/projection/camera.hpp"
namespace omath::unity_engine
@@ -18,8 +17,8 @@ namespace omath::unity_engine
{
const auto direction = (look_at - cam_origin).normalized();
return {PitchAngle::from_radians(-internal::asin(direction.y)),
YawAngle::from_radians(internal::atan2(direction.x, direction.z)), RollAngle::from_radians(0.f)};
return {-PitchAngle::from_asin(direction.y), YawAngle::from_atan2(direction.x, direction.z),
RollAngle::from_radians(0.f)};
}
[[nodiscard("view matrix result should not be discarded")]]
@@ -4,7 +4,6 @@
#pragma once
#include "omath/engines/unreal_engine/formulas.hpp"
#include "omath/internal/constexpr_math.hpp"
#include "omath/projection/camera.hpp"
namespace omath::unreal_engine
@@ -18,8 +17,8 @@ namespace omath::unreal_engine
{
const auto direction = (look_at - cam_origin).normalized();
return {PitchAngle::from_radians(internal::asin(direction.z)),
YawAngle::from_radians(internal::atan2(direction.y, direction.x)), RollAngle::from_radians(0.f)};
return {PitchAngle::from_asin(direction.z), YawAngle::from_atan2(direction.y, direction.x),
RollAngle::from_radians(0.f)};
}
[[nodiscard("view matrix result should not be discarded")]]
+130
View File
@@ -0,0 +1,130 @@
#pragma once
#include <cstdint>
#include <expected>
#include <string>
#include <string_view>
namespace omath::hashing
{
enum class Base64Error
{
INVALID_LENGTH,
INVALID_CHARACTER,
INVALID_PADDING
};
[[nodiscard("FNV-1a hash result should not be discarded")]]
constexpr std::uint64_t fnv1a(const std::string_view value) noexcept
{
std::uint64_t hash = 14695981039346656037ULL;
for (const char character : value)
{
hash ^= static_cast<std::uint8_t>(character);
hash *= 1099511628211ULL;
}
return hash;
}
[[nodiscard("CRC-32 checksum result should not be discarded")]]
constexpr std::uint32_t crc32(const std::string_view value) noexcept
{
std::uint32_t crc = 0xFFFFFFFFU;
for (const char character : value)
{
crc ^= static_cast<std::uint8_t>(character);
for (int bit = 0; bit < 8; bit++)
{
crc = crc & 1U ? (crc >> 1U) ^ 0xEDB88320U : crc >> 1U;
}
}
return crc ^ 0xFFFFFFFFU;
}
[[nodiscard("Base64 encoding result should not be discarded")]]
constexpr std::string base64_encode(const std::string_view value)
{
constexpr std::string_view alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
std::string result;
result.reserve((value.size() + 2) / 3 * 4);
for (std::size_t index = 0; index < value.size(); index += 3)
{
const std::uint32_t first = static_cast<std::uint8_t>(value[index]);
const std::uint32_t second = index + 1 < value.size() ? static_cast<std::uint8_t>(value[index + 1]) : 0;
const std::uint32_t third = index + 2 < value.size() ? static_cast<std::uint8_t>(value[index + 2]) : 0;
const std::uint32_t chunk = first << 16U | second << 8U | third;
result += alphabet[(chunk >> 18U) & 0x3FU];
result += alphabet[(chunk >> 12U) & 0x3FU];
result += index + 1 < value.size() ? alphabet[(chunk >> 6U) & 0x3FU] : '=';
result += index + 2 < value.size() ? alphabet[chunk & 0x3FU] : '=';
}
return result;
}
[[nodiscard("Base64 decoding result should not be discarded")]]
constexpr std::expected<std::string, Base64Error> base64_decode(const std::string_view value)
{
if (value.size() % 4 != 0)
return std::unexpected(Base64Error::INVALID_LENGTH);
std::string result;
result.reserve(value.size() / 4 * 3);
for (std::size_t index = 0; index < value.size(); index += 4)
{
const auto decode_character = [](const char character) constexpr -> int
{
if (character >= 'A' && character <= 'Z')
return character - 'A';
if (character >= 'a' && character <= 'z')
return character - 'a' + 26;
if (character >= '0' && character <= '9')
return character - '0' + 52;
if (character == '+')
return 62;
if (character == '/')
return 63;
return -1;
};
const bool is_last_chunk = index + 4 == value.size();
const int first = decode_character(value[index]);
const int second = decode_character(value[index + 1]);
const int third = value[index + 2] == '=' ? -2 : decode_character(value[index + 2]);
const int fourth = value[index + 3] == '=' ? -2 : decode_character(value[index + 3]);
if (first < 0 || second < 0 || third == -1 || fourth == -1)
return std::unexpected(Base64Error::INVALID_CHARACTER);
if (third == -2)
{
if (fourth != -2 || !is_last_chunk || (second & 0x0F) != 0)
return std::unexpected(Base64Error::INVALID_PADDING);
}
else if (fourth == -2 && (!is_last_chunk || (third & 0x03) != 0))
return std::unexpected(Base64Error::INVALID_PADDING);
const std::uint32_t chunk = static_cast<std::uint32_t>(first) << 18U
| static_cast<std::uint32_t>(second) << 12U
| static_cast<std::uint32_t>(third < 0 ? 0 : third) << 6U
| static_cast<std::uint32_t>(fourth < 0 ? 0 : fourth);
result += static_cast<char>(chunk >> 16U);
if (third >= 0)
result += static_cast<char>(chunk >> 8U);
if (fourth >= 0)
result += static_cast<char>(chunk);
}
return result;
}
} // namespace omath::hashing
+60 -28
View File
@@ -30,6 +30,9 @@ namespace omath::hud
EntityOverlay& add_2d_box(const Color& box_color, const Color& fill_color = Color{0.f, 0.f, 0.f, 0.f},
const Color& outline_color = Color{0.f, 0.f, 0.f, 0.f}, float thickness = 1.f);
EntityOverlay& add_2d_box(const Color& box_color, const Gradient& fill_gradient,
const Color& outline_color = Color{0.f, 0.f, 0.f, 0.f}, float thickness = 1.f);
EntityOverlay& add_cornered_2d_box(const Color& box_color, const Color& fill_color = Color{0.f, 0.f, 0.f, 0.f},
const Color& outline_color = Color{0.f, 0.f, 0.f, 0.f},
float corner_ratio_len = 0.2f, float thickness = 1.f);
@@ -38,17 +41,21 @@ namespace omath::hud
float thickness = 1.f);
// ── Bars ─────────────────────────────────────────────────────────
EntityOverlay& add_right_bar(const Color& color, const Color& outline_color, const Color& bg_color, float width,
float ratio, float offset = 5.f);
EntityOverlay& add_right_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color,
float width, float ratio, float offset = 5.f,
const std::optional<widget::Glow>& glow = std::nullopt);
EntityOverlay& add_left_bar(const Color& color, const Color& outline_color, const Color& bg_color, float width,
float ratio, float offset = 5.f);
EntityOverlay& add_left_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color,
float width, float ratio, float offset = 5.f,
const std::optional<widget::Glow>& glow = std::nullopt);
EntityOverlay& add_top_bar(const Color& color, const Color& outline_color, const Color& bg_color, float height,
float ratio, float offset = 5.f);
EntityOverlay& add_top_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color,
float height, float ratio, float offset = 5.f,
const std::optional<widget::Glow>& glow = std::nullopt);
EntityOverlay& add_bottom_bar(const Color& color, const Color& outline_color, const Color& bg_color,
float height, float ratio, float offset = 5.f);
EntityOverlay& add_bottom_bar(const widget::BarPaint& color, const Color& outline_color, const Color& bg_color,
float height, float ratio, float offset = 5.f,
const std::optional<widget::Glow>& glow = std::nullopt);
EntityOverlay& add_right_dashed_bar(const Color& color, const Color& outline_color, const Color& bg_color,
float width, float ratio, float dash_len, float gap_len,
@@ -65,26 +72,31 @@ namespace omath::hud
float offset = 5.f);
// ── Labels ───────────────────────────────────────────────────────
EntityOverlay& add_right_label(const Color& color, float offset, widget::Outlined outlined,
const std::string_view& text);
EntityOverlay& add_right_label(const widget::Paint& color, float offset, widget::Outlined outlined,
const std::string_view& text,
const std::optional<widget::Glow>& glow = std::nullopt);
EntityOverlay& add_left_label(const Color& color, float offset, widget::Outlined outlined,
const std::string_view& text);
EntityOverlay& add_left_label(const widget::Paint& color, float offset, widget::Outlined outlined,
const std::string_view& text,
const std::optional<widget::Glow>& glow = std::nullopt);
EntityOverlay& add_top_label(const Color& color, float offset, widget::Outlined outlined,
std::string_view text);
EntityOverlay& add_top_label(const widget::Paint& color, float offset, widget::Outlined outlined,
std::string_view text, const std::optional<widget::Glow>& glow = std::nullopt);
EntityOverlay& add_bottom_label(const Color& color, float offset, widget::Outlined outlined,
std::string_view text);
EntityOverlay& add_bottom_label(const widget::Paint& color, float offset, widget::Outlined outlined,
std::string_view text, const std::optional<widget::Glow>& glow = std::nullopt);
EntityOverlay& add_centered_top_label(const Color& color, float offset, widget::Outlined outlined,
const std::string_view& text);
EntityOverlay& add_centered_top_label(const widget::Paint& color, float offset, widget::Outlined outlined,
const std::string_view& text,
const std::optional<widget::Glow>& glow = std::nullopt);
EntityOverlay& add_centered_bottom_label(const Color& color, float offset, widget::Outlined outlined,
const std::string_view& text);
EntityOverlay& add_centered_bottom_label(const widget::Paint& color, float offset, widget::Outlined outlined,
const std::string_view& text,
const std::optional<widget::Glow>& glow = std::nullopt);
template<typename... Args>
EntityOverlay& add_right_label(const Color& color, const float offset, const widget::Outlined outlined,
requires(sizeof...(Args) > 0)
EntityOverlay& add_right_label(const widget::Paint& color, const float offset, const widget::Outlined outlined,
std::format_string<Args...> fmt, Args&&... args)
{
return add_right_label(color, offset, outlined,
@@ -92,7 +104,8 @@ namespace omath::hud
}
template<typename... Args>
EntityOverlay& add_left_label(const Color& color, const float offset, const widget::Outlined outlined,
requires(sizeof...(Args) > 0)
EntityOverlay& add_left_label(const widget::Paint& color, const float offset, const widget::Outlined outlined,
std::format_string<Args...> fmt, Args&&... args)
{
return add_left_label(color, offset, outlined,
@@ -100,7 +113,8 @@ namespace omath::hud
}
template<typename... Args>
EntityOverlay& add_top_label(const Color& color, const float offset, const widget::Outlined outlined,
requires(sizeof...(Args) > 0)
EntityOverlay& add_top_label(const widget::Paint& color, const float offset, const widget::Outlined outlined,
std::format_string<Args...> fmt, Args&&... args)
{
return add_top_label(color, offset, outlined,
@@ -108,7 +122,8 @@ namespace omath::hud
}
template<typename... Args>
EntityOverlay& add_bottom_label(const Color& color, const float offset, const widget::Outlined outlined,
requires(sizeof...(Args) > 0)
EntityOverlay& add_bottom_label(const widget::Paint& color, const float offset, const widget::Outlined outlined,
std::format_string<Args...> fmt, Args&&... args)
{
return add_bottom_label(color, offset, outlined,
@@ -116,15 +131,18 @@ namespace omath::hud
}
template<typename... Args>
EntityOverlay& add_centered_top_label(const Color& color, const float offset, const widget::Outlined outlined,
std::format_string<Args...> fmt, Args&&... args)
requires(sizeof...(Args) > 0)
EntityOverlay& add_centered_top_label(const widget::Paint& color, const float offset,
const widget::Outlined outlined, std::format_string<Args...> fmt,
Args&&... args)
{
return add_centered_top_label(color, offset, outlined,
std::string_view{std::vformat(fmt.get(), std::make_format_args(args...))});
}
template<typename... Args>
EntityOverlay& add_centered_bottom_label(const Color& color, const float offset,
requires(sizeof...(Args) > 0)
EntityOverlay& add_centered_bottom_label(const widget::Paint& color, const float offset,
const widget::Outlined outlined, std::format_string<Args...> fmt,
Args&&... args)
{
@@ -166,6 +184,7 @@ namespace omath::hud
EntityOverlay& add_snap_line(const Vector2<float>& start_pos, const Color& color, float width);
EntityOverlay& add_skeleton(const Color& color, float thickness = 1.f);
EntityOverlay& add_skeleton(std::span<const widget::Bone> bones, const Color& color, float thickness = 1.f);
// ── Declarative interface ─────────────────────────────────────────
/// Pass any combination of widget:: descriptor structs (and std::optional<W>
@@ -230,6 +249,7 @@ namespace omath::hud
}
void dispatch(const widget::Box& box);
void dispatch(const widget::CanvasGlow& canvas_glow);
void dispatch(const widget::CorneredBox& cornered_box);
void dispatch(const widget::DashedBox& dashed_box);
void dispatch(const widget::RightSide& right_side);
@@ -242,7 +262,19 @@ namespace omath::hud
void dispatch(const widget::AimDot& aim_dot);
void dispatch(const widget::ProjectileAim& proj_widget);
void draw_progress_ring(const Vector2<float>& center, const widget::ProgressRing& ring);
void draw_outlined_text(const Vector2<float>& position, const Color& color, const std::string_view& text);
void draw_label(const Vector2<float>& position, const widget::Paint& paint, widget::Outlined outlined,
const std::string_view& text, const std::optional<widget::Glow>& glow);
void draw_glow_polyline(const std::span<const Vector2<float>>& points, const widget::Glow& glow,
float thickness) const;
void draw_glow_line(const Vector2<float>& from, const Vector2<float>& to, const widget::Glow& glow,
float thickness) const;
void draw_glow_rectangle(const Vector2<float>& min, const Vector2<float>& max,
const std::optional<widget::Glow>& glow) const;
void draw_canvas_glow(const widget::CanvasGlow& canvas_glow) const;
void draw_filled_rectangle(const Vector2<float>& min, const Vector2<float>& max,
const widget::Paint& paint) const;
[[nodiscard]]
static widget::Paint resolve_bar_paint(const widget::BarPaint& paint, float ratio, bool vertical);
void draw_dashed_line(const Vector2<float>& from, const Vector2<float>& to, const Color& color, float dash_len,
float gap_len, float thickness) const;
void draw_dashed_fill(const Vector2<float>& origin, const Vector2<float>& step_dir,
+91 -6
View File
@@ -2,16 +2,57 @@
// Created by orange on 15.03.2026.
//
#pragma once
#include "gradient.hpp"
#include "omath/linear_algebra/vector2.hpp"
#include "omath/utility/color.hpp"
#include <any>
#include <array>
#include <initializer_list>
#include <optional>
#include <span>
#include <string_view>
#include <type_traits>
#include <variant>
#include <vector>
namespace omath::hud::widget
{
struct Paint : std::variant<Color, Gradient>
{
using std::variant<Color, Gradient>::variant;
constexpr Paint(const float red, const float green, const float blue, const float alpha)
: std::variant<Color, Gradient>(Color{red, green, blue, alpha})
{
}
};
struct BarGradient
{
Color empty_color;
Color full_color;
};
struct BarPaint : std::variant<Color, Gradient, BarGradient>
{
using std::variant<Color, Gradient, BarGradient>::variant;
constexpr BarPaint(const float red, const float green, const float blue, const float alpha)
: std::variant<Color, Gradient, BarGradient>(Color{red, green, blue, alpha})
{
}
BarPaint(const Paint& paint)
{
std::visit(
[this](const auto& value)
{
this->template emplace<std::decay_t<decltype(value)>>(value);
},
paint);
}
};
// ── Overloaded helper for std::visit ──────────────────────────────────────
template<typename... Ts>
struct Overloaded : Ts...
@@ -21,13 +62,28 @@ namespace omath::hud::widget
template<typename... Ts>
Overloaded(Ts...) -> Overloaded<Ts...>;
struct Glow
{
Color color;
float radius = 4.f;
float intensity = 1.f;
};
struct CanvasGlow
{
Glow glow;
int layers = 64;
float rounding = 20.f;
};
// ── Standalone widgets ────────────────────────────────────────────────────
struct Box
{
Color color;
Color fill{0.f, 0.f, 0.f, 0.f};
Paint fill{Color{0.f, 0.f, 0.f, 0.f}};
Color outline{0.f, 0.f, 0.f, 0.f};
float thickness = 1.f;
std::optional<Glow> glow = std::nullopt;
};
enum class Outlined
@@ -42,6 +98,7 @@ namespace omath::hud::widget
Color outline{0.f, 0.f, 0.f, 0.f};
float corner_ratio = 0.2f;
float thickness = 1.f;
std::optional<Glow> glow = std::nullopt;
};
struct DashedBox
@@ -52,10 +109,37 @@ namespace omath::hud::widget
float thickness = 1.f;
};
struct Bone
{
Vector2<float> start;
Vector2<float> end;
};
struct Skeleton
{
std::vector<Bone> bones;
Color color;
float thickness = 1.f;
Skeleton(const Color& color, const float thickness = 1.f): color(color), thickness(thickness)
{
}
Skeleton(const std::span<const Bone> bones, const Color& color, const float thickness = 1.f)
: bones(bones.begin(), bones.end()), color(color), thickness(thickness)
{
}
Skeleton(const std::initializer_list<Bone> bones, const Color& color, const float thickness = 1.f)
: bones(bones), color(color), thickness(thickness)
{
}
template<std::size_t Size>
Skeleton(const std::array<Bone, Size>& bones, const Color& color, const float thickness = 1.f)
: Skeleton(std::span<const Bone>{bones}, color, thickness)
{
}
};
struct SnapLine
{
@@ -92,18 +176,18 @@ namespace omath::hud::widget
Figure figure = Figure::SQUARE;
};
// ── Side-agnostic widgets (used inside XxxSide containers) ────────────────
/// A filled bar. `size` is width for left/right sides, height for top/bottom.
struct Bar
{
Color color;
BarPaint color;
Color outline;
Color bg;
float size;
float ratio;
float offset = 5.f;
std::optional<Glow> glow = std::nullopt;
};
/// A dashed bar. Same field semantics as Bar plus dash parameters.
@@ -121,10 +205,11 @@ namespace omath::hud::widget
struct Label
{
Color color;
Paint color;
float offset;
Outlined outlined;
std::string_view text;
std::optional<Glow> glow = std::nullopt;
};
/// Wraps a Label to request horizontal centering (only applied in TopSide / BottomSide).
@@ -172,8 +257,8 @@ namespace omath::hud::widget
struct None
{
}; ///< No-op placeholder — used by widget::when for disabled elements.
using SideWidget =
std::variant<None, Bar, DashedBar, Label, Centered<Label>, SpaceVertical, SpaceHorizontal, ProgressRing, Icon>;
using SideWidget = std::variant<None, Bar, DashedBar, Label, Centered<Label>, SpaceVertical, SpaceHorizontal,
ProgressRing, Icon>;
// ── Side containers ───────────────────────────────────────────────────────
// Storing std::initializer_list<SideWidget> is safe here: the backing array
+23
View File
@@ -0,0 +1,23 @@
#pragma once
#include "omath/utility/color.hpp"
namespace omath::hud
{
enum class GradientDirection
{
RightToLeft,
LeftToRight,
};
struct Gradient final
{
Color top_left;
Color top_right;
Color bottom_right;
Color bottom_left;
bool animated = false;
float animation_speed = 4.f;
float animation_spread = 0.7f;
GradientDirection direction = GradientDirection::RightToLeft;
};
} // namespace omath::hud
@@ -2,6 +2,7 @@
// Created by orange on 13.03.2026.
//
#pragma once
#include "gradient.hpp"
#include "omath/linear_algebra/vector2.hpp"
#include "omath/utility/color.hpp"
#include <any>
@@ -19,12 +20,24 @@ namespace omath::hud
virtual void add_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color,
float thickness) = 0;
virtual void add_polyline_clipped(const std::span<const Vector2<float>>& vertexes, const Vector2<float>&,
const Vector2<float>&, const Color& color, float thickness)
{
add_polyline(vertexes, color, thickness);
}
virtual void add_filled_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color) = 0;
virtual void add_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color) = 0;
virtual void add_filled_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color) = 0;
virtual void add_gradient_rectangle(const Vector2<float>& min, const Vector2<float>& max,
const Gradient& gradient)
{
add_filled_rectangle(min, max, gradient.top_left);
}
virtual void add_circle(const Vector2<float>& center, float radius, const Color& color, float thickness,
int segments = 0) = 0;
@@ -41,6 +54,12 @@ namespace omath::hud
virtual void add_text(const Vector2<float>& position, const Color& color, const std::string_view& text) = 0;
virtual void add_gradient_text(const Vector2<float>& position, const Gradient& gradient,
const std::string_view& text)
{
add_text(position, gradient.top_left, text);
}
[[nodiscard]]
virtual Vector2<float> calc_text_size(const std::string_view& text) = 0;
};
@@ -13,10 +13,15 @@ namespace omath::hud
~ImguiHudRenderer() override;
void add_line(const Vector2<float>& line_start, const Vector2<float>& line_end, const Color& color,
float thickness) override;
void add_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color, float thickness) override;
void add_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color,
float thickness) override;
void add_polyline_clipped(const std::span<const Vector2<float>>& vertexes, const Vector2<float>& clip_min,
const Vector2<float>& clip_max, const Color& color, float thickness) override;
void add_filled_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color) override;
void add_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color) override;
void add_filled_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color) override;
void add_gradient_rectangle(const Vector2<float>& min, const Vector2<float>& max,
const Gradient& gradient) override;
void add_circle(const Vector2<float>& center, float radius, const Color& color, float thickness,
int segments = 0) override;
void add_filled_circle(const Vector2<float>& center, float radius, const Color& color,
@@ -26,8 +31,10 @@ namespace omath::hud
void add_image(const std::any& texture_id, const Vector2<float>& min, const Vector2<float>& max,
const Color& tint = Color{1.f, 1.f, 1.f, 1.f}) override;
void add_text(const Vector2<float>& position, const Color& color, const std::string_view& text) override;
void add_gradient_text(const Vector2<float>& position, const Gradient& gradient,
const std::string_view& text) override;
[[nodiscard]]
Vector2<float> calc_text_size(const std::string_view& text) override;
};
} // namespace omath::hud
#endif // OMATH_IMGUI_INTEGRATION
#endif // OMATH_IMGUI_INTEGRATION
+158 -61
View File
@@ -186,7 +186,14 @@ namespace omath
else if constexpr (StoreType == MatStoreType::COLUMN_MAJOR)
return cache_friendly_multiply_col_major(other);
}
if constexpr (StoreType == MatStoreType::ROW_MAJOR)
if constexpr (!std::is_same_v<Type, float> && !std::is_same_v<Type, double>)
{
if constexpr (StoreType == MatStoreType::ROW_MAJOR)
return cache_friendly_multiply_row_major(other);
else if constexpr (StoreType == MatStoreType::COLUMN_MAJOR)
return cache_friendly_multiply_col_major(other);
}
else if constexpr (StoreType == MatStoreType::ROW_MAJOR)
return avx_multiply_row_major(other);
else if constexpr (StoreType == MatStoreType::COLUMN_MAJOR)
return avx_multiply_col_major(other);
@@ -429,13 +436,22 @@ namespace omath
cache_friendly_multiply_row_major(const Mat<Columns, OtherColumns, Type, MatStoreType::ROW_MAJOR>& other) const
{
Mat<Rows, OtherColumns, Type, MatStoreType::ROW_MAJOR> result;
const Type* left_data = m_data.data();
const Type* right_data = other.raw_array().data();
Type* result_data = result.raw_array().data();
for (std::size_t row_index = 0; row_index < Rows; ++row_index)
{
const Type* left_row = left_data + row_index * Columns;
Type* result_row = result_data + row_index * OtherColumns;
for (std::size_t column_index = 0; column_index < Columns; ++column_index)
{
const Type& current_number = at(row_index, column_index);
const Type current_number = left_row[column_index];
const Type* right_row = right_data + column_index * OtherColumns;
for (std::size_t other_column = 0; other_column < OtherColumns; ++other_column)
result.at(row_index, other_column) += current_number * other.at(column_index, other_column);
result_row[other_column] += current_number * right_row[other_column];
}
}
return result;
}
@@ -444,13 +460,22 @@ namespace omath
const Mat<Columns, OtherColumns, Type, MatStoreType::COLUMN_MAJOR>& other) const
{
Mat<Rows, OtherColumns, Type, MatStoreType::COLUMN_MAJOR> result;
const Type* left_data = m_data.data();
const Type* right_data = other.raw_array().data();
Type* result_data = result.raw_array().data();
for (std::size_t other_column = 0; other_column < OtherColumns; ++other_column)
{
const Type* right_column = right_data + other_column * Columns;
Type* result_column = result_data + other_column * Rows;
for (std::size_t column_index = 0; column_index < Columns; ++column_index)
{
const Type& current_number = other.at(column_index, other_column);
const Type current_number = right_column[column_index];
const Type* left_column = left_data + column_index * Rows;
for (std::size_t row_index = 0; row_index < Rows; ++row_index)
result.at(row_index, other_column) += at(row_index, column_index) * current_number;
result_column[row_index] += left_column[row_index] * current_number;
}
}
return result;
}
#ifdef OMATH_USE_AVX2
@@ -466,56 +491,92 @@ namespace omath
if constexpr (std::is_same_v<Type, float>)
{
// ReSharper disable once CppTooWideScopeInitStatement
constexpr std::size_t vector_size = 8;
constexpr std::size_t block_size = vector_size * 4;
for (std::size_t j = 0; j < OtherColumns; ++j)
{
auto* c_col = reinterpret_cast<float*>(result_mat_data + j * Rows);
for (std::size_t k = 0; k < Columns; ++k)
std::size_t i = 0;
for (; i + block_size <= Rows; i += block_size)
{
const float bkj = reinterpret_cast<const float*>(other_mat_data)[k + j * Columns];
const __m256 bkj_vec = _mm256_set1_ps(bkj);
const auto* a_col_k = reinterpret_cast<const float*>(this_mat_data + k * Rows);
std::size_t i = 0;
for (; i + vector_size <= Rows; i += vector_size)
__m256 cvec0 = _mm256_setzero_ps();
__m256 cvec1 = _mm256_setzero_ps();
__m256 cvec2 = _mm256_setzero_ps();
__m256 cvec3 = _mm256_setzero_ps();
for (std::size_t k = 0; k < Columns; ++k)
{
__m256 cvec = _mm256_loadu_ps(c_col + i);
const __m256 bkj_vec = _mm256_set1_ps(other_mat_data[k + j * Columns]);
const auto* a_col_k = this_mat_data + k * Rows + i;
cvec0 = _mm256_fmadd_ps(_mm256_loadu_ps(a_col_k), bkj_vec, cvec0);
cvec1 = _mm256_fmadd_ps(_mm256_loadu_ps(a_col_k + vector_size), bkj_vec, cvec1);
cvec2 = _mm256_fmadd_ps(_mm256_loadu_ps(a_col_k + vector_size * 2), bkj_vec, cvec2);
cvec3 = _mm256_fmadd_ps(_mm256_loadu_ps(a_col_k + vector_size * 3), bkj_vec, cvec3);
}
_mm256_storeu_ps(c_col + i, cvec0);
_mm256_storeu_ps(c_col + i + vector_size, cvec1);
_mm256_storeu_ps(c_col + i + vector_size * 2, cvec2);
_mm256_storeu_ps(c_col + i + vector_size * 3, cvec3);
}
for (; i + vector_size <= Rows; i += vector_size)
{
__m256 cvec = _mm256_setzero_ps();
for (std::size_t k = 0; k < Columns; ++k)
{
const __m256 bkj_vec = _mm256_set1_ps(other_mat_data[k + j * Columns]);
const auto* a_col_k = this_mat_data + k * Rows;
const __m256 a_vec = _mm256_loadu_ps(a_col_k + i);
cvec = _mm256_fmadd_ps(a_vec, bkj_vec, cvec);
_mm256_storeu_ps(c_col + i, cvec);
}
for (; i < Rows; ++i)
c_col[i] += a_col_k[i] * bkj;
_mm256_storeu_ps(c_col + i, cvec);
}
for (; i < Rows; ++i)
for (std::size_t k = 0; k < Columns; ++k)
c_col[i] += this_mat_data[i + k * Rows] * other_mat_data[k + j * Columns];
}
}
else if (std::is_same_v<Type, double>)
{ // double
// ReSharper disable once CppTooWideScopeInitStatement
{
constexpr std::size_t vector_size = 4;
constexpr std::size_t block_size = vector_size * 4;
for (std::size_t j = 0; j < OtherColumns; ++j)
{
auto* c_col = reinterpret_cast<double*>(result_mat_data + j * Rows);
for (std::size_t k = 0; k < Columns; ++k)
std::size_t i = 0;
for (; i + block_size <= Rows; i += block_size)
{
const double bkj = reinterpret_cast<const double*>(other_mat_data)[k + j * Columns];
const __m256d bkj_vec = _mm256_set1_pd(bkj);
const auto* a_col_k = reinterpret_cast<const double*>(this_mat_data + k * Rows);
std::size_t i = 0;
for (; i + vector_size <= Rows; i += vector_size)
__m256d cvec0 = _mm256_setzero_pd();
__m256d cvec1 = _mm256_setzero_pd();
__m256d cvec2 = _mm256_setzero_pd();
__m256d cvec3 = _mm256_setzero_pd();
for (std::size_t k = 0; k < Columns; ++k)
{
__m256d cvec = _mm256_loadu_pd(c_col + i);
const __m256d bkj_vec = _mm256_set1_pd(other_mat_data[k + j * Columns]);
const auto* a_col_k = this_mat_data + k * Rows + i;
cvec0 = _mm256_fmadd_pd(_mm256_loadu_pd(a_col_k), bkj_vec, cvec0);
cvec1 = _mm256_fmadd_pd(_mm256_loadu_pd(a_col_k + vector_size), bkj_vec, cvec1);
cvec2 = _mm256_fmadd_pd(_mm256_loadu_pd(a_col_k + vector_size * 2), bkj_vec, cvec2);
cvec3 = _mm256_fmadd_pd(_mm256_loadu_pd(a_col_k + vector_size * 3), bkj_vec, cvec3);
}
_mm256_storeu_pd(c_col + i, cvec0);
_mm256_storeu_pd(c_col + i + vector_size, cvec1);
_mm256_storeu_pd(c_col + i + vector_size * 2, cvec2);
_mm256_storeu_pd(c_col + i + vector_size * 3, cvec3);
}
for (; i + vector_size <= Rows; i += vector_size)
{
__m256d cvec = _mm256_setzero_pd();
for (std::size_t k = 0; k < Columns; ++k)
{
const __m256d bkj_vec = _mm256_set1_pd(other_mat_data[k + j * Columns]);
const auto* a_col_k = this_mat_data + k * Rows;
const __m256d a_vec = _mm256_loadu_pd(a_col_k + i);
cvec = _mm256_fmadd_pd(a_vec, bkj_vec, cvec);
_mm256_storeu_pd(c_col + i, cvec);
}
for (; i < Rows; ++i)
c_col[i] += a_col_k[i] * bkj;
_mm256_storeu_pd(c_col + i, cvec);
}
for (; i < Rows; ++i)
for (std::size_t k = 0; k < Columns; ++k)
c_col[i] += this_mat_data[i + k * Rows] * other_mat_data[k + j * Columns];
}
}
else
@@ -536,56 +597,92 @@ namespace omath
if constexpr (std::is_same_v<Type, float>)
{
// ReSharper disable once CppTooWideScopeInitStatement
constexpr std::size_t vector_size = 8;
constexpr std::size_t block_size = vector_size * 4;
for (std::size_t i = 0; i < Rows; ++i)
{
Type* c_row = result_mat_data + i * OtherColumns;
for (std::size_t k = 0; k < Columns; ++k)
auto* c_row = reinterpret_cast<float*>(result_mat_data + i * OtherColumns);
std::size_t j = 0;
for (; j + block_size <= OtherColumns; j += block_size)
{
const auto aik = static_cast<float>(this_mat_data[i * Columns + k]);
const __m256 aik_vec = _mm256_set1_ps(aik);
const auto* b_row = reinterpret_cast<const float*>(other_mat_data + k * OtherColumns);
std::size_t j = 0;
for (; j + vector_size <= OtherColumns; j += vector_size)
__m256 cvec0 = _mm256_setzero_ps();
__m256 cvec1 = _mm256_setzero_ps();
__m256 cvec2 = _mm256_setzero_ps();
__m256 cvec3 = _mm256_setzero_ps();
for (std::size_t k = 0; k < Columns; ++k)
{
__m256 cvec = _mm256_loadu_ps(c_row + j);
const __m256 aik_vec = _mm256_set1_ps(this_mat_data[i * Columns + k]);
const auto* b_row = other_mat_data + k * OtherColumns + j;
cvec0 = _mm256_fmadd_ps(_mm256_loadu_ps(b_row), aik_vec, cvec0);
cvec1 = _mm256_fmadd_ps(_mm256_loadu_ps(b_row + vector_size), aik_vec, cvec1);
cvec2 = _mm256_fmadd_ps(_mm256_loadu_ps(b_row + vector_size * 2), aik_vec, cvec2);
cvec3 = _mm256_fmadd_ps(_mm256_loadu_ps(b_row + vector_size * 3), aik_vec, cvec3);
}
_mm256_storeu_ps(c_row + j, cvec0);
_mm256_storeu_ps(c_row + j + vector_size, cvec1);
_mm256_storeu_ps(c_row + j + vector_size * 2, cvec2);
_mm256_storeu_ps(c_row + j + vector_size * 3, cvec3);
}
for (; j + vector_size <= OtherColumns; j += vector_size)
{
__m256 cvec = _mm256_setzero_ps();
for (std::size_t k = 0; k < Columns; ++k)
{
const __m256 aik_vec = _mm256_set1_ps(this_mat_data[i * Columns + k]);
const auto* b_row = other_mat_data + k * OtherColumns;
const __m256 b_vec = _mm256_loadu_ps(b_row + j);
cvec = _mm256_fmadd_ps(b_vec, aik_vec, cvec);
_mm256_storeu_ps(c_row + j, cvec);
}
for (; j < OtherColumns; ++j)
c_row[j] += aik * b_row[j];
_mm256_storeu_ps(c_row + j, cvec);
}
for (; j < OtherColumns; ++j)
for (std::size_t k = 0; k < Columns; ++k)
c_row[j] += this_mat_data[i * Columns + k] * other_mat_data[k * OtherColumns + j];
}
}
else if (std::is_same_v<Type, double>)
{ // double
// ReSharper disable once CppTooWideScopeInitStatement
{
constexpr std::size_t vector_size = 4;
constexpr std::size_t block_size = vector_size * 4;
for (std::size_t i = 0; i < Rows; ++i)
{
Type* c_row = result_mat_data + i * OtherColumns;
for (std::size_t k = 0; k < Columns; ++k)
auto* c_row = reinterpret_cast<double*>(result_mat_data + i * OtherColumns);
std::size_t j = 0;
for (; j + block_size <= OtherColumns; j += block_size)
{
const auto aik = static_cast<double>(this_mat_data[i * Columns + k]);
const __m256d aik_vec = _mm256_set1_pd(aik);
const auto* b_row = reinterpret_cast<const double*>(other_mat_data + k * OtherColumns);
std::size_t j = 0;
for (; j + vector_size <= OtherColumns; j += vector_size)
__m256d cvec0 = _mm256_setzero_pd();
__m256d cvec1 = _mm256_setzero_pd();
__m256d cvec2 = _mm256_setzero_pd();
__m256d cvec3 = _mm256_setzero_pd();
for (std::size_t k = 0; k < Columns; ++k)
{
__m256d cvec = _mm256_loadu_pd(c_row + j);
const __m256d aik_vec = _mm256_set1_pd(this_mat_data[i * Columns + k]);
const auto* b_row = other_mat_data + k * OtherColumns + j;
cvec0 = _mm256_fmadd_pd(_mm256_loadu_pd(b_row), aik_vec, cvec0);
cvec1 = _mm256_fmadd_pd(_mm256_loadu_pd(b_row + vector_size), aik_vec, cvec1);
cvec2 = _mm256_fmadd_pd(_mm256_loadu_pd(b_row + vector_size * 2), aik_vec, cvec2);
cvec3 = _mm256_fmadd_pd(_mm256_loadu_pd(b_row + vector_size * 3), aik_vec, cvec3);
}
_mm256_storeu_pd(c_row + j, cvec0);
_mm256_storeu_pd(c_row + j + vector_size, cvec1);
_mm256_storeu_pd(c_row + j + vector_size * 2, cvec2);
_mm256_storeu_pd(c_row + j + vector_size * 3, cvec3);
}
for (; j + vector_size <= OtherColumns; j += vector_size)
{
__m256d cvec = _mm256_setzero_pd();
for (std::size_t k = 0; k < Columns; ++k)
{
const __m256d aik_vec = _mm256_set1_pd(this_mat_data[i * Columns + k]);
const auto* b_row = other_mat_data + k * OtherColumns;
const __m256d b_vec = _mm256_loadu_pd(b_row + j);
cvec = _mm256_fmadd_pd(b_vec, aik_vec, cvec);
_mm256_storeu_pd(c_row + j, cvec);
}
for (; j < OtherColumns; ++j)
c_row[j] += aik * b_row[j];
_mm256_storeu_pd(c_row + j, cvec);
}
for (; j < OtherColumns; ++j)
for (std::size_t k = 0; k < Columns; ++k)
c_row[j] += this_mat_data[i * Columns + k] * other_mat_data[k * OtherColumns + j];
}
}
else
+1
View File
@@ -6,6 +6,7 @@
#pragma once
// Basic math utilities
#include "omath/hashing.hpp"
#include "omath/trigonometry/angles.hpp"
#include "omath/trigonometry/angle.hpp"
+31 -32
View File
@@ -6,7 +6,9 @@
#include "omath/internal/constexpr_math.hpp"
#include "omath/trigonometry/angles.hpp"
#include <algorithm>
#include <compare>
#include <format>
#include <type_traits>
#include <utility>
namespace omath
@@ -18,7 +20,7 @@ namespace omath
};
template<class Type = float, Type min = Type(0), Type max = Type(360), AngleFlags flags = AngleFlags::Normalized>
requires std::is_arithmetic_v<Type>
requires std::is_floating_point_v<Type>
class Angle
{
Type m_angle;
@@ -43,7 +45,7 @@ namespace omath
{
return Angle{degrees};
}
constexpr Angle() noexcept: m_angle(0)
constexpr Angle() noexcept: Angle(Type{0})
{
}
[[nodiscard]]
@@ -52,6 +54,30 @@ namespace omath
return Angle{angles::radians_to_degrees<Type>(degrees)};
}
[[nodiscard]]
constexpr static Angle from_asin(const Type& value) noexcept
{
return from_radians(internal::asin(value));
}
[[nodiscard]]
constexpr static Angle from_acos(const Type& value) noexcept
{
return from_radians(internal::acos(value));
}
[[nodiscard]]
constexpr static Angle from_atan(const Type& value) noexcept
{
return from_radians(internal::atan(value));
}
[[nodiscard]]
constexpr static Angle from_atan2(const Type& y, const Type& x) noexcept
{
return from_radians(internal::atan2(y, x));
}
[[nodiscard]]
constexpr const Type& operator*() const noexcept
{
@@ -88,12 +114,6 @@ namespace omath
return internal::tan(as_radians());
}
[[nodiscard]]
constexpr Type atan() const noexcept
{
return internal::atan(as_radians());
}
[[nodiscard]]
constexpr Type cot() const noexcept
{
@@ -121,7 +141,8 @@ namespace omath
constexpr Angle& operator-=(const Angle& other) noexcept
{
return operator+=(-other);
*this = Angle{m_angle - other.m_angle};
return *this;
}
[[nodiscard]]
@@ -142,7 +163,7 @@ namespace omath
[[nodiscard]]
constexpr Angle operator-(const Angle& other) const noexcept
{
return operator+(-other);
return Angle{m_angle - other.m_angle};
}
[[nodiscard]]
@@ -172,7 +193,6 @@ struct std::formatter<omath::Angle<T, MinV, MaxV, F>, char> final // NOLINT(*-dc
return std::format_to(ctx.out(), "{}deg", a.as_degrees());
}
};
// wchar_t formatter
template<class T, T MinV, T MaxV, omath::AngleFlags F>
struct std::formatter<omath::Angle<T, MinV, MaxV, F>, wchar_t> final // NOLINT(*-dcl58-cpp)
@@ -193,24 +213,3 @@ struct std::formatter<omath::Angle<T, MinV, MaxV, F>, wchar_t> final // NOLINT(*
return std::format_to(ctx.out(), L"{}deg", a.as_degrees());
}
};
// wchar_t formatter
template<class T, T MinV, T MaxV, omath::AngleFlags F>
struct std::formatter<omath::Angle<T, MinV, MaxV, F>, char8_t> final // NOLINT(*-dcl58-cpp)
{
using AngleT = omath::Angle<T, MinV, MaxV, F>;
[[nodiscard]]
static constexpr auto parse(std::wformat_parse_context& ctx)
{
return ctx.begin();
}
template<class FormatContext>
[[nodiscard]]
auto format(const AngleT& a, FormatContext& ctx) const
{
static_assert(std::is_same_v<typename FormatContext::char_type, char8_t>);
return std::format_to(ctx.out(), u8"{}deg", a.as_degrees());
}
};
+2 -2
View File
@@ -48,10 +48,10 @@ namespace omath::angles
}
template<class Type>
requires std::is_arithmetic_v<Type>
requires std::is_floating_point_v<Type>
[[nodiscard]] constexpr Type wrap_angle(const Type& angle, const Type& min, const Type& max) noexcept
{
if (angle <= max && angle >= min)
if (angle < max && angle >= min)
return angle;
const Type range = max - min;
-3
View File
@@ -54,9 +54,6 @@ namespace omath
return {value, Length - 1};
}
};
template<std::size_t N>
ConstevalPattern(const char (&)[N]) -> ConstevalPattern<N>;
[[nodiscard]]
static std::span<std::byte>::iterator scan_for_pattern(const std::span<std::byte>& range,
const std::string_view& pattern);
-2
View File
@@ -177,9 +177,7 @@ if command -v genhtml >/dev/null 2>&1; then
--title "Omath Coverage Report" \
--show-details \
--legend \
--demangle-cpp \
--num-spaces 4 \
--sort \
--function-coverage \
--branch-coverage
+332 -87
View File
@@ -2,6 +2,7 @@
// Created by orange on 13.03.2026.
//
#include "omath/hud/entity_overlay.hpp"
#include <limits>
namespace omath::hud
{
@@ -20,6 +21,20 @@ namespace omath::hud
return *this;
}
EntityOverlay& EntityOverlay::add_2d_box(const Color& box_color, const Gradient& fill_gradient,
const Color& outline_color, const float thickness)
{
const auto points = m_canvas.as_array();
if (outline_color.value().w > 0.f)
m_renderer->add_polyline({points.data(), points.size()}, outline_color, thickness + 2.f);
m_renderer->add_polyline({points.data(), points.size()}, box_color, thickness);
m_renderer->add_gradient_rectangle(m_canvas.top_left_corner, m_canvas.bottom_right_corner, fill_gradient);
return *this;
}
EntityOverlay& EntityOverlay::add_cornered_2d_box(const Color& box_color, const Color& fill_color,
const Color& outline_color, const float corner_ratio_len,
const float thickness)
@@ -38,11 +53,9 @@ namespace omath::hud
};
// Left Side
draw_corner_line(m_canvas.top_left_corner,
m_canvas.top_left_corner + Vector2<float>{corner_line_length, 0.f});
draw_corner_line(m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2<float>{corner_line_length, 0.f});
draw_corner_line(m_canvas.top_left_corner,
m_canvas.top_left_corner + Vector2<float>{0.f, corner_line_length});
draw_corner_line(m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2<float>{0.f, corner_line_length});
draw_corner_line(m_canvas.bottom_left_corner,
m_canvas.bottom_left_corner - Vector2<float>{0.f, corner_line_length});
@@ -64,76 +77,84 @@ namespace omath::hud
return *this;
}
EntityOverlay& EntityOverlay::add_right_bar(const Color& color, const Color& outline_color, const Color& bg_color,
const float width, float ratio, const float offset)
EntityOverlay& EntityOverlay::add_right_bar(const widget::BarPaint& color, const Color& outline_color,
const Color& bg_color, const float width, float ratio,
const float offset, const std::optional<widget::Glow>& glow)
{
ratio = std::clamp(ratio, 0.f, 1.f);
const auto max_bar_height = std::abs(m_canvas.top_right_corner.y - m_canvas.bottom_right_corner.y);
const auto bar_start = Vector2<float>{m_text_cursor_right.x + offset, m_canvas.bottom_right_corner.y};
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(width, -max_bar_height), bg_color);
const auto bar_min = bar_start - Vector2<float>{0.f, max_bar_height};
const auto bar_max = bar_start + Vector2<float>{width, 0.f};
const auto fill_min = bar_start - Vector2<float>{0.f, max_bar_height * ratio};
m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color);
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(width, -max_bar_height * ratio), color);
m_renderer->add_rectangle(bar_start - Vector2<float>(1.f, 0.f),
bar_start + Vector2<float>(width, -max_bar_height), outline_color);
draw_glow_rectangle(fill_min, bar_max, glow);
draw_filled_rectangle(fill_min, bar_max, resolve_bar_paint(color, ratio, true));
m_renderer->add_rectangle(bar_min, bar_max, outline_color);
m_text_cursor_right.x += offset + width;
return *this;
}
EntityOverlay& EntityOverlay::add_left_bar(const Color& color, const Color& outline_color, const Color& bg_color,
const float width, float ratio, const float offset)
EntityOverlay& EntityOverlay::add_left_bar(const widget::BarPaint& color, const Color& outline_color,
const Color& bg_color, const float width, float ratio,
const float offset, const std::optional<widget::Glow>& glow)
{
ratio = std::clamp(ratio, 0.f, 1.f);
const auto max_bar_height = std::abs(m_canvas.top_left_corner.y - m_canvas.bottom_right_corner.y);
const auto bar_start = Vector2<float>{m_text_cursor_left.x - (offset + width), m_canvas.bottom_left_corner.y};
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(width, -max_bar_height), bg_color);
const auto bar_min = bar_start - Vector2<float>{0.f, max_bar_height};
const auto bar_max = bar_start + Vector2<float>{width, 0.f};
const auto fill_min = bar_start - Vector2<float>{0.f, max_bar_height * ratio};
m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color);
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(width, -max_bar_height * ratio), color);
m_renderer->add_rectangle(bar_start - Vector2<float>(1.f, 0.f),
bar_start + Vector2<float>(width, -max_bar_height), outline_color);
draw_glow_rectangle(fill_min, bar_max, glow);
draw_filled_rectangle(fill_min, bar_max, resolve_bar_paint(color, ratio, true));
m_renderer->add_rectangle(bar_min, bar_max, outline_color);
m_text_cursor_left.x -= offset + width;
return *this;
}
EntityOverlay& EntityOverlay::add_right_label(const Color& color, const float offset,
const widget::Outlined outlined,
const std::string_view& text)
EntityOverlay& EntityOverlay::add_right_label(const widget::Paint& color, const float offset,
const widget::Outlined outlined, const std::string_view& text,
const std::optional<widget::Glow>& glow)
{
if (outlined == widget::Outlined::On)
draw_outlined_text(m_text_cursor_right + Vector2<float>{offset, 0.f}, color, text);
else
m_renderer->add_text(m_text_cursor_right + Vector2<float>{offset, 0.f}, color, text.data());
draw_label(m_text_cursor_right + Vector2<float>{offset, 0.f}, color, outlined, text, glow);
m_text_cursor_right.y += m_renderer->calc_text_size(text.data()).y;
return *this;
}
EntityOverlay& EntityOverlay::add_top_label(const Color& color, const float offset, const widget::Outlined outlined,
const std::string_view text)
EntityOverlay& EntityOverlay::add_top_label(const widget::Paint& color, const float offset,
const widget::Outlined outlined, const std::string_view text,
const std::optional<widget::Glow>& glow)
{
m_text_cursor_top.y -= m_renderer->calc_text_size(text.data()).y;
if (outlined == widget::Outlined::On)
draw_outlined_text(m_text_cursor_top + Vector2<float>{0.f, -offset}, color, text);
else
m_renderer->add_text(m_text_cursor_top + Vector2<float>{0.f, -offset}, color, text.data());
draw_label(m_text_cursor_top + Vector2<float>{0.f, -offset}, color, outlined, text, glow);
return *this;
}
EntityOverlay& EntityOverlay::add_top_bar(const Color& color, const Color& outline_color, const Color& bg_color,
const float height, float ratio, const float offset)
EntityOverlay& EntityOverlay::add_top_bar(const widget::BarPaint& color, const Color& outline_color,
const Color& bg_color, const float height, float ratio,
const float offset, const std::optional<widget::Glow>& glow)
{
ratio = std::clamp(ratio, 0.f, 1.f);
const auto max_bar_width = std::abs(m_canvas.top_left_corner.x - m_canvas.bottom_right_corner.x);
const auto bar_start = Vector2<float>{m_canvas.top_left_corner.x, m_text_cursor_top.y - offset};
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, -height), bg_color);
const auto bar_min = bar_start - Vector2<float>{0.f, height};
const auto bar_max = bar_start + Vector2<float>{max_bar_width, 0.f};
const auto fill_max = Vector2<float>{bar_start.x + max_bar_width * ratio, bar_start.y};
m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color);
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width * ratio, -height), color);
m_renderer->add_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, -height), outline_color);
draw_glow_rectangle(bar_min, fill_max, glow);
draw_filled_rectangle(bar_min, fill_max, resolve_bar_paint(color, ratio, false));
m_renderer->add_rectangle(bar_min, bar_max, outline_color);
m_text_cursor_top.y -= offset + height;
@@ -316,6 +337,14 @@ namespace omath::hud
return *this;
}
EntityOverlay& EntityOverlay::add_skeleton(const std::span<const widget::Bone> bones, const Color& color,
const float thickness)
{
for (const auto& bone : bones)
m_renderer->add_line(bone.start, bone.end, color, thickness);
return *this;
}
void EntityOverlay::draw_dashed_line(const Vector2<float>& from, const Vector2<float>& to, const Color& color,
const float dash_len, const float gap_len, const float thickness) const
{
@@ -366,84 +395,265 @@ namespace omath::hud
return *this;
}
void EntityOverlay::draw_outlined_text(const Vector2<float>& position, const Color& color,
const std::string_view& text)
void EntityOverlay::draw_label(const Vector2<float>& position, const widget::Paint& paint,
const widget::Outlined outlined, const std::string_view& text,
const std::optional<widget::Glow>& glow)
{
static constexpr std::array outline_offsets = {
Vector2<float>{-1, -1}, Vector2<float>{-1, 0}, Vector2<float>{-1, 1}, Vector2<float>{0, -1},
Vector2<float>{0, 1}, Vector2<float>{1, -1}, Vector2<float>{1, 0}, Vector2<float>{1, 1}};
if (glow)
{
const int radius = static_cast<int>(std::ceil(std::max(glow->radius, 0.f)));
for (int layer = radius; layer > 0; --layer)
{
const float alpha = glow->color.value().w * std::max(glow->intensity, 0.f)
* (1.f - static_cast<float>(layer - 1) / static_cast<float>(radius + 1));
const auto value = glow->color.value();
const Color color{value.x, value.y, value.z, alpha / static_cast<float>(radius)};
for (int x = -layer; x <= layer; ++x)
{
m_renderer->add_text(position + Vector2<float>{static_cast<float>(x), static_cast<float>(-layer)},
color, text);
m_renderer->add_text(position + Vector2<float>{static_cast<float>(x), static_cast<float>(layer)},
color, text);
}
for (int y = -layer + 1; y < layer; ++y)
{
m_renderer->add_text(position + Vector2<float>{static_cast<float>(-layer), static_cast<float>(y)},
color, text);
m_renderer->add_text(position + Vector2<float>{static_cast<float>(layer), static_cast<float>(y)},
color, text);
}
}
}
for (const auto& outline_offset : outline_offsets)
m_renderer->add_text(position + outline_offset, Color{0.f, 0.f, 0.f, 1.f}, text.data());
m_renderer->add_text(position, color, text.data());
if (outlined == widget::Outlined::On)
{
static constexpr std::array outline_offsets = {
Vector2<float>{-1, -1}, Vector2<float>{-1, 0}, Vector2<float>{-1, 1}, Vector2<float>{0, -1},
Vector2<float>{0, 1}, Vector2<float>{1, -1}, Vector2<float>{1, 0}, Vector2<float>{1, 1}};
for (const auto& outline_offset : outline_offsets)
m_renderer->add_text(position + outline_offset, Color{0.f, 0.f, 0.f, 1.f}, text);
}
std::visit(
widget::Overloaded{
[&](const Color& color)
{
m_renderer->add_text(position, color, text);
},
[&](const Gradient& gradient)
{
m_renderer->add_gradient_text(position, gradient, text);
},
},
paint);
}
EntityOverlay& EntityOverlay::add_bottom_bar(const Color& color, const Color& outline_color, const Color& bg_color,
const float height, float ratio, const float offset)
void EntityOverlay::draw_glow_polyline(const std::span<const Vector2<float>>& points, const widget::Glow& glow,
const float thickness) const
{
const int radius = static_cast<int>(std::ceil(std::max(glow.radius, 0.f)));
const auto value = glow.color.value();
for (int layer = radius; layer > 0; --layer)
{
const float falloff = 1.f - static_cast<float>(layer - 1) / static_cast<float>(radius + 1);
const Color color{value.x, value.y, value.z,
value.w * std::max(glow.intensity, 0.f) * falloff / static_cast<float>(radius)};
m_renderer->add_polyline(points, color, thickness + static_cast<float>(layer) * 2.f);
}
}
void EntityOverlay::draw_glow_line(const Vector2<float>& from, const Vector2<float>& to, const widget::Glow& glow,
const float thickness) const
{
const int radius = static_cast<int>(std::ceil(std::max(glow.radius, 0.f)));
const auto value = glow.color.value();
for (int layer = radius; layer > 0; --layer)
{
const float falloff = 1.f - static_cast<float>(layer - 1) / static_cast<float>(radius + 1);
const Color color{value.x, value.y, value.z,
value.w * std::max(glow.intensity, 0.f) * falloff / static_cast<float>(radius)};
m_renderer->add_line(from, to, color, thickness + static_cast<float>(layer) * 2.f);
}
}
void EntityOverlay::draw_glow_rectangle(const Vector2<float>& min, const Vector2<float>& max,
const std::optional<widget::Glow>& glow) const
{
if (!glow || glow->radius <= 0.f)
return;
const std::array points = {
Vector2<float>{std::min(min.x, max.x), std::min(min.y, max.y)},
Vector2<float>{std::max(min.x, max.x), std::min(min.y, max.y)},
Vector2<float>{std::max(min.x, max.x), std::max(min.y, max.y)},
Vector2<float>{std::min(min.x, max.x), std::max(min.y, max.y)},
};
draw_glow_polyline(points, *glow, 1.f);
}
void EntityOverlay::draw_canvas_glow(const widget::CanvasGlow& canvas_glow) const
{
const int layers = std::max(canvas_glow.layers, 2);
const auto min = m_canvas.top_left_corner;
const auto max = m_canvas.bottom_right_corner;
const auto value = canvas_glow.glow.color.value();
const float intensity = std::max(canvas_glow.glow.intensity, 0.f);
constexpr int corner_segments = 12;
const float max_rounding = std::min(std::abs(max.x - min.x), std::abs(max.y - min.y)) * 0.5f;
const float rounding = std::clamp(canvas_glow.rounding, 0.f, max_rounding);
const float extent = std::max(canvas_glow.glow.radius, 0.f);
const float stroke = std::max(extent / static_cast<float>(layers - 1) * 2.f, 1.f);
for (int layer = 0; layer < layers; ++layer)
{
const float progress = static_cast<float>(layer) / static_cast<float>(layers - 1);
const float expansion = extent * (1.f - progress);
const float falloff = progress * progress * (3.f - 2.f * progress);
const Color color{value.x, value.y, value.z, value.w * intensity * falloff * 0.35f};
const auto expanded_min = min - Vector2<float>{expansion, expansion};
const auto expanded_max = max + Vector2<float>{expansion, expansion};
const float expanded_rounding = rounding + expansion;
const std::array corner_centers = {
expanded_min + Vector2<float>{expanded_rounding, expanded_rounding},
Vector2<float>{expanded_max.x - expanded_rounding, expanded_min.y + expanded_rounding},
expanded_max - Vector2<float>{expanded_rounding, expanded_rounding},
Vector2<float>{expanded_min.x + expanded_rounding, expanded_max.y - expanded_rounding},
};
std::array<Vector2<float>, corner_segments * 4> points;
for (int corner = 0; corner < 4; ++corner)
{
const float start_angle =
std::numbers::pi_v<float> + static_cast<float>(corner) * std::numbers::pi_v<float> * 0.5f;
for (int segment = 0; segment < corner_segments; ++segment)
{
const float arc_progress = static_cast<float>(segment) / static_cast<float>(corner_segments - 1);
const float angle = start_angle + arc_progress * std::numbers::pi_v<float> * 0.5f;
points[corner * corner_segments + segment] =
corner_centers[corner]
+ Vector2<float>{std::cos(angle) * expanded_rounding, std::sin(angle) * expanded_rounding};
}
}
constexpr float clip_extent = std::numeric_limits<float>::max() * 0.25f;
m_renderer->add_polyline_clipped(points, {-clip_extent, -clip_extent}, {clip_extent, min.y}, color, stroke);
m_renderer->add_polyline_clipped(points, {-clip_extent, max.y}, {clip_extent, clip_extent}, color, stroke);
m_renderer->add_polyline_clipped(points, {-clip_extent, min.y}, {min.x, max.y}, color, stroke);
m_renderer->add_polyline_clipped(points, {max.x, min.y}, {clip_extent, max.y}, color, stroke);
}
}
void EntityOverlay::draw_filled_rectangle(const Vector2<float>& min, const Vector2<float>& max,
const widget::Paint& paint) const
{
const Vector2<float> top_left{std::min(min.x, max.x), std::min(min.y, max.y)};
const Vector2<float> bottom_right{std::max(min.x, max.x), std::max(min.y, max.y)};
std::visit(
widget::Overloaded{
[&](const Color& color)
{
m_renderer->add_filled_rectangle(top_left, bottom_right, color);
},
[&](const Gradient& gradient)
{
m_renderer->add_gradient_rectangle(top_left, bottom_right, gradient);
},
},
paint);
}
widget::Paint EntityOverlay::resolve_bar_paint(const widget::BarPaint& paint, const float ratio,
const bool vertical)
{
return std::visit(
widget::Overloaded{
[](const Color& color) -> widget::Paint
{
return color;
},
[](const Gradient& gradient) -> widget::Paint
{
return gradient;
},
[&](const widget::BarGradient& gradient) -> widget::Paint
{
const float value = std::clamp(ratio, 0.f, 1.f);
const auto current = Color{gradient.empty_color.value() * (1.f - value)
+ gradient.full_color.value() * value};
if (vertical)
return Gradient{current, current, gradient.empty_color, gradient.empty_color};
return Gradient{gradient.empty_color, current, current, gradient.empty_color};
},
},
paint);
}
EntityOverlay& EntityOverlay::add_bottom_bar(const widget::BarPaint& color, const Color& outline_color,
const Color& bg_color, const float height, float ratio,
const float offset, const std::optional<widget::Glow>& glow)
{
ratio = std::clamp(ratio, 0.f, 1.f);
const auto max_bar_width = std::abs(m_canvas.bottom_right_corner.x - m_canvas.bottom_left_corner.x);
const auto bar_start = Vector2<float>{m_canvas.bottom_left_corner.x, m_text_cursor_bottom.y + offset};
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, height), bg_color);
m_renderer->add_filled_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width * ratio, height), color);
m_renderer->add_rectangle(bar_start, bar_start + Vector2<float>(max_bar_width, height), outline_color);
const auto bar_min = bar_start;
const auto bar_max = bar_start + Vector2<float>{max_bar_width, height};
const auto fill_max = bar_start + Vector2<float>{max_bar_width * ratio, height};
m_renderer->add_filled_rectangle(bar_min, bar_max, bg_color);
draw_glow_rectangle(bar_min, fill_max, glow);
draw_filled_rectangle(bar_min, fill_max, resolve_bar_paint(color, ratio, false));
m_renderer->add_rectangle(bar_min, bar_max, outline_color);
m_text_cursor_bottom.y += offset + height;
return *this;
}
EntityOverlay& EntityOverlay::add_bottom_label(const Color& color, const float offset, const widget::Outlined outlined,
const std::string_view text)
EntityOverlay& EntityOverlay::add_bottom_label(const widget::Paint& color, const float offset,
const widget::Outlined outlined, const std::string_view text,
const std::optional<widget::Glow>& glow)
{
const auto text_size = m_renderer->calc_text_size(text);
if (outlined == widget::Outlined::On)
draw_outlined_text(m_text_cursor_bottom + Vector2<float>{0.f, offset}, color, text);
else
m_renderer->add_text(m_text_cursor_bottom + Vector2<float>{0.f, offset}, color, text);
draw_label(m_text_cursor_bottom + Vector2<float>{0.f, offset}, color, outlined, text, glow);
m_text_cursor_bottom.y += text_size.y;
return *this;
}
EntityOverlay& EntityOverlay::add_left_label(const Color& color, const float offset, const widget::Outlined outlined,
const std::string_view& text)
EntityOverlay& EntityOverlay::add_left_label(const widget::Paint& color, const float offset,
const widget::Outlined outlined, const std::string_view& text,
const std::optional<widget::Glow>& glow)
{
const auto text_size = m_renderer->calc_text_size(text);
const auto pos = m_text_cursor_left + Vector2<float>{-(offset + text_size.x), 0.f};
if (outlined == widget::Outlined::On)
draw_outlined_text(pos, color, text);
else
m_renderer->add_text(pos, color, text);
draw_label(pos, color, outlined, text, glow);
m_text_cursor_left.y += text_size.y;
return *this;
}
EntityOverlay& EntityOverlay::add_centered_bottom_label(const Color& color, const float offset, const widget::Outlined outlined,
const std::string_view& text)
EntityOverlay& EntityOverlay::add_centered_bottom_label(const widget::Paint& color, const float offset,
const widget::Outlined outlined,
const std::string_view& text,
const std::optional<widget::Glow>& glow)
{
const auto text_size = m_renderer->calc_text_size(text);
const auto box_center_x =
m_canvas.bottom_left_corner.x + (m_canvas.bottom_right_corner.x - m_canvas.bottom_left_corner.x) / 2.f;
const auto pos = Vector2<float>{box_center_x - text_size.x / 2.f, m_text_cursor_bottom.y + offset};
if (outlined == widget::Outlined::On)
draw_outlined_text(pos, color, text);
else
m_renderer->add_text(pos, color, text);
draw_label(pos, color, outlined, text, glow);
m_text_cursor_bottom.y += text_size.y;
return *this;
}
EntityOverlay& EntityOverlay::add_centered_top_label(const Color& color, const float offset, const widget::Outlined outlined,
const std::string_view& text)
EntityOverlay& EntityOverlay::add_centered_top_label(const widget::Paint& color, const float offset,
const widget::Outlined outlined, const std::string_view& text,
const std::optional<widget::Glow>& glow)
{
const auto text_size = m_renderer->calc_text_size(text);
const auto box_center_x =
@@ -452,10 +662,7 @@ namespace omath::hud
m_text_cursor_top.y -= text_size.y;
const auto pos = Vector2<float>{box_center_x - text_size.x / 2.f, m_text_cursor_top.y - offset};
if (outlined == widget::Outlined::On)
draw_outlined_text(pos, color, text);
else
m_renderer->add_text(pos, color, text);
draw_label(pos, color, outlined, text, glow);
return *this;
}
@@ -601,11 +808,43 @@ namespace omath::hud
// ── widget dispatch ───────────────────────────────────────────────────────
void EntityOverlay::dispatch(const widget::Box& box)
{
add_2d_box(box.color, box.fill, box.outline, box.thickness);
if (box.glow)
{
const auto points = m_canvas.as_array();
draw_glow_polyline(points, *box.glow, box.thickness);
}
std::visit(
[&](const auto& fill)
{
add_2d_box(box.color, fill, box.outline, box.thickness);
},
box.fill);
}
void EntityOverlay::dispatch(const widget::CanvasGlow& canvas_glow)
{
draw_canvas_glow(canvas_glow);
}
void EntityOverlay::dispatch(const widget::CorneredBox& cornered_box)
{
if (cornered_box.glow)
{
const float length =
std::abs(m_canvas.top_left_corner.x - m_canvas.top_right_corner.x) * cornered_box.corner_ratio;
const std::array lines = {
std::pair{m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2<float>{length, 0.f}},
std::pair{m_canvas.top_left_corner, m_canvas.top_left_corner + Vector2<float>{0.f, length}},
std::pair{m_canvas.bottom_left_corner, m_canvas.bottom_left_corner - Vector2<float>{0.f, length}},
std::pair{m_canvas.bottom_left_corner, m_canvas.bottom_left_corner + Vector2<float>{length, 0.f}},
std::pair{m_canvas.top_right_corner, m_canvas.top_right_corner - Vector2<float>{length, 0.f}},
std::pair{m_canvas.top_right_corner, m_canvas.top_right_corner + Vector2<float>{0.f, length}},
std::pair{m_canvas.bottom_right_corner, m_canvas.bottom_right_corner - Vector2<float>{0.f, length}},
std::pair{m_canvas.bottom_right_corner, m_canvas.bottom_right_corner - Vector2<float>{length, 0.f}},
};
for (const auto& [from, to] : lines)
draw_glow_line(from, to, *cornered_box.glow, cornered_box.thickness);
}
add_cornered_2d_box(cornered_box.color, cornered_box.fill, cornered_box.outline, cornered_box.corner_ratio,
cornered_box.thickness);
}
@@ -617,7 +856,10 @@ namespace omath::hud
void EntityOverlay::dispatch(const widget::Skeleton& skeleton)
{
add_skeleton(skeleton.color, skeleton.thickness);
if (skeleton.bones.empty())
add_skeleton(skeleton.color, skeleton.thickness);
else
add_skeleton(skeleton.bones, skeleton.color, skeleton.thickness);
}
void EntityOverlay::dispatch(const widget::SnapLine& snap_line)
@@ -704,7 +946,7 @@ namespace omath::hud
},
[this](const widget::Bar& w)
{
add_right_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset);
add_right_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset, w.glow);
},
[this](const widget::DashedBar& w)
{
@@ -713,11 +955,12 @@ namespace omath::hud
},
[this](const widget::Label& w)
{
add_right_label(w.color, w.offset, w.outlined, w.text);
add_right_label(w.color, w.offset, w.outlined, w.text, w.glow);
},
[this](const widget::Centered<widget::Label>& w)
{
add_right_label(w.child.color, w.child.offset, w.child.outlined, w.child.text);
add_right_label(w.child.color, w.child.offset, w.child.outlined, w.child.text,
w.child.glow);
},
[this](const widget::SpaceVertical& w)
{
@@ -750,7 +993,7 @@ namespace omath::hud
},
[this](const widget::Bar& w)
{
add_left_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset);
add_left_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset, w.glow);
},
[this](const widget::DashedBar& w)
{
@@ -759,11 +1002,12 @@ namespace omath::hud
},
[this](const widget::Label& w)
{
add_left_label(w.color, w.offset, w.outlined, w.text);
add_left_label(w.color, w.offset, w.outlined, w.text, w.glow);
},
[this](const widget::Centered<widget::Label>& w)
{
add_left_label(w.child.color, w.child.offset, w.child.outlined, w.child.text);
add_left_label(w.child.color, w.child.offset, w.child.outlined, w.child.text,
w.child.glow);
},
[this](const widget::SpaceVertical& w)
{
@@ -796,7 +1040,7 @@ namespace omath::hud
},
[this](const widget::Bar& w)
{
add_top_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset);
add_top_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset, w.glow);
},
[this](const widget::DashedBar& w)
{
@@ -805,11 +1049,12 @@ namespace omath::hud
},
[this](const widget::Label& w)
{
add_top_label(w.color, w.offset, w.outlined, w.text);
add_top_label(w.color, w.offset, w.outlined, w.text, w.glow);
},
[this](const widget::Centered<widget::Label>& w)
{
add_centered_top_label(w.child.color, w.child.offset, w.child.outlined, w.child.text);
add_centered_top_label(w.child.color, w.child.offset, w.child.outlined, w.child.text,
w.child.glow);
},
[this](const widget::SpaceVertical& w)
{
@@ -841,7 +1086,7 @@ namespace omath::hud
},
[this](const widget::Bar& w)
{
add_bottom_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset);
add_bottom_bar(w.color, w.outline, w.bg, w.size, w.ratio, w.offset, w.glow);
},
[this](const widget::DashedBar& w)
{
@@ -850,12 +1095,12 @@ namespace omath::hud
},
[this](const widget::Label& w)
{
add_bottom_label(w.color, w.offset, w.outlined, w.text);
add_bottom_label(w.color, w.offset, w.outlined, w.text, w.glow);
},
[this](const widget::Centered<widget::Label>& w)
{
add_centered_bottom_label(w.child.color, w.child.offset, w.child.outlined,
w.child.text);
add_centered_bottom_label(w.child.color, w.child.offset, w.child.outlined, w.child.text,
w.child.glow);
},
[this](const widget::SpaceVertical& w)
{
@@ -878,4 +1123,4 @@ namespace omath::hud
child);
}
} // namespace omath::hud
} // namespace omath::hud
@@ -4,7 +4,9 @@
#include "omath/hud/renderer_realizations/imgui_renderer.hpp"
#ifdef OMATH_IMGUI_INTEGRATION
#include <cmath>
#include <imgui.h>
#include <imgui_internal.h>
namespace omath::hud
{
@@ -25,10 +27,21 @@ namespace omath::hud
ImDrawFlags_Closed, thickness);
}
void ImguiHudRenderer::add_polyline_clipped(const std::span<const Vector2<float>>& vertexes,
const Vector2<float>& clip_min, const Vector2<float>& clip_max,
const Color& color, const float thickness)
{
auto* draw_list = ImGui::GetBackgroundDrawList();
draw_list->PushClipRect(clip_min.to_im_vec2(), clip_max.to_im_vec2(), true);
draw_list->AddPolyline(reinterpret_cast<const ImVec2*>(vertexes.data()), static_cast<int>(vertexes.size()),
color.to_im_color(), ImDrawFlags_Closed, thickness);
draw_list->PopClipRect();
}
void ImguiHudRenderer::add_filled_polyline(const std::span<const Vector2<float>>& vertexes, const Color& color)
{
ImGui::GetBackgroundDrawList()->AddConvexPolyFilled(reinterpret_cast<const ImVec2*>(vertexes.data()),
static_cast<int>(vertexes.size()), color.to_im_color());
static_cast<int>(vertexes.size()), color.to_im_color());
}
void ImguiHudRenderer::add_rectangle(const Vector2<float>& min, const Vector2<float>& max, const Color& color)
@@ -42,30 +55,39 @@ namespace omath::hud
ImGui::GetBackgroundDrawList()->AddRectFilled(min.to_im_vec2(), max.to_im_vec2(), color.to_im_color());
}
void ImguiHudRenderer::add_circle(const Vector2<float>& center, const float radius, const Color& color,
const float thickness, const int segments)
void ImguiHudRenderer::add_gradient_rectangle(const Vector2<float>& min, const Vector2<float>& max,
const Gradient& gradient)
{
ImGui::GetBackgroundDrawList()->AddCircle(center.to_im_vec2(), radius, color.to_im_color(), segments, thickness);
ImGui::GetBackgroundDrawList()->AddRectFilledMultiColor(
min.to_im_vec2(), max.to_im_vec2(), gradient.top_left.to_im_color(), gradient.top_right.to_im_color(),
gradient.bottom_right.to_im_color(), gradient.bottom_left.to_im_color());
}
void ImguiHudRenderer::add_circle(const Vector2<float>& center, const float radius, const Color& color,
const float thickness, const int segments)
{
ImGui::GetBackgroundDrawList()->AddCircle(center.to_im_vec2(), radius, color.to_im_color(), segments,
thickness);
}
void ImguiHudRenderer::add_filled_circle(const Vector2<float>& center, const float radius, const Color& color,
const int segments)
const int segments)
{
ImGui::GetBackgroundDrawList()->AddCircleFilled(center.to_im_vec2(), radius, color.to_im_color(), segments);
}
void ImguiHudRenderer::add_arc(const Vector2<float>& center, const float radius, const float a_min, const float a_max,
const Color& color, const float thickness, const int segments)
void ImguiHudRenderer::add_arc(const Vector2<float>& center, const float radius, const float a_min,
const float a_max, const Color& color, const float thickness, const int segments)
{
ImGui::GetBackgroundDrawList()->PathArcTo(center.to_im_vec2(), radius, a_min, a_max, segments);
ImGui::GetBackgroundDrawList()->PathStroke(color.to_im_color(), ImDrawFlags_None, thickness);
}
void ImguiHudRenderer::add_image(const std::any& texture_id, const Vector2<float>& min, const Vector2<float>& max,
const Color& tint)
const Color& tint)
{
ImGui::GetBackgroundDrawList()->AddImage(std::any_cast<ImTextureID>(texture_id), min.to_im_vec2(),
max.to_im_vec2(), {0, 0}, {1, 1}, tint.to_im_color());
max.to_im_vec2(), {0, 0}, {1, 1}, tint.to_im_color());
}
void ImguiHudRenderer::add_text(const Vector2<float>& position, const Color& color, const std::string_view& text)
@@ -73,6 +95,61 @@ namespace omath::hud
ImGui::GetBackgroundDrawList()->AddText(position.to_im_vec2(), color.to_im_color(), text.data(),
text.data() + text.size());
}
void ImguiHudRenderer::add_gradient_text(const Vector2<float>& position, const Gradient& gradient,
const std::string_view& text)
{
auto* draw_list = ImGui::GetBackgroundDrawList();
if (gradient.animated)
{
const float animation_offset = static_cast<float>(ImGui::GetTime()) * gradient.animation_speed;
const float direction = gradient.direction == GradientDirection::RightToLeft ? 1.f : -1.f;
float cursor_x = position.x;
const char* glyph_start = text.data();
const char* const text_end = text.data() + text.size();
int glyph_index = 0;
while (glyph_start < text_end)
{
unsigned int codepoint;
const int glyph_size = ImTextCharFromUtf8(&codepoint, glyph_start, text_end);
if (glyph_size <= 0)
break;
static_cast<void>(codepoint);
const char* const glyph_end = glyph_start + glyph_size;
const float blend =
(std::sin(animation_offset + direction * static_cast<float>(glyph_index)
* gradient.animation_spread)
+ 1.f)
* 0.5f;
const auto color = gradient.top_left.value() * (1.f - blend) + gradient.top_right.value() * blend;
draw_list->AddText({cursor_x, position.y}, Color{color}.to_im_color(), glyph_start, glyph_end);
cursor_x += ImGui::CalcTextSize(glyph_start, glyph_end).x;
glyph_start = glyph_end;
++glyph_index;
}
return;
}
const int vertex_start = draw_list->VtxBuffer.Size;
draw_list->AddText(position.to_im_vec2(), IM_COL32_WHITE, text.data(), text.data() + text.size());
const auto size = calc_text_size(text);
const float width = std::max(size.x, 1.f);
const float height = std::max(size.y, 1.f);
for (int i = vertex_start; i < draw_list->VtxBuffer.Size; ++i)
{
auto& vertex = draw_list->VtxBuffer[i];
const float x = std::clamp((vertex.pos.x - position.x) / width, 0.f, 1.f);
const float y = std::clamp((vertex.pos.y - position.y) / height, 0.f, 1.f);
const auto top = gradient.top_left.value() * (1.f - x) + gradient.top_right.value() * x;
const auto bottom = gradient.bottom_left.value() * (1.f - x) + gradient.bottom_right.value() * x;
const auto color = top * (1.f - y) + bottom * y;
const auto alpha = static_cast<int>(((vertex.col >> IM_COL32_A_SHIFT) & 0xff) * color.w);
vertex.col = IM_COL32(static_cast<int>(color.x * 255.f), static_cast<int>(color.y * 255.f),
static_cast<int>(color.z * 255.f), alpha);
}
}
[[nodiscard]]
Vector2<float> ImguiHudRenderer::calc_text_size(const std::string_view& text)
{
+13
View File
@@ -0,0 +1,13 @@
#ifdef OMATH_ENABLE_LUA
#include "lua_engines_detail.hpp"
#include <omath/engines/cry_engine/camera.hpp>
namespace omath::lua::detail
{
void register_cry_engine(sol::table& omath_table)
{
register_engine<omath::cry_engine::Camera, omath::cry_engine::PitchAngle, omath::cry_engine::ViewAngles>(
omath_table, "cry");
}
} // namespace omath::lua::detail
#endif
+13
View File
@@ -0,0 +1,13 @@
#ifdef OMATH_ENABLE_LUA
#include "lua_engines_detail.hpp"
#include <omath/engines/frostbite_engine/camera.hpp>
namespace omath::lua::detail
{
void register_frostbite_engine(sol::table& omath_table)
{
register_engine<omath::frostbite_engine::Camera, omath::frostbite_engine::PitchAngle,
omath::frostbite_engine::ViewAngles>(omath_table, "frostbite");
}
} // namespace omath::lua::detail
#endif
+13
View File
@@ -0,0 +1,13 @@
#ifdef OMATH_ENABLE_LUA
#include "lua_engines_detail.hpp"
#include <omath/engines/iw_engine/camera.hpp>
namespace omath::lua::detail
{
void register_iw_engine(sol::table& omath_table)
{
register_engine<omath::iw_engine::Camera, omath::iw_engine::PitchAngle, omath::iw_engine::ViewAngles>(
omath_table, "iw");
}
} // namespace omath::lua::detail
#endif
+13
View File
@@ -0,0 +1,13 @@
#ifdef OMATH_ENABLE_LUA
#include "lua_engines_detail.hpp"
#include <omath/engines/opengl_engine/camera.hpp>
namespace omath::lua::detail
{
void register_opengl_engine(sol::table& omath_table)
{
register_engine<omath::opengl_engine::Camera, omath::opengl_engine::PitchAngle,
omath::opengl_engine::ViewAngles>(omath_table, "opengl");
}
} // namespace omath::lua::detail
#endif
+13
View File
@@ -0,0 +1,13 @@
#ifdef OMATH_ENABLE_LUA
#include "lua_engines_detail.hpp"
#include <omath/engines/rage_engine/camera.hpp>
namespace omath::lua::detail
{
void register_rage_engine(sol::table& omath_table)
{
register_engine<omath::rage_engine::Camera, omath::rage_engine::PitchAngle, omath::rage_engine::ViewAngles>(
omath_table, "rage");
}
} // namespace omath::lua::detail
#endif
+13
View File
@@ -0,0 +1,13 @@
#ifdef OMATH_ENABLE_LUA
#include "lua_engines_detail.hpp"
#include <omath/engines/source_engine/camera.hpp>
namespace omath::lua::detail
{
void register_source_engine(sol::table& omath_table)
{
register_engine<omath::source_engine::Camera, omath::source_engine::PitchAngle,
omath::source_engine::ViewAngles>(omath_table, "source");
}
} // namespace omath::lua::detail
#endif
+13
View File
@@ -0,0 +1,13 @@
#ifdef OMATH_ENABLE_LUA
#include "lua_engines_detail.hpp"
#include <omath/engines/unity_engine/camera.hpp>
namespace omath::lua::detail
{
void register_unity_engine(sol::table& omath_table)
{
register_engine<omath::unity_engine::Camera, omath::unity_engine::PitchAngle,
omath::unity_engine::ViewAngles>(omath_table, "unity");
}
} // namespace omath::lua::detail
#endif
+13
View File
@@ -0,0 +1,13 @@
#ifdef OMATH_ENABLE_LUA
#include "lua_engines_detail.hpp"
#include <omath/engines/unreal_engine/camera.hpp>
namespace omath::lua::detail
{
void register_unreal_engine(sol::table& omath_table)
{
register_engine<omath::unreal_engine::Camera, omath::unreal_engine::PitchAngle,
omath::unreal_engine::ViewAngles, double>(omath_table, "unreal");
}
} // namespace omath::lua::detail
#endif
+48 -242
View File
@@ -2,269 +2,75 @@
// Created by orange on 07.03.2026.
//
#ifdef OMATH_ENABLE_LUA
#include "omath/lua/lua.hpp"
#include "omath/omath.hpp"
#include "omath/projection/error_codes.hpp"
#include <omath/engines/cry_engine/camera.hpp>
#include <omath/engines/frostbite_engine/camera.hpp>
#include <omath/engines/iw_engine/camera.hpp>
#include <omath/engines/opengl_engine/camera.hpp>
#include <omath/engines/rage_engine/camera.hpp>
#include <omath/engines/source_engine/camera.hpp>
#include <omath/engines/unity_engine/camera.hpp>
#include <omath/engines/unreal_engine/camera.hpp>
#include <sol/sol.hpp>
#include <string_view>
#include <type_traits>
#include <utility>
namespace
{
// ---- Canonical shared C++ type aliases ----------------------------------
// Each unique template instantiation must be registered exactly once.
using PitchAngle90 = omath::Angle<float, -90.f, 90.f, omath::AngleFlags::Clamped>;
using PitchAngle89 = omath::Angle<float, -89.f, 89.f, omath::AngleFlags::Clamped>;
using SharedYawRoll = omath::Angle<float, -180.f, 180.f, omath::AngleFlags::Normalized>;
using SharedFoV = omath::Angle<float, 0.f, 180.f, omath::AngleFlags::Clamped>;
using ViewAngles90 = omath::ViewAngles<PitchAngle90, SharedYawRoll, SharedYawRoll>;
using ViewAngles89 = omath::ViewAngles<PitchAngle89, SharedYawRoll, SharedYawRoll>;
std::string projection_error_to_string(omath::projection::Error e)
{
switch (e)
{
case omath::projection::Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS:
return "world position is out of screen bounds";
case omath::projection::Error::INV_VIEW_PROJ_MAT_DET_EQ_ZERO:
return "inverse view-projection matrix determinant is zero";
case omath::projection::Error::PERSPECTIVE_DIVIDER_LESS_EQ_ZERO:
return "perspective divider is less or equal to zero";
}
return "unknown error";
}
template<class AngleType>
void register_angle(sol::table& table, const char* name)
{
table.new_usertype<AngleType>(
name, sol::no_constructor, "from_degrees", &AngleType::from_degrees, "from_radians",
&AngleType::from_radians, "as_degrees", &AngleType::as_degrees, "as_radians", &AngleType::as_radians,
"sin", &AngleType::sin, "cos", &AngleType::cos, "tan", &AngleType::tan, "cot", &AngleType::cot,
sol::meta_function::addition, [](const AngleType& a, const AngleType& b)
{ return AngleType::from_degrees(a.as_degrees() + b.as_degrees()); }, sol::meta_function::subtraction,
[](const AngleType& a, const AngleType& b)
{ return AngleType::from_degrees(a.as_degrees() - b.as_degrees()); }, sol::meta_function::unary_minus,
[](const AngleType& a) { return AngleType::from_degrees(-a.as_degrees()); },
sol::meta_function::equal_to, [](const AngleType& a, const AngleType& b) { return a == b; },
sol::meta_function::to_string, [](const AngleType& a) { return std::format("{}deg", a.as_degrees()); });
}
// Set aliases in an engine subtable pointing to the already-registered shared types
template<class PitchAngleType, class ViewAnglesType>
void set_engine_aliases(sol::table& engine_table, sol::table& types)
{
if constexpr (std::is_same_v<PitchAngleType, PitchAngle90>)
engine_table["PitchAngle"] = types["PitchAngle90"];
else
engine_table["PitchAngle"] = types["PitchAngle89"];
engine_table["YawAngle"] = types["YawRoll"];
engine_table["RollAngle"] = types["YawRoll"];
engine_table["FieldOfView"] = types["FieldOfView"];
engine_table["ViewPort"] = types["ViewPort"];
if constexpr (std::is_same_v<ViewAnglesType, ViewAngles90>)
engine_table["ViewAngles"] = types["ViewAngles90"];
else
engine_table["ViewAngles"] = types["ViewAngles89"];
}
// Register an engine: alias shared types, register unique Camera
template<class EngineTraits, class ArithmeticType = float>
requires std::is_arithmetic_v<ArithmeticType>
void register_engine(sol::table& omath_table, const char* subtable_name)
{
using PitchAngle = typename EngineTraits::PitchAngle;
using ViewAngles = typename EngineTraits::ViewAngles;
using Camera = typename EngineTraits::Camera;
using Mat4X4 = std::remove_cvref_t<decltype(std::declval<const Camera&>().get_view_matrix())>;
auto engine_table = omath_table[subtable_name].get_or_create<sol::table>();
auto types = omath_table["_types"].get<sol::table>();
set_engine_aliases<PitchAngle, ViewAngles>(engine_table, types);
auto camera_type = engine_table.new_usertype<Camera>(
"Camera",
sol::constructors<Camera(const omath::Vector3<ArithmeticType>&, const ViewAngles&,
const omath::projection::ViewPort&, const omath::projection::FieldOfView&,
ArithmeticType, ArithmeticType)>());
camera_type["look_at"] = &Camera::look_at;
camera_type["get_forward"] = &Camera::get_forward;
camera_type["get_right"] = &Camera::get_right;
camera_type["get_up"] = &Camera::get_up;
camera_type["get_origin"] = &Camera::get_origin;
camera_type["get_view_angles"] = &Camera::get_view_angles;
camera_type["get_near_plane"] = &Camera::get_near_plane;
camera_type["get_far_plane"] = &Camera::get_far_plane;
camera_type["get_field_of_view"] = &Camera::get_field_of_view;
camera_type["set_origin"] = &Camera::set_origin;
camera_type["set_view_angles"] = &Camera::set_view_angles;
camera_type["set_view_port"] = &Camera::set_view_port;
camera_type["set_field_of_view"] = &Camera::set_field_of_view;
camera_type["set_near_plane"] = &Camera::set_near_plane;
camera_type["set_far_plane"] = &Camera::set_far_plane;
camera_type["get_view_matrix"] = [](const Camera& cam) -> Mat4X4
{
return cam.get_view_matrix();
};
camera_type["get_projection_matrix"] = [](const Camera& cam) -> Mat4X4
{
return cam.get_projection_matrix();
};
camera_type["get_view_projection_matrix"] = [](const Camera& cam) -> Mat4X4
{
return cam.get_view_projection_matrix();
};
camera_type["extract_projection_params"] = [](const Mat4X4& projection_matrix)
{
const auto params = Camera::extract_projection_params(projection_matrix);
return std::make_tuple(params.fov, params.aspect_ratio);
};
camera_type["calc_view_angles_from_view_matrix"] = &Camera::calc_view_angles_from_view_matrix;
camera_type["calc_origin_from_view_matrix"] = &Camera::calc_origin_from_view_matrix;
camera_type["world_to_screen"] = [](const Camera& cam, const omath::Vector3<ArithmeticType>& pos)
-> std::tuple<sol::optional<omath::Vector3<ArithmeticType>>, sol::optional<std::string>>
{
auto result = cam.world_to_screen(pos);
if (result)
return {*result, sol::nullopt};
return {sol::nullopt, projection_error_to_string(result.error())};
};
camera_type["screen_to_world"] = [](const Camera& cam, const omath::Vector3<ArithmeticType>& pos)
-> std::tuple<sol::optional<omath::Vector3<ArithmeticType>>, sol::optional<std::string>>
{
auto result = cam.screen_to_world(pos);
if (result)
return {*result, sol::nullopt};
return {sol::nullopt, projection_error_to_string(result.error())};
};
}
// ---- Engine trait structs -----------------------------------------------
struct OpenGLEngineTraits
{
using PitchAngle = omath::opengl_engine::PitchAngle;
using ViewAngles = omath::opengl_engine::ViewAngles;
using Camera = omath::opengl_engine::Camera;
};
struct FrostbiteEngineTraits
{
using PitchAngle = omath::frostbite_engine::PitchAngle;
using ViewAngles = omath::frostbite_engine::ViewAngles;
using Camera = omath::frostbite_engine::Camera;
};
struct IWEngineTraits
{
using PitchAngle = omath::iw_engine::PitchAngle;
using ViewAngles = omath::iw_engine::ViewAngles;
using Camera = omath::iw_engine::Camera;
};
struct SourceEngineTraits
{
using PitchAngle = omath::source_engine::PitchAngle;
using ViewAngles = omath::source_engine::ViewAngles;
using Camera = omath::source_engine::Camera;
};
struct RageEngineTraits
{
using PitchAngle = omath::rage_engine::PitchAngle;
using ViewAngles = omath::rage_engine::ViewAngles;
using Camera = omath::rage_engine::Camera;
};
struct UnityEngineTraits
{
using PitchAngle = omath::unity_engine::PitchAngle;
using ViewAngles = omath::unity_engine::ViewAngles;
using Camera = omath::unity_engine::Camera;
};
struct UnrealEngineTraits
{
using PitchAngle = omath::unreal_engine::PitchAngle;
using ViewAngles = omath::unreal_engine::ViewAngles;
using Camera = omath::unreal_engine::Camera;
};
struct CryEngineTraits
{
using PitchAngle = omath::cry_engine::PitchAngle;
using ViewAngles = omath::cry_engine::ViewAngles;
using Camera = omath::cry_engine::Camera;
};
} // namespace
#include "lua_engines_detail.hpp"
namespace omath::lua
{
void LuaInterpreter::register_shared_types(sol::table& omath_table)
{
auto t = omath_table["_types"].get_or_create<sol::table>();
auto types = omath_table["_types"].get_or_create<sol::table>();
register_angle<PitchAngle90>(t, "PitchAngle90");
register_angle<PitchAngle89>(t, "PitchAngle89");
register_angle<SharedYawRoll>(t, "YawRoll");
register_angle<SharedFoV>(t, "FieldOfView");
detail::register_angle<detail::PitchAngle90>(types, "PitchAngle90");
detail::register_angle<detail::PitchAngle89>(types, "PitchAngle89");
detail::register_angle<detail::SharedYawRoll>(types, "YawRoll");
detail::register_angle<detail::SharedFoV>(types, "FieldOfView");
t.new_usertype<omath::projection::ViewPort>(
"ViewPort", sol::factories([](float w, float h) { return omath::projection::ViewPort{w, h}; }), "width",
sol::property([](const omath::projection::ViewPort& vp) { return vp.m_width; },
[](omath::projection::ViewPort& vp, float val) { vp.m_width = val; }),
types.new_usertype<projection::ViewPort>(
"ViewPort",
sol::factories([](float width, float height) { return projection::ViewPort{width, height}; }),
"width",
sol::property([](const projection::ViewPort& view_port) { return view_port.m_width; },
[](projection::ViewPort& view_port, float value) { view_port.m_width = value; }),
"height",
sol::property([](const omath::projection::ViewPort& vp) { return vp.m_height; },
[](omath::projection::ViewPort& vp, float val) { vp.m_height = val; }),
"aspect_ratio", &omath::projection::ViewPort::aspect_ratio);
sol::property([](const projection::ViewPort& view_port) { return view_port.m_height; },
[](projection::ViewPort& view_port, float value) { view_port.m_height = value; }),
"aspect_ratio", &projection::ViewPort::aspect_ratio);
t.new_usertype<ViewAngles90>(
types.new_usertype<detail::ViewAngles90>(
"ViewAngles90",
sol::factories([](PitchAngle90 p, SharedYawRoll y, SharedYawRoll r) { return ViewAngles90{p, y, r}; }),
sol::factories([](detail::PitchAngle90 pitch, detail::SharedYawRoll yaw, detail::SharedYawRoll roll)
{ return detail::ViewAngles90{pitch, yaw, roll}; }),
"pitch",
sol::property([](const ViewAngles90& va) { return va.pitch; },
[](ViewAngles90& va, const PitchAngle90& val) { va.pitch = val; }),
sol::property([](const detail::ViewAngles90& view_angles) { return view_angles.pitch; },
[](detail::ViewAngles90& view_angles, const detail::PitchAngle90& value)
{ view_angles.pitch = value; }),
"yaw",
sol::property([](const ViewAngles90& va) { return va.yaw; },
[](ViewAngles90& va, const SharedYawRoll& val) { va.yaw = val; }),
sol::property([](const detail::ViewAngles90& view_angles) { return view_angles.yaw; },
[](detail::ViewAngles90& view_angles, const detail::SharedYawRoll& value)
{ view_angles.yaw = value; }),
"roll",
sol::property([](const ViewAngles90& va) { return va.roll; },
[](ViewAngles90& va, const SharedYawRoll& val) { va.roll = val; }));
sol::property([](const detail::ViewAngles90& view_angles) { return view_angles.roll; },
[](detail::ViewAngles90& view_angles, const detail::SharedYawRoll& value)
{ view_angles.roll = value; }));
t.new_usertype<ViewAngles89>(
types.new_usertype<detail::ViewAngles89>(
"ViewAngles89",
sol::factories([](PitchAngle89 p, SharedYawRoll y, SharedYawRoll r) { return ViewAngles89{p, y, r}; }),
sol::factories([](detail::PitchAngle89 pitch, detail::SharedYawRoll yaw, detail::SharedYawRoll roll)
{ return detail::ViewAngles89{pitch, yaw, roll}; }),
"pitch",
sol::property([](const ViewAngles89& va) { return va.pitch; },
[](ViewAngles89& va, const PitchAngle89& val) { va.pitch = val; }),
sol::property([](const detail::ViewAngles89& view_angles) { return view_angles.pitch; },
[](detail::ViewAngles89& view_angles, const detail::PitchAngle89& value)
{ view_angles.pitch = value; }),
"yaw",
sol::property([](const ViewAngles89& va) { return va.yaw; },
[](ViewAngles89& va, const SharedYawRoll& val) { va.yaw = val; }),
sol::property([](const detail::ViewAngles89& view_angles) { return view_angles.yaw; },
[](detail::ViewAngles89& view_angles, const detail::SharedYawRoll& value)
{ view_angles.yaw = value; }),
"roll",
sol::property([](const ViewAngles89& va) { return va.roll; },
[](ViewAngles89& va, const SharedYawRoll& val) { va.roll = val; }));
sol::property([](const detail::ViewAngles89& view_angles) { return view_angles.roll; },
[](detail::ViewAngles89& view_angles, const detail::SharedYawRoll& value)
{ view_angles.roll = value; }));
}
void LuaInterpreter::register_engines(sol::table& omath_table)
{
register_engine<OpenGLEngineTraits>(omath_table, "opengl");
register_engine<FrostbiteEngineTraits>(omath_table, "frostbite");
register_engine<IWEngineTraits>(omath_table, "iw");
register_engine<SourceEngineTraits>(omath_table, "source");
register_engine<RageEngineTraits>(omath_table, "rage");
register_engine<UnityEngineTraits>(omath_table, "unity");
register_engine<UnrealEngineTraits, double>(omath_table, "unreal");
register_engine<CryEngineTraits>(omath_table, "cry");
detail::register_opengl_engine(omath_table);
detail::register_frostbite_engine(omath_table);
detail::register_iw_engine(omath_table);
detail::register_source_engine(omath_table);
detail::register_rage_engine(omath_table);
detail::register_unity_engine(omath_table);
detail::register_unreal_engine(omath_table);
detail::register_cry_engine(omath_table);
}
} // namespace omath::lua::detail
} // namespace omath::lua
#endif
+142
View File
@@ -0,0 +1,142 @@
#pragma once
#include "omath/lua/lua.hpp"
#include "omath/projection/camera.hpp"
#include "omath/projection/error_codes.hpp"
#include "omath/trigonometry/view_angles.hpp"
#include <sol/sol.hpp>
#include <format>
#include <string>
#include <tuple>
#include <type_traits>
#include <utility>
namespace omath::lua::detail
{
using PitchAngle90 = Angle<float, -90.f, 90.f, AngleFlags::Clamped>;
using PitchAngle89 = Angle<float, -89.f, 89.f, AngleFlags::Clamped>;
using SharedYawRoll = Angle<float, -180.f, 180.f, AngleFlags::Normalized>;
using SharedFoV = Angle<float, 0.f, 180.f, AngleFlags::Clamped>;
using ViewAngles90 = ViewAngles<PitchAngle90, SharedYawRoll, SharedYawRoll>;
using ViewAngles89 = ViewAngles<PitchAngle89, SharedYawRoll, SharedYawRoll>;
inline std::string projection_error_to_string(projection::Error error)
{
switch (error)
{
case projection::Error::WORLD_POSITION_IS_OUT_OF_SCREEN_BOUNDS:
return "world position is out of screen bounds";
case projection::Error::INV_VIEW_PROJ_MAT_DET_EQ_ZERO:
return "inverse view-projection matrix determinant is zero";
case projection::Error::PERSPECTIVE_DIVIDER_LESS_EQ_ZERO:
return "perspective divider is less or equal to zero";
}
return "unknown error";
}
template<class AngleType>
void register_angle(sol::table& table, const char* name)
{
table.new_usertype<AngleType>(
name, sol::no_constructor, "from_degrees", &AngleType::from_degrees, "from_radians",
&AngleType::from_radians, "as_degrees", &AngleType::as_degrees, "as_radians", &AngleType::as_radians,
"sin", &AngleType::sin, "cos", &AngleType::cos, "tan", &AngleType::tan, "cot", &AngleType::cot,
sol::meta_function::addition, [](const AngleType& a, const AngleType& b)
{ return AngleType::from_degrees(a.as_degrees() + b.as_degrees()); }, sol::meta_function::subtraction,
[](const AngleType& a, const AngleType& b)
{ return AngleType::from_degrees(a.as_degrees() - b.as_degrees()); }, sol::meta_function::unary_minus,
[](const AngleType& a) { return AngleType::from_degrees(-a.as_degrees()); },
sol::meta_function::equal_to, [](const AngleType& a, const AngleType& b) { return a == b; },
sol::meta_function::to_string, [](const AngleType& a) { return std::format("{}deg", a.as_degrees()); });
}
template<class PitchAngleType, class ViewAnglesType>
void set_engine_aliases(sol::table& engine_table, sol::table& types)
{
if constexpr (std::is_same_v<PitchAngleType, PitchAngle90>)
engine_table["PitchAngle"] = types["PitchAngle90"];
else
engine_table["PitchAngle"] = types["PitchAngle89"];
engine_table["YawAngle"] = types["YawRoll"];
engine_table["RollAngle"] = types["YawRoll"];
engine_table["FieldOfView"] = types["FieldOfView"];
engine_table["ViewPort"] = types["ViewPort"];
if constexpr (std::is_same_v<ViewAnglesType, ViewAngles90>)
engine_table["ViewAngles"] = types["ViewAngles90"];
else
engine_table["ViewAngles"] = types["ViewAngles89"];
}
template<class Camera, class PitchAngleType, class ViewAnglesType, class ArithmeticType = float>
requires std::is_arithmetic_v<ArithmeticType>
void register_engine(sol::table& omath_table, const char* subtable_name)
{
using Mat4X4 = std::remove_cvref_t<decltype(std::declval<const Camera&>().get_view_matrix())>;
auto engine_table = omath_table[subtable_name].get_or_create<sol::table>();
auto types = omath_table["_types"].get<sol::table>();
set_engine_aliases<PitchAngleType, ViewAnglesType>(engine_table, types);
auto camera_type = engine_table.new_usertype<Camera>(
"Camera",
sol::constructors<Camera(const Vector3<ArithmeticType>&, const ViewAnglesType&,
const projection::ViewPort&, const projection::FieldOfView&, ArithmeticType,
ArithmeticType)>());
camera_type["look_at"] = &Camera::look_at;
camera_type["get_forward"] = &Camera::get_forward;
camera_type["get_right"] = &Camera::get_right;
camera_type["get_up"] = &Camera::get_up;
camera_type["get_origin"] = &Camera::get_origin;
camera_type["get_view_angles"] = &Camera::get_view_angles;
camera_type["get_near_plane"] = &Camera::get_near_plane;
camera_type["get_far_plane"] = &Camera::get_far_plane;
camera_type["get_field_of_view"] = &Camera::get_field_of_view;
camera_type["set_origin"] = &Camera::set_origin;
camera_type["set_view_angles"] = &Camera::set_view_angles;
camera_type["set_view_port"] = &Camera::set_view_port;
camera_type["set_field_of_view"] = &Camera::set_field_of_view;
camera_type["set_near_plane"] = &Camera::set_near_plane;
camera_type["set_far_plane"] = &Camera::set_far_plane;
camera_type["get_view_matrix"] = [](const Camera& camera) -> Mat4X4 { return camera.get_view_matrix(); };
camera_type["get_projection_matrix"] = [](const Camera& camera) -> Mat4X4
{ return camera.get_projection_matrix(); };
camera_type["get_view_projection_matrix"] = [](const Camera& camera) -> Mat4X4
{ return camera.get_view_projection_matrix(); };
camera_type["extract_projection_params"] = [](const Mat4X4& projection_matrix)
{
const auto params = Camera::extract_projection_params(projection_matrix);
return std::make_tuple(params.fov, params.aspect_ratio);
};
camera_type["calc_view_angles_from_view_matrix"] = &Camera::calc_view_angles_from_view_matrix;
camera_type["calc_origin_from_view_matrix"] = &Camera::calc_origin_from_view_matrix;
camera_type["world_to_screen"] = [](const Camera& camera, const Vector3<ArithmeticType>& position)
-> std::tuple<sol::optional<Vector3<ArithmeticType>>, sol::optional<std::string>>
{
auto result = camera.world_to_screen(position);
if (result)
return {*result, sol::nullopt};
return {sol::nullopt, projection_error_to_string(result.error())};
};
camera_type["screen_to_world"] = [](const Camera& camera, const Vector3<ArithmeticType>& position)
-> std::tuple<sol::optional<Vector3<ArithmeticType>>, sol::optional<std::string>>
{
auto result = camera.screen_to_world(position);
if (result)
return {*result, sol::nullopt};
return {sol::nullopt, projection_error_to_string(result.error())};
};
}
void register_opengl_engine(sol::table& omath_table);
void register_frostbite_engine(sol::table& omath_table);
void register_iw_engine(sol::table& omath_table);
void register_source_engine(sol::table& omath_table);
void register_rage_engine(sol::table& omath_table);
void register_unity_engine(sol::table& omath_table);
void register_unreal_engine(sol::table& omath_table);
void register_cry_engine(sol::table& omath_table);
} // namespace omath::lua::detail
+38 -13
View File
@@ -14,9 +14,14 @@ namespace
// Handy aliases (defaults: Type=float, [0,360], Normalized)
using Deg = Angle<float, static_cast<float>(0), static_cast<float>(360), AngleFlags::Normalized>;
using Fov = Angle<float, static_cast<float>(0), static_cast<float>(180), AngleFlags::Clamped>;
using Offset = Angle<float, static_cast<float>(10), static_cast<float>(20), AngleFlags::Clamped>;
using Pitch = Angle<float, static_cast<float>(-90), static_cast<float>(90), AngleFlags::Clamped>;
using Turn = Angle<float, static_cast<float>(-180), static_cast<float>(180), AngleFlags::Normalized>;
template<class Type>
concept SupportedAngleType = requires { typename Angle<Type>; };
constexpr float k_eps = 1e-5f;
constexpr bool close_to(const float actual, const float expected, const float epsilon)
@@ -36,6 +41,12 @@ TEST(UnitTestAngle, DefaultConstructor_IsZeroDegrees)
EXPECT_FLOAT_EQ(a.as_degrees(), 0.0f);
}
TEST(UnitTestAngle, DefaultConstructor_AppliesRangePolicy)
{
constexpr Offset a;
EXPECT_FLOAT_EQ(a.as_degrees(), 10.0f);
}
TEST(UnitTestAngle, FromDegrees_Normalized_WrapsAboveMax)
{
const Deg a = Deg::from_degrees(370.0f);
@@ -66,6 +77,14 @@ TEST(UnitTestAngle, FromRadians_And_AsRadians)
EXPECT_NEAR(b.as_radians(), std::numbers::pi_v<float>, 1e-6f);
}
TEST(UnitTestAngle, FromInverseTrigonometricFunctions)
{
EXPECT_NEAR(Pitch::from_asin(0.5f).as_degrees(), 30.0f, k_eps);
EXPECT_NEAR(Pitch::from_acos(0.5f).as_degrees(), 60.0f, k_eps);
EXPECT_NEAR(Pitch::from_atan(1.0f).as_degrees(), 45.0f, k_eps);
EXPECT_NEAR(Turn::from_atan2(-1.0f, -1.0f).as_degrees(), -135.0f, k_eps);
}
// ---------- Unary minus & deref ----------
TEST(UnitTestAngle, UnaryMinus_Normalized)
@@ -101,17 +120,6 @@ TEST(UnitTestAngle, SinCosTanCot_BasicCases)
EXPECT_NEAR(a90.cos(), 0.0f, 1e-4f);
}
TEST(UnitTestAngle, Atan_IsAtanOfRadians)
{
// atan(as_radians). For 0° -> atan(0)=0.
const Deg a0 = Deg::from_degrees(0.0f);
EXPECT_NEAR(a0.atan(), 0.0f, k_eps);
const Deg a45 = Deg::from_degrees(45.0f);
// atan(pi/4) ≈ 0.665773...
EXPECT_NEAR(a45.atan(), 0.66577375f, 1e-6f);
}
// ---------- Compound arithmetic ----------
TEST(UnitTestAngle, PlusEquals_Normalized_Wraps)
@@ -142,6 +150,16 @@ TEST(UnitTestAngle, MinusEquals_Clamped_Clamps)
EXPECT_FLOAT_EQ(p.as_degrees(), -90.0f);
}
TEST(UnitTestAngle, Subtraction_ClampedNonSymmetricRange)
{
Fov compound = Fov::from_degrees(90.0f);
compound -= Fov::from_degrees(10.0f);
EXPECT_FLOAT_EQ(compound.as_degrees(), 80.0f);
const Fov binary = Fov::from_degrees(90.0f) - Fov::from_degrees(10.0f);
EXPECT_FLOAT_EQ(binary.as_degrees(), 80.0f);
}
// ---------- Alternative ranges ----------
TEST(UnitTestAngle, NormalizedRange_Neg180To180)
@@ -205,5 +223,12 @@ static_assert(close_to(Pitch::from_degrees(45.0f).tan(), 1.0f, 1e-4f),
"Tan should be constexpr with embedded constexpr math");
static_assert(close_to(Pitch::from_degrees(45.0f).cot(), 1.0f, 1e-4f),
"Cot should be constexpr with embedded constexpr math");
static_assert(close_to(Pitch::from_degrees(45.0f).atan(), 0.66577375f, 1e-6f),
"Atan should be constexpr with embedded constexpr math");
static_assert(close_to(Pitch::from_asin(0.5f).as_degrees(), 30.0f, k_eps),
"From asin should be constexpr with embedded constexpr math");
static_assert(close_to(Pitch::from_acos(0.5f).as_degrees(), 60.0f, k_eps),
"From acos should be constexpr with embedded constexpr math");
static_assert(close_to(Pitch::from_atan(1.0f).as_degrees(), 45.0f, k_eps),
"From atan should be constexpr with embedded constexpr math");
static_assert(close_to(Turn::from_atan2(-1.0f, -1.0f).as_degrees(), -135.0f, k_eps),
"From atan2 should be constexpr with embedded constexpr math");
static_assert(!SupportedAngleType<int>, "Angle should only accept floating-point types");
+8 -1
View File
@@ -46,4 +46,11 @@ TEST(unit_test_angles, wrap_angle_negative_range)
const float wrapped = omath::angles::wrap_angle(-90.f, 0.f, 360.f);
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);
}
+34
View File
@@ -0,0 +1,34 @@
#include <gtest/gtest.h>
#include <omath/hashing.hpp>
TEST(unit_test_hashing, fnv1a)
{
constexpr auto hash = omath::hashing::fnv1a("hello");
static_assert(hash == 0xA430D84680AABD0BULL);
EXPECT_EQ(hash, 0xA430D84680AABD0BULL);
}
TEST(unit_test_hashing, crc32)
{
constexpr auto crc = omath::hashing::crc32("123456789");
static_assert(crc == 0xCBF43926U);
EXPECT_EQ(crc, 0xCBF43926U);
}
TEST(unit_test_hashing, base64_encode)
{
static_assert(omath::hashing::base64_encode("foo") == "Zm9v");
EXPECT_EQ(omath::hashing::base64_encode("foobar"), "Zm9vYmFy");
}
TEST(unit_test_hashing, base64_decode)
{
static_assert(omath::hashing::base64_decode("Zm9v").has_value());
static_assert(omath::hashing::base64_decode("Zm9v").value() == "foo");
EXPECT_EQ(omath::hashing::base64_decode("Zm9vYmFy").value(), "foobar");
EXPECT_EQ(omath::hashing::base64_decode("Zm9v=").error(), omath::hashing::Base64Error::INVALID_LENGTH);
EXPECT_EQ(omath::hashing::base64_decode("Zm?v").error(), omath::hashing::Base64Error::INVALID_CHARACTER);
EXPECT_EQ(omath::hashing::base64_decode("Zm9=").error(), omath::hashing::Base64Error::INVALID_PADDING);
}
+54
View File
@@ -16,6 +16,21 @@ namespace
const float diff = actual - expected;
return (diff < 0.0f ? -diff : diff) <= epsilon;
}
template<size_t Rows, size_t Columns, size_t OtherColumns, class Type, MatStoreType StoreType>
void expect_multiplication_matches_scalar_reference(const Mat<Rows, Columns, Type, StoreType>& left,
const Mat<Columns, OtherColumns, Type, StoreType>& right)
{
const auto result = left * right;
for (size_t row = 0; row < Rows; ++row)
for (size_t column = 0; column < OtherColumns; ++column)
{
Type expected{};
for (size_t shared_index = 0; shared_index < Columns; ++shared_index)
expected += left.at(row, shared_index) * right.at(shared_index, column);
EXPECT_EQ(result.at(row, column), expected);
}
}
} // namespace
class UnitTestMat : public ::testing::Test
@@ -92,6 +107,45 @@ TEST_F(UnitTestMat, Operator_Multiplication_Matrix)
EXPECT_FLOAT_EQ(m3.at(1, 1), 22.0f);
}
TEST(UnitTestMatStandalone, Operator_Multiplication_RowMajorSimdAndTail)
{
Mat<3, 5, float, MatStoreType::ROW_MAJOR> left;
Mat<5, 33, float, MatStoreType::ROW_MAJOR> right;
for (size_t row = 0; row < left.row_count(); ++row)
for (size_t column = 0; column < left.columns_count(); ++column)
left.at(row, column) = static_cast<float>(row * 3 + column + 1);
for (size_t row = 0; row < right.row_count(); ++row)
for (size_t column = 0; column < right.columns_count(); ++column)
right.at(row, column) = static_cast<float>((row + 1) * (column % 5 + 1));
expect_multiplication_matches_scalar_reference(left, right);
}
TEST(UnitTestMatStandalone, Operator_Multiplication_ColumnMajorSimdAndTail)
{
Mat<17, 5, double, MatStoreType::COLUMN_MAJOR> left;
Mat<5, 3, double, MatStoreType::COLUMN_MAJOR> right;
for (size_t row = 0; row < left.row_count(); ++row)
for (size_t column = 0; column < left.columns_count(); ++column)
left.at(row, column) = static_cast<double>(row * 3 + column + 1);
for (size_t row = 0; row < right.row_count(); ++row)
for (size_t column = 0; column < right.columns_count(); ++column)
right.at(row, column) = static_cast<double>((row + 1) * (column + 1));
expect_multiplication_matches_scalar_reference(left, right);
}
TEST(UnitTestMatStandalone, Operator_Multiplication_IntegerFallsBackFromAvx)
{
constexpr Mat<2, 3, int> left{{1, 2, 3}, {4, 5, 6}};
constexpr Mat<3, 2, int> right{{7, 8}, {9, 10}, {11, 12}};
constexpr auto result = left * right;
static_assert(result.at(0, 0) == 58);
static_assert(result.at(1, 1) == 154);
expect_multiplication_matches_scalar_reference(left, right);
}
TEST_F(UnitTestMat, Operator_Multiplication_Scalar)
{
Mat<2, 2> m3 = m2 * 2.0f;
+1 -1
View File
@@ -1,7 +1,7 @@
{
"default-registry": {
"kind": "git",
"baseline": "b1b19307e2d2ec1eefbdb7ea069de7d4bcd31f01",
"baseline": "0878b5224d4a4968940ee296a2e7fae2d3b62983",
"repository": "https://github.com/microsoft/vcpkg"
},
"registries": [
+18 -4
View File
@@ -21,7 +21,11 @@
"dependencies": [
{
"name": "omath",
"features": ["imgui", "lua", "hooking"]
"features": [
"imgui",
"lua",
"hooking"
]
}
]
},
@@ -50,16 +54,26 @@
"opengl",
{
"name": "omath",
"features": ["hooking"],
"features": [
"hooking"
],
"platform": "windows & !arm & !uwp"
},
{
"name": "imgui",
"features": ["glfw-binding", "opengl3-binding"]
"features": [
"glfw-binding",
"opengl3-binding"
]
},
{
"name": "imgui",
"features": ["dx9-binding", "dx11-binding", "dx12-binding", "win32-binding"],
"features": [
"dx9-binding",
"dx11-binding",
"dx12-binding",
"win32-binding"
],
"platform": "windows & !arm & !uwp"
}
]