Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow setting initial scale of aircraft in a mission file #511

Merged
merged 1 commit into from
Mar 1, 2021
Merged

allow setting initial scale of aircraft in a mission file #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/source/overview/xml-tags.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,3 +331,5 @@ and match between the two paradigms for a single entity.
- ``controller`` : whether to enable or disable running controller plugins in threads (``default = true``)
- ``motion`` : whether to enable or disable running motion plugins in threads (``default = true``)
- ``sensor`` : whether to enable or disable running sensor plugins in threads (``default = true``)

- ``scale``: the initial scale of the vehicles in the gui (``default = 1.0``)
2 changes: 2 additions & 0 deletions include/scrimmage/viewer/Updater.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ class Updater : public vtkCommand {
const double &z);

void reset_scale();
void set_init_scale(double init_scale) {init_scale_ = init_scale;}

void set_reset_camera();
void set_camera_reset_params(double pos_x, double pos_y, double pos_z,
Expand Down Expand Up @@ -351,6 +352,7 @@ class Updater : public vtkCommand {

bool show_helpmenu_;
double label_scale_ = 0.3;
double init_scale_ = 1.0;
};

} // namespace scrimmage
Expand Down
2 changes: 2 additions & 0 deletions include/scrimmage/viewer/Viewer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ class Viewer {
int local_port_ = 50051;
std::string remote_ip_ = "localhost";
int remote_port_ = 50052;

double init_scale_ = 1.0;
};

} // namespace scrimmage
Expand Down
2 changes: 1 addition & 1 deletion src/viewer/Updater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1527,7 +1527,7 @@ void Updater::inc_follow_offset() {follow_offset_ *= 1.1;}
void Updater::dec_follow_offset() {follow_offset_ /= 1.1;}

void Updater::reset_scale() {
scale_ = 1.0;
scale_ = init_scale_;
scale_required_ = true;
}

Expand Down
3 changes: 3 additions & 0 deletions src/viewer/Viewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ bool Viewer::init(const std::shared_ptr<MissionParse>& mp,
renderWindow_->SetFullScreen(false);
renderWindow_->SetSize(mp->window_width(), mp->window_height());
}
init_scale_ = get<double>("scale", mp->params(), 1.0);

log_dir_ = mp->log_dir();
dt_ = mp->dt();
Expand Down Expand Up @@ -134,6 +135,8 @@ bool Viewer::run() {
updater->set_incoming_interface(incoming_interface_);
updater->set_outgoing_interface(outgoing_interface_);
updater->set_max_update_rate(update_rate);
updater->set_init_scale(init_scale_);
updater->reset_scale();

std::string camera_pos_str =
get<std::string>("pos", camera_params_, "0, 1, 200");
Expand Down