OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-12-17 10:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add NPC chunk management + Generalize lerp

Browse Source
This commit is contained in:
Gent
2020-09-23 10:53:06 -04:00
parent 65bd2d120b
commit f2596bfb6a
7 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/TransportManager.cpp
View File

@@ -4,6 +4,7 @@
#include "TransportManager.hpp"
#include <unordered_map>
#include <cmath>
std::map<int32_t, TransportRoute> TransportManager::Routes;
std::map<int32_t, TransportLocation> TransportManager::Locations;
@@ -26,6 +27,7 @@ void TransportManager::init() {
busPoints.push(start);
TransportManager::lerp(&busPoints, start, end, 1000);
busPoints.push(end);
TransportManager::lerp(&busPoints, end, start, 1000);
NPCQueues[bus->appearanceData.iNPC_ID] = busPoints;
}
@@ -271,10 +273,9 @@ void TransportManager::stepNPCPathing() {
int distanceBetween = hypot(dXY, point.z - npc->appearanceData.iZ); // total distance
// update NPC location to update viewables
npc->appearanceData.iX = point.x;
npc->appearanceData.iY = point.y;
npc->appearanceData.iZ = point.z;
NPCManager::updateNPCPosition(npc->appearanceData.iNPC_ID, point.x, point.y, point.z);
// get chunks in view
auto chunk = ChunkManager::grabChunk(npc->appearanceData.iX, npc->appearanceData.iY);
auto chunks = ChunkManager::grabChunks(chunk);
@@ -322,7 +323,7 @@ void TransportManager::stepNPCPathing() {
/*
* Linearly interpolate between two points and insert the results into a queue.
*/
static void TransportManager::lerp(std::queue<WarpLocation>* queue, WarpLocation start, WarpLocation end, int gapSize) {
void TransportManager::lerp(std::queue<WarpLocation>* queue, WarpLocation start, WarpLocation end, int gapSize) {
int dXY = hypot(end.x - start.x, end.y - start.y); // XY plane distance
int distanceBetween = hypot(dXY, end.z - start.z); // total distance
int lerps = distanceBetween / gapSize; // integer division to ensure a whole number of in-between points