From ea8ae67d068fc5a1a2229e1ed17c795498024c71 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 9 Mar 2021 00:28:33 +0000 Subject: Push link based movement into Vehicle I think it's fair to make all vehicles uses links and nodes to navigate... even if those links, nodes are private to that vehicle --- game/vehicles/vehicle.cpp | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'game/vehicles/vehicle.cpp') diff --git a/game/vehicles/vehicle.cpp b/game/vehicles/vehicle.cpp index d3cae1d..db61564 100644 --- a/game/vehicles/vehicle.cpp +++ b/game/vehicles/vehicle.cpp @@ -5,6 +5,16 @@ #include "game/objectives/freeroam.h" #include "game/orders.h" #include "game/vehicles/linkHistory.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include Vehicle::Vehicle(const LinkPtr & l, float ld) : linkDist {ld} { @@ -12,3 +22,27 @@ Vehicle::Vehicle(const LinkPtr & l, float ld) : linkDist {ld} orders.create(&orders); currentActivity = orders.current()->createActivity(); } + +void +Vehicle::move(TickDuration dur) +{ + static std::mt19937 gen(std::random_device {}()); + linkDist += dur.count() * speed; + auto curLink {linkHist.getCurrent()}; + while (linkDist > curLink.first->length) { + const auto location = curLink.first->positionAt(curLink.first->length, curLink.second); + auto nexts {curLink.first->nexts[1 - curLink.second]}; + auto last = std::remove_if(nexts.begin(), nexts.end(), [ang = location.rot.y](const Link::Next & n) { + return std::abs(normalize(n.first.lock()->ends[n.second].second - ang)) > 0.1F; + }); + if (last != nexts.begin()) { + auto off = std::uniform_int_distribution<>(0, std::distance(nexts.begin(), last) - 1)(gen); + linkDist -= curLink.first->length; + curLink = linkHist.add(nexts[off].first, nexts[off].second); + } + else { + linkDist = curLink.first->length; + speed = 0; + } + } +} -- cgit v1.2.3