X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fpath_walker.cpp;h=0c8ae2599ee8fff40bca5ecbb7773bcfd66e4501;hb=a98f7cee9f6a2593c0e1f3442800f159bad410df;hp=29ee6fcec65d849696cf4e772fb1f4d6a0e226f3;hpb=1c148c20eede15d02659203c417d01a9877103de;p=supertux.git diff --git a/src/object/path_walker.cpp b/src/object/path_walker.cpp index 29ee6fcec..0c8ae2599 100644 --- a/src/object/path_walker.cpp +++ b/src/object/path_walker.cpp @@ -43,7 +43,7 @@ PathWalker::advance(float elapsed_time) assert(elapsed_time >= 0); elapsed_time *= fabsf(walking_speed); - + const Path::Node* current_node = & (path->nodes[current_node_nr]); while(node_time + elapsed_time * node_mult >= 1) { elapsed_time -= (1 - node_time) / node_mult; @@ -62,17 +62,17 @@ PathWalker::advance(float elapsed_time) node_mult = 1 / path->nodes[next_node_nr].time; } } - + const Path::Node* next_node = & (path->nodes[next_node_nr]); node_time += elapsed_time * node_mult; - - Vector new_pos = current_node->position + + + Vector new_pos = current_node->position + (next_node->position - current_node->position) * node_time; - + return new_pos; } -void +void PathWalker::goto_node(int node_no) { if (node_no == stop_at_node_nr) return; @@ -80,14 +80,14 @@ PathWalker::goto_node(int node_no) stop_at_node_nr = node_no; } -void +void PathWalker::start_moving() { running = true; stop_at_node_nr = -1; } -void +void PathWalker::stop_moving() { stop_at_node_nr = next_node_nr;