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

Move lerp to td init, add variable gap size

Browse Source
This commit is contained in:
Gent
2020-09-17 05:04:00 -04:00
parent 6a78a301c9
commit a5ffe26c44
4 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/TableData.cpp
View File

@@ -52,11 +52,7 @@ void TableData::init() {
nlohmann::json pathDataSkyway = pathData["skyway"];
for (nlohmann::json::iterator skywayPath = pathDataSkyway.begin(); skywayPath != pathDataSkyway.end(); skywayPath++) {
std::vector<WarpLocation> points;
nlohmann::json pathPoints = skywayPath.value()["points"];
for (nlohmann::json::iterator point = pathPoints.begin(); point != pathPoints.end(); point++)
points.push_back({point.value()["iX"], point.value()["iY"], point.value()["iZ"] });
TransportManager::SkywayPaths[skywayPath.value()["iRouteID"]] = points;
constructPath(skywayPath);
}
std::cout << "[INFO] Loaded " << TransportManager::SkywayPaths.size() << " skyway paths" << std::endl;
@@ -235,3 +231,29 @@ int TableData::getItemType(int itemSet) {
}
return overriden;
}
void TableData::constructPath(nlohmann::json::iterator pathData) {
// Interpolate
nlohmann::json pathPoints = pathData.value()["points"];
std::queue<WarpLocation> points;
nlohmann::json::iterator point = pathPoints.begin();
WarpLocation last = { point.value()["iX"] , point.value()["iY"] , point.value()["iZ"] }; // start pos
// use some for loop trickery
for (point++; point != pathPoints.end(); point++) {
WarpLocation coords = { point.value()["iX"] , point.value()["iY"] , point.value()["iZ"] };
// avoiding pow here
int distanceBetween = sqrt((last.x - coords.x) * (last.x - coords.x) + (last.y - coords.y) * (last.y - coords.y) + (last.z - coords.z) * (last.z - coords.z));
int lerps = distanceBetween / (int)pathData.value()["iMaxGapSize"]; // integer division to ensure a whole number
for (int i = 0; i < lerps; i++) {
WarpLocation lerp;
float frac = (i + 1) * 1.0f / (lerps + 1);
lerp.x = (last.x * (1.0f - frac)) + (coords.x * frac);
lerp.y = (last.y * (1.0f - frac)) + (coords.y * frac);
lerp.z = (last.z * (1.0f - frac)) + (coords.z * frac);
points.push(lerp); // add lerp'd point to the queue
}
points.push(coords);
last = coords; // update start pos
}
TransportManager::SkywayPaths[pathData.value()["iRouteID"]] = points;
}