void StraightMovement::update() { Movement::update(); if(!is_suspended()) { uint32_t now = System::now(); bool current_move_y = move_y != 0 && now >= next_move_date_y; bool current_move_x = move_x != 0 && now >= next_move_date_x; while(current_move_x || current_move_y) { // save current coordinates. Rectangle old_xy(get_x(), get_y()); if(current_move_x) { // time to move in x direction. if(current_move_y) { // time to move in y direction. if(next_move_date_x <= next_move_date_y) { // we first move in x direction. update_x(); if(now >= next_move_date_y) { update_y(); } } else { update_y(); // we first move in y direciton. if(now >= next_move_date_x) { update_x(); } } } else { // we only move in x direction. update_x(); } } else { // we only move in y direction. update_y(); } if(get_entity() != NULL && !finished) { // movement is successful old coordinates have changed. bool success = (get_x() != old_xy.get_x() || get_y() != old_xy.get_y() && (move_x != 0 || move_y != 0)); // no movement notify obstacle. if(!success) { notify_obstacle_reached(); set_finished(); } } // check if we continue wit movement. now = System::now(); current_move_x = move_x != 0 && now >= next_move_date_x; current_move_y = move_y != 0 && now >= next_move_date_y; } } }
/** * @brief Updates the position of the object controlled by this movement. * * This function is called repeatedly. */ void StraightMovement::update() { if (!is_suspended()) { uint32_t now = System::now(); bool x_move_now = x_move != 0 && now >= next_move_date_x; bool y_move_now = y_move != 0 && now >= next_move_date_y; while (x_move_now || y_move_now) { // while it's time to move // save the current coordinates Rectangle old_xy(get_x(), get_y()); if (x_move_now) { // it's time to make an x move if (y_move_now) { // but it's also time to make a y move if (next_move_date_x <= next_move_date_y) { // x move first update_x(); if (now >= next_move_date_y) { update_y(); } } else { // y move first update_y(); if (now >= next_move_date_x) { update_x(); } } } else { update_x(); } } else { update_y(); } if (!is_suspended() && get_entity() != NULL && !finished) { // the movement was successful if the entity's coordinates have changed // and the movement was not stopped bool success = (get_x() != old_xy.get_x() || get_y() != old_xy.get_y()) && (x_move != 0 || y_move != 0); if (!success) { notify_obstacle_reached(); } } now = System::now(); if (!finished && max_distance != 0 && Geometry::get_distance(initial_xy.get_x(), initial_xy.get_y(), get_x(), get_y()) >= max_distance) { set_finished(); } else { x_move_now = x_move != 0 && now >= next_move_date_x; y_move_now = y_move != 0 && now >= next_move_date_y; } } } // Do this at last so that Movement::update() knows whether we are finished. Movement::update(); }