OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Slider path, fixes, tweaks

Browse Source
This commit is contained in:
Gent 2020-10-20 10:40:50 -04:00
parent 10534886b8
commit 49d8ed2e36
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/TableData.cpp
View File

@ -258,19 +258,23 @@ void TableData::loadPaths(int* nextId) {
std::cout << "[INFO] Loaded " << TransportManager::SkywayPaths.size() << " skyway paths" << std::endl; std::cout << "[INFO] Loaded " << TransportManager::SkywayPaths.size() << " skyway paths" << std::endl;
// slider circuit // slider circuit
int sliders = 0; int stops = 0;
int pos = 0;
nlohmann::json pathDataSlider = pathData["slider"]; nlohmann::json pathDataSlider = pathData["slider"];
for (nlohmann::json::iterator _sliderPoint = pathDataSlider.begin(); _sliderPoint != pathDataSlider.end(); _sliderPoint++) { for (nlohmann::json::iterator _sliderPoint = pathDataSlider.begin(); _sliderPoint != pathDataSlider.end(); _sliderPoint++) {
auto sliderPoint = _sliderPoint.value(); auto sliderPoint = _sliderPoint.value();
if (sliderPoint["stop"] && sliders % 2 == 0) { // check if this point in the circuit is a stop if (sliderPoint["stop"]) { // check if this point in the circuit is a stop
if (stops % 2 == 0) { // on;y put a slider down every other stop
// spawn a slider // spawn a slider
BaseNPC* slider = new BaseNPC(sliderPoint["iX"], sliderPoint["iY"], sliderPoint["iZ"], 0, INSTANCE_OVERWORLD, 1, (*nextId)++, NPC_BUS); BaseNPC* slider = new BaseNPC(sliderPoint["iX"], sliderPoint["iY"], sliderPoint["iZ"], 0, INSTANCE_OVERWORLD, 1, (*nextId)++, NPC_BUS);
NPCManager::NPCs[slider->appearanceData.iNPC_ID] = slider; NPCManager::NPCs[slider->appearanceData.iNPC_ID] = slider;
NPCManager::updateNPCPosition(slider->appearanceData.iNPC_ID, slider->appearanceData.iX, slider->appearanceData.iY, slider->appearanceData.iZ); NPCManager::updateNPCPosition(slider->appearanceData.iNPC_ID, slider->appearanceData.iX, slider->appearanceData.iY, slider->appearanceData.iZ);
// set slider path to a rotation of the circuit // set slider path to a rotation of the circuit
constructPathSlider(pathDataSlider, 0, slider->appearanceData.iNPC_ID); constructPathSlider(pathDataSlider, pos, slider->appearanceData.iNPC_ID);
sliders++; }
stops++;
} }
pos++;
} }
// npc paths // npc paths
@ -452,13 +456,14 @@ void TableData::constructPathSlider(nlohmann::json points, int rotations, int sl
for (int i = 0; i < stopTime + 1; i++) // repeat point if it's a stop for (int i = 0; i < stopTime + 1; i++) // repeat point if it's a stop
route.push(from); // add point A to the queue route.push(from); // add point A to the queue
WarpLocation to = { point["iX"] , point["iY"] , point["iZ"] }; // point B coords WarpLocation to = { point["iX"] , point["iY"] , point["iZ"] }; // point B coords
// we may need to change this later; right now, the speed is cut before and after stops (no accel)
float curve = 1; float curve = 1;
if (stopTime > 0) { // point A is a stop if (stopTime > 0) { // point A is a stop
curve = 2.0f; curve = 0.375f;//2.0f;
} else if (point["stop"]) { // point B is a stop } else if (point["stop"]) { // point B is a stop
curve = 0.35f; curve = 0.375f;//0.35f;
} }
TransportManager::lerp(&route, from, to, SLIDER_SPEED, curve); // lerp from A to B (arbitrary speed) TransportManager::lerp(&route, from, to, SLIDER_SPEED * curve, 1); // lerp from A to B (arbitrary speed)
from = to; // update point A from = to; // update point A
stopTime = point["stop"] ? SLIDER_STOP_TICKS : 0; stopTime = point["stop"] ? SLIDER_STOP_TICKS : 0;
} }

2
src/TransportManager.hpp
View File

@ -6,7 +6,7 @@
#include <unordered_map> #include <unordered_map>
const int SLIDER_SPEED = 1200; const int SLIDER_SPEED = 1200;
const int SLIDER_STOP_TICKS = 8; const int SLIDER_STOP_TICKS = 16;
struct WarpLocation; struct WarpLocation;

2
tdata

@ -1 +1 @@
Subproject commit aa4338202eb02d913bdfd8cf6d008795ded0f026 Subproject commit 9b7c9acd10905437376abdc0ea95abefd3bdcdca