From 6a78a301c92d8031fddb73626ff7203f08565cc0 Mon Sep 17 00:00:00 2001 From: Gent Date: Wed, 16 Sep 2020 22:40:20 -0400 Subject: [PATCH] Skyway lerp tuning --- src/TransportManager.cpp | 4 ++-- src/TransportManager.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TransportManager.cpp b/src/TransportManager.cpp index 77efe46..31db81d 100644 --- a/src/TransportManager.cpp +++ b/src/TransportManager.cpp @@ -174,7 +174,7 @@ void TransportManager::transportWarpHandler(CNSocket* sock, CNPacketData* data) int lerps = distanceBetween / (int)LERP_GAP; // integer division to ensure a whole number for (int i = 0; i < lerps; i++) { WarpLocation lerp; - float frac = 1.0f / (lerps + 1); + float frac = (i + 1) * 1.0f / (lerps + 1); lerp.x = (last.x * (1.0f - frac)) + (point->x * frac); lerp.y = (last.y * (1.0f - frac)) + (point->y * frac); lerp.z = (last.z * (1.0f - frac)) + (point->z * frac); @@ -188,7 +188,7 @@ void TransportManager::transportWarpHandler(CNSocket* sock, CNPacketData* data) void TransportManager::tickSkywaySystem(CNServer* serv, time_t currTime) { - std::cout << SkywayQueue.size(); + //std::cout << SkywayQueue.size(); // using an unordered list so we can remove finished players in one iteration std::unordered_map>::iterator it = SkywayQueue.begin(); while (it != SkywayQueue.end()) { diff --git a/src/TransportManager.hpp b/src/TransportManager.hpp index aad44e7..ff30477 100644 --- a/src/TransportManager.hpp +++ b/src/TransportManager.hpp @@ -5,7 +5,7 @@ #include -#define LERP_GAP 5000 +#define LERP_GAP 3000 struct WarpLocation;