From f40d09cb8f712e87691af4912f3630d92d692779 Mon Sep 17 00:00:00 2001 From: untodesu Date: Thu, 11 Dec 2025 15:14:26 +0500 Subject: Shuffle stuff around - Use the new and improved hierarchy I figured out when making Prospero chat - Re-add NSIS scripts, again from Prospero - Update most build and utility scripts with their most recent versions --- game/client/entity/interpolation.cc | 64 ------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 game/client/entity/interpolation.cc (limited to 'game/client/entity/interpolation.cc') diff --git a/game/client/entity/interpolation.cc b/game/client/entity/interpolation.cc deleted file mode 100644 index c88fcf2..0000000 --- a/game/client/entity/interpolation.cc +++ /dev/null @@ -1,64 +0,0 @@ -#include "client/pch.hh" - -#include "client/entity/interpolation.hh" - -#include "core/math/constexpr.hh" - -#include "shared/entity/head.hh" -#include "shared/entity/transform.hh" - -#include "shared/world/dimension.hh" - -#include "shared/coord.hh" - -#include "client/globals.hh" - -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] = glm::mix(previous.angles[0], current.angles[0], alpha); - interp.angles[1] = glm::mix(previous.angles[1], current.angles[1], alpha); - interp.angles[2] = glm::mix(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 - // against these instead of using previous.position.local to prevent jittering - auto previous_shift = coord::to_relative(current.chunk, current.local, previous.chunk, previous.local); - auto previous_local = current.local + previous_shift; - - interp.chunk.x = current.chunk.x; - interp.chunk.y = current.chunk.y; - interp.chunk.z = current.chunk.z; - - interp.local.x = glm::mix(previous_local.x, current.local.x, alpha); - interp.local.y = glm::mix(previous_local.y, current.local.y, alpha); - interp.local.z = glm::mix(previous_local.z, current.local.z, alpha); - } -} - -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] = glm::mix(previous.angles[0], current.angles[0], alpha); - interp.angles[1] = glm::mix(previous.angles[1], current.angles[1], alpha); - interp.angles[2] = glm::mix(previous.angles[2], current.angles[2], alpha); - - interp.offset.x = glm::mix(previous.offset.x, current.offset.x, alpha); - interp.offset.y = glm::mix(previous.offset.y, current.offset.y, alpha); - interp.offset.z = glm::mix(previous.offset.z, current.offset.z, alpha); - } -} - -void entity::interpolation::update(void) -{ - if(globals::dimension) { - auto alpha = static_cast(globals::fixed_accumulator) / static_cast(globals::fixed_frametime_us); - transform_interpolate(alpha); - head_interpolate(alpha); - } -} \ No newline at end of file -- cgit