#include <assert.h>
#include "path_walker.hpp"
-PathWalker::PathWalker(const Path* path)
- : path(path), current_node_nr(0), next_node_nr(0), stop_at_node_nr(-1), node_time(0),
+PathWalker::PathWalker(const Path* path, bool running)
+ : path(path), running(running), current_node_nr(0), next_node_nr(0), stop_at_node_nr(running?-1:0), node_time(0),
walking_speed(1.0)
{
- last_pos = path->nodes[0].position;
node_mult = 1 / path->nodes[0].time;
next_node_nr = path->nodes.size() > 1 ? 1 : 0;
}
Vector
PathWalker::advance(float elapsed_time)
{
- if (static_cast<int>(current_node_nr) == stop_at_node_nr) return Vector(0,0);
+ if (!running) return path->nodes[current_node_nr].position;
assert(elapsed_time >= 0);
Vector new_pos = current_node->position +
(next_node->position - current_node->position) * node_time;
- Vector result = new_pos - last_pos;
- last_pos = new_pos;
-
- return result;
+ return new_pos;
}
void
PathWalker::goto_node(int node_no)
{
+ if (node_no == stop_at_node_nr) return;
+ running = true;
stop_at_node_nr = node_no;
}
void
PathWalker::start_moving()
{
+ running = true;
stop_at_node_nr = -1;
}
PathWalker::advance_node()
{
current_node_nr = next_node_nr;
+ if (static_cast<int>(current_node_nr) == stop_at_node_nr) running = false;
if(next_node_nr + 1 < path->nodes.size()) {
next_node_nr++;