| Index: o3d/converter_edge/cross/converter_main.cc
|
| diff --git a/o3d/converter_edge/cross/converter_main.cc b/o3d/converter_edge/cross/converter_main.cc
|
| index ee40311b509afb932328a1b1b99b234f919e5743..eef1decff211e1fdf2238e54e9a1ee63fe05c852 100644
|
| --- a/o3d/converter_edge/cross/converter_main.cc
|
| +++ b/o3d/converter_edge/cross/converter_main.cc
|
| @@ -110,21 +110,21 @@ int CrossMain(int argc, char**argv) {
|
| }
|
|
|
| o3d::converter::Options options;
|
| - options.condition = !command_line->HasSwitch(L"no-condition");
|
| - options.pretty_print = command_line->HasSwitch(L"pretty-print");
|
| - if (command_line->HasSwitch(L"base-path")) {
|
| + options.condition = !command_line->HasSwitch("no-condition");
|
| + options.pretty_print = command_line->HasSwitch("pretty-print");
|
| + if (command_line->HasSwitch("base-path")) {
|
| options.base_path = o3d::WideToFilePath(
|
| - command_line->GetSwitchValue(L"base-path"));
|
| + command_line->GetSwitchValue("base-path"));
|
| }
|
| - if (command_line->HasSwitch(L"asset-paths")) {
|
| + if (command_line->HasSwitch("asset-paths")) {
|
| std::vector<std::wstring> paths;
|
| - SplitString(command_line->GetSwitchValue(L"asset-paths"), ',', &paths);
|
| + SplitString(command_line->GetSwitchValue("asset-paths"), ',', &paths);
|
| for (size_t ii = 0; ii < paths.size(); ++ii) {
|
| options.file_paths.push_back(o3d::WideToFilePath(paths[ii]));
|
| }
|
| }
|
| - if (command_line->HasSwitch(L"up-axis")) {
|
| - wstring up_axis_string = command_line->GetSwitchValue(L"up-axis");
|
| + if (command_line->HasSwitch("up-axis")) {
|
| + wstring up_axis_string = command_line->GetSwitchValue("up-axis");
|
| int x, y, z;
|
| if (swscanf(up_axis_string.c_str(), L"%d,%d,%d", &x, &y, &z) != 3) {
|
| std::cerr << "Invalid --up-axis value. Should be --up-axis=x,y,z\n";
|
| @@ -134,9 +134,9 @@ int CrossMain(int argc, char**argv) {
|
| static_cast<float>(y),
|
| static_cast<float>(z));
|
| }
|
| - if (command_line->HasSwitch(L"sharp-edge-threshold")) {
|
| + if (command_line->HasSwitch("sharp-edge-threshold")) {
|
| wstring soften_edge_string =
|
| - command_line->GetSwitchValue(L"sharp-edge-threshold");
|
| + command_line->GetSwitchValue("sharp-edge-threshold");
|
| float soft_threshold;
|
| if (swscanf(soften_edge_string.c_str(), L"%f", &soft_threshold) != 1) {
|
| std::cerr << "Invalid --sharp-edges-threshold value.\n";
|
| @@ -145,9 +145,9 @@ int CrossMain(int argc, char**argv) {
|
| options.enable_add_sharp_edge = true;
|
| options.sharp_edge_threshold = soft_threshold;
|
| }
|
| - if (command_line->HasSwitch(L"sharp-edge-color")) {
|
| + if (command_line->HasSwitch("sharp-edge-color")) {
|
| wstring edge_color_str =
|
| - command_line->GetSwitchValue(L"sharp-edge-color");
|
| + command_line->GetSwitchValue("sharp-edge-color");
|
| int r, g, b;
|
| if (swscanf(edge_color_str.c_str(), L"%d,%d,%d", &r, &g, &b) != 3) {
|
| std::cerr << "Invalid --sharp-edge-color value. Should be "
|
|
|