From 61e5bcef2629e2d68b805a956a96fff264d4f74d Mon Sep 17 00:00:00 2001 From: untodesu Date: Sat, 28 Jun 2025 01:59:49 +0500 Subject: Restructure dependencies and update to C++20 - Nuked static_assert from almost everywhere in the project - Nuked binary dependency support. Might add one later though - Separated dependency headers into a separate include subdirectory - Grafted a thirdpartylegalnotices.txt generator from RITEG - Pushed development snapshot version to 2126 (26th week of 2025) --- game/client/interpolation.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'game/client/interpolation.cc') diff --git a/game/client/interpolation.cc b/game/client/interpolation.cc index e820b62..27b6dfd 100644 --- a/game/client/interpolation.cc +++ b/game/client/interpolation.cc @@ -16,9 +16,9 @@ static void transform_interpolate(float alpha) auto group = globals::dimension->entities.group(entt::get); for(auto [entity, interp, current, previous] : group.each()) { - interp.angles[0] = cxpr::lerp(previous.angles[0], current.angles[0], alpha); - interp.angles[1] = cxpr::lerp(previous.angles[1], current.angles[1], alpha); - interp.angles[2] = cxpr::lerp(previous.angles[2], current.angles[2], alpha); + interp.angles[0] = vx::lerp(previous.angles[0], current.angles[0], alpha); + interp.angles[1] = vx::lerp(previous.angles[1], current.angles[1], alpha); + interp.angles[2] = vx::lerp(previous.angles[2], current.angles[2], alpha); // Figure out previous chunk-local floating-point coordinates transformed // to the current WorldCoord's chunk domain coordinates; we're interpolating @@ -30,9 +30,9 @@ static void transform_interpolate(float alpha) interp.chunk.y = current.chunk.y; interp.chunk.z = current.chunk.z; - interp.local.x = cxpr::lerp(previous_local.x, current.local.x, alpha); - interp.local.y = cxpr::lerp(previous_local.y, current.local.y, alpha); - interp.local.z = cxpr::lerp(previous_local.z, current.local.z, alpha); + interp.local.x = vx::lerp(previous_local.x, current.local.x, alpha); + interp.local.y = vx::lerp(previous_local.y, current.local.y, alpha); + interp.local.z = vx::lerp(previous_local.z, current.local.z, alpha); } } @@ -41,13 +41,13 @@ static void head_interpolate(float alpha) auto group = globals::dimension->entities.group(entt::get); for(auto [entity, interp, current, previous] : group.each()) { - interp.angles[0] = cxpr::lerp(previous.angles[0], current.angles[0], alpha); - interp.angles[1] = cxpr::lerp(previous.angles[1], current.angles[1], alpha); - interp.angles[2] = cxpr::lerp(previous.angles[2], current.angles[2], alpha); + interp.angles[0] = vx::lerp(previous.angles[0], current.angles[0], alpha); + interp.angles[1] = vx::lerp(previous.angles[1], current.angles[1], alpha); + interp.angles[2] = vx::lerp(previous.angles[2], current.angles[2], alpha); - interp.offset.x = cxpr::lerp(previous.offset.x, current.offset.x, alpha); - interp.offset.y = cxpr::lerp(previous.offset.y, current.offset.y, alpha); - interp.offset.z = cxpr::lerp(previous.offset.z, current.offset.z, alpha); + interp.offset.x = vx::lerp(previous.offset.x, current.offset.x, alpha); + interp.offset.y = vx::lerp(previous.offset.y, current.offset.y, alpha); + interp.offset.z = vx::lerp(previous.offset.z, current.offset.z, alpha); } } -- cgit