Browse Source

Recognize and ignore --magnum-* command-line options in utilities.

pull/122/merge
Vladimír Vondruš 11 years ago
parent
commit
cb897a497f
  1. 1
      src/Magnum/Platform/magnum-info.cpp
  2. 1
      src/Magnum/Text/fontconverter.cpp
  3. 1
      src/Magnum/TextureTools/distancefieldconverter.cpp

1
src/Magnum/Platform/magnum-info.cpp

@ -141,6 +141,7 @@ MagnumInfo::MagnumInfo(const Arguments& arguments): Platform::WindowlessApplicat
args.addBooleanOption("all-extensions") args.addBooleanOption("all-extensions")
.setHelp("all-extensions", "show extensions also for fully supported versions") .setHelp("all-extensions", "show extensions also for fully supported versions")
.addBooleanOption("limits") .addBooleanOption("limits")
.addSkippedPrefix("magnum", "engine-specific options")
.setHelp("limits", "display also limits and implementation-defined values") .setHelp("limits", "display also limits and implementation-defined values")
.setHelp("Displays information about Magnum engine and OpenGL capabilities."); .setHelp("Displays information about Magnum engine and OpenGL capabilities.");

1
src/Magnum/Text/fontconverter.cpp

@ -112,6 +112,7 @@ FontConverter::FontConverter(const Arguments& arguments): Platform::WindowlessAp
.addOption("atlas-size", "2048 2048").setHelpKey("atlas-size", "\"X Y\"").setHelp("atlas-size", "glyph atlas size") .addOption("atlas-size", "2048 2048").setHelpKey("atlas-size", "\"X Y\"").setHelp("atlas-size", "glyph atlas size")
.addOption("output-size", "256 256").setHelpKey("output-size", "\"X Y\"").setHelp("output-size", "output atlas size. If set to zero size, distance field computation will not be used.") .addOption("output-size", "256 256").setHelpKey("output-size", "\"X Y\"").setHelp("output-size", "output atlas size. If set to zero size, distance field computation will not be used.")
.addOption("radius", "24").setHelpKey("radius", "N").setHelp("radius", "distance field computation radius") .addOption("radius", "24").setHelpKey("radius", "N").setHelp("radius", "distance field computation radius")
.addSkippedPrefix("magnum", "engine-specific options")
.setHelp("Converts font to raster one of given atlas size.") .setHelp("Converts font to raster one of given atlas size.")
.parse(arguments.argc, arguments.argv); .parse(arguments.argc, arguments.argv);

1
src/Magnum/TextureTools/distancefieldconverter.cpp

@ -108,6 +108,7 @@ DistanceFieldConverter::DistanceFieldConverter(const Arguments& arguments): Plat
.addOption("plugin-dir", MAGNUM_PLUGINS_DIR).setHelpKey("plugin-dir", "DIR").setHelp("plugin-dir", "base plugin dir") .addOption("plugin-dir", MAGNUM_PLUGINS_DIR).setHelpKey("plugin-dir", "DIR").setHelp("plugin-dir", "base plugin dir")
.addNamedArgument("output-size").setHelpKey("output-size", "\"X Y\"").setHelp("output-size", "size of output image") .addNamedArgument("output-size").setHelpKey("output-size", "\"X Y\"").setHelp("output-size", "size of output image")
.addNamedArgument("radius").setHelpKey("radius", "N").setHelp("radius", "distance field computation radius") .addNamedArgument("radius").setHelpKey("radius", "N").setHelp("radius", "distance field computation radius")
.addSkippedPrefix("magnum", "engine-specific options")
.setHelp("Converts red channel of an image to distance field representation.") .setHelp("Converts red channel of an image to distance field representation.")
.parse(arguments.argc, arguments.argv); .parse(arguments.argc, arguments.argv);

Loading…
Cancel
Save