PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #557 from clasher113/main

Browse Source 
rotation interpolation fix
This commit is contained in:
MihailRis 2025-07-19 16:34:38 +03:00 committed by GitHub
commit 30d0ee40af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/util/Interpolation.hpp
View File

@ -3,34 +3,41 @@
#include <limits>
#include <glm/glm.hpp>
const float INTERPOLATION_DURATION = 0.15f; // seconds
namespace util {
template<int N, typename T, bool angular=false>
class VecInterpolation {
bool enabled;
glm::vec<N, T> prevPos {std::numeric_limits<T>::quiet_NaN()};
glm::vec<N, T> nextPos {};
T refreshInterval = 0.0;
mutable glm::vec<N, T> interpolationStep {};
glm::vec<N, T> currentDuration {INTERPOLATION_DURATION};
T timer = 0.0;
T intervalUpdateFactor = 0.1;
public:
VecInterpolation(bool enabled) : enabled(enabled) {}
void refresh(const glm::vec<N, T>& position) {
auto current = getCurrent();
prevPos = current;
prevPos = getCurrent();
nextPos = position;
refreshInterval = timer * intervalUpdateFactor +
refreshInterval * (1.0 - intervalUpdateFactor);
timer = 0.0;
if constexpr (angular) {
for (int i = 0; i < N; i++) {
T diff = nextPos[i] - prevPos[i];
if (glm::abs(diff) > 180.0f) {
nextPos[i] += (diff > 0.0f ? -360.0f : 360.0f);
for (glm::length_t i = 0; i < N; i++) {
const float shortestAngle = std::fmod((std::fmod((nextPos[i] - prevPos[i]), 360.0f) + 540.0f), 360.0f) - 180.0f;
if (std::abs(interpolationStep[i]) > 90.0f) {
currentDuration[i] = INTERPOLATION_DURATION * (1.0f - std::abs(shortestAngle) / 180.0f);
} else {
currentDuration[i] = INTERPOLATION_DURATION;
}
interpolationStep[i] = shortestAngle / currentDuration[i];
if (glm::abs(nextPos[i]) > 180.0f) {
nextPos[i] += (nextPos[i] > 0.0f ? -360.0f : 360.0f);
}
}
} else {
interpolationStep = (nextPos - prevPos) / currentDuration.x;
}
timer = 0.0;
}
void updateTimer(T delta) {
@ -38,15 +45,16 @@ namespace util {
}
glm::vec<N, T> getCurrent() const {
if (refreshInterval < 0.001 || std::isnan(prevPos.x)) {
return nextPos;
glm::vec<N, T> interpolated;
for (glm::length_t i = 0; i < N; i++) {
if (timer >= currentDuration[i] || std::isnan(prevPos[i])) {
interpolated[i] = nextPos[i];
interpolationStep[i] = 0.0f;
} else {
interpolated[i] = prevPos[i] + interpolationStep[i] * timer;
}
}
T t = timer / refreshInterval;
return nextPos * t + prevPos * (1.0f - t);
}
T getRefreshInterval() const {
return refreshInterval;
return interpolated;
}
bool isEnabled() const {