Skip to content

Commit b76dc6b

Browse files
committed
you can't call terminate() without an exception...
1 parent 7b55718 commit b76dc6b

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

examples/Visualizer.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,32 @@
1010
#include <CLI/Formatter.hpp>
1111
#include <CLI/Config.hpp>
1212

13+
namespace cdw = candlewick;
1314
using namespace candlewick::multibody;
1415
using std::chrono::steady_clock;
1516

1617
int main(int argc, char **argv) {
1718
CLI::App app{"Visualizer example"};
1819
argv = app.ensure_utf8(argv);
19-
double fps;
20+
std::vector<Uint32> window_dims{1920u, 1080u};
21+
double fps = 50.0;
22+
app.add_option("--dims", window_dims, "Window dimensions.")
23+
->capture_default_str();
2024
app.add_option<double, unsigned int>("--fps", fps, "Framerate")
21-
->default_val(50);
25+
->default_str("50.0");
2226

2327
CLI11_PARSE(app, argc, argv);
2428

29+
if (window_dims.size() != 2) {
30+
cdw::terminate_with_message("Expected only two values for argument --dims");
31+
}
32+
2533
pin::Model model;
2634
pin::GeometryModel geom_model;
2735
robot_descriptions::loadModelsFromToml("ur.toml", "ur5_gripper", model,
2836
&geom_model, NULL);
2937

30-
Visualizer visualizer{{1920, 1280}, model, geom_model};
38+
Visualizer visualizer{{window_dims[0], window_dims[1]}, model, geom_model};
3139
assert(!visualizer.hasExternalData());
3240

3341
Eigen::VectorXd q0 = pin::neutral(model);

src/candlewick/runtime/main.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ int main(int argc, char **argv) {
1818
CLI::App app{"Candlewick visualizer runtime"};
1919
argv = app.ensure_utf8(argv);
2020

21-
std::vector<Uint32> viz_dims{1920u, 1080u};
22-
app.add_option("--dims", viz_dims, "Window dimensions.")
21+
std::vector<Uint32> window_dims{1920u, 1080u};
22+
app.add_option("--dims", window_dims, "Window dimensions.")
2323
->capture_default_str();
2424

2525
CLI11_PARSE(app, argc, argv);
2626

27-
if (viz_dims.size() != 2) {
27+
if (window_dims.size() != 2) {
2828
cdw::terminate_with_message("Expected only two values for argument --dims");
2929
}
3030

@@ -49,8 +49,8 @@ int main(int argc, char **argv) {
4949
geom_model.loadFromString(recv_models[1].to_string());
5050

5151
Visualizer::Config config;
52-
config.width = viz_dims[0];
53-
config.height = viz_dims[1];
52+
config.width = window_dims[0];
53+
config.height = window_dims[1];
5454
Visualizer viz{config, model, geom_model};
5555

5656
Eigen::VectorXd q0 = pin::neutral(model);

0 commit comments

Comments
 (0)