use PRC_DESC

panda/src/display/config_display.cxx

@@ -37,14 +37,14 @@ ConfigureFn(config_display) {
 
 ConfigVariableBool view_frustum_cull
 ("view-frustum-cull", true,
- "This is normally true; set it false to disable view-frustum culling "
+ PRC_DESC("This is normally true; set it false to disable view-frustum culling "
- "(primarily useful for debugging).");
+          "(primarily useful for debugging)."));
 
 ConfigVariableBool pstats_unused_states
 ("pstats-unused-states", false,
-"Set this true to show the number of unused states in the pstats "
+ PRC_DESC("Set this true to show the number of unused states in the pstats "
-"graph for TransformState and RenderState counts.  This adds a bit "
+          "graph for TransformState and RenderState counts.  This adds a bit "
-"of per-frame overhead to count these things up.");
+          "of per-frame overhead to count these things up."));
 
 
 // Warning!  The code that uses this is currently experimental and
@@ -54,71 +54,70 @@ ConfigVariableBool pstats_unused_states
 // system!
 ConfigVariableString threading_model
 ("threading-model", "",
- "This is the default threading model to use for new windows.  Use "
+ PRC_DESC("This is the default threading model to use for new windows.  Use "
- "empty string for single-threaded, or something like \"cull/draw\" for "
+          "empty string for single-threaded, or something like \"cull/draw\" for "
- "a 3-stage pipeline.  See GraphicsEngine::set_threading_model(). "
+          "a 3-stage pipeline.  See GraphicsEngine::set_threading_model(). "
- "EXPERIMENTAL and incomplete, do not use this!");
+          "EXPERIMENTAL and incomplete, do not use this!"));
 
 ConfigVariableBool auto_flip
 ("auto-flip", true,
- "This indicates the initial setting of the auto-flip flag.  Set it "
+ PRC_DESC("This indicates the initial setting of the auto-flip flag.  Set it "
- "true (the default) to cause render_frame() to flip all the windows "
+          "true (the default) to cause render_frame() to flip all the windows "
- "before it returns (in single-threaded mode only), or false to wait "
+          "before it returns (in single-threaded mode only), or false to wait "
- "until an explicit call to flip_frame() or the next render_frame().");
+          "until an explicit call to flip_frame() or the next render_frame()."));
 
 ConfigVariableBool yield_timeslice
 ("yield-timeslice", false,
- "Set this true to yield the timeslice at the end of the frame to be "
+ PRC_DESC("Set this true to yield the timeslice at the end of the frame to be "
- "more polite to other applications that are trying to run.");
+          "more polite to other applications that are trying to run."));
 
 ConfigVariableString screenshot_filename
 ("screenshot-filename", "%~p-%a-%b-%d-%H-%M-%S-%Y-%~f.%~e",
- "This specifies the filename pattern to be used to generate "
+ PRC_DESC("This specifies the filename pattern to be used to generate "
- "screenshots captured via save_screenshot_default().  See "
+          "screenshots captured via save_screenshot_default().  See "
- "DisplayRegion::save_screenshot()."
+          "DisplayRegion::save_screenshot()."));
-);
 ConfigVariableString screenshot_extension
 ("screenshot-extension", "jpg",
- "This specifies the default filename extension (and therefore the "
+ PRC_DESC("This specifies the default filename extension (and therefore the "
- "default image type) to be used for saving screenshots.");
+          "default image type) to be used for saving screenshots."));
 
 ConfigVariableBool show_buffers
 ("show-buffers", false,
- "Set this true to cause offscreen GraphicsBuffers to be created as "
+ PRC_DESC("Set this true to cause offscreen GraphicsBuffers to be created as "
- "GraphicsWindows, if possible, so that their contents may be viewed "
+          "GraphicsWindows, if possible, so that their contents may be viewed "
- "interactively.  Handy during development of multipass algorithms.");
+          "interactively.  Handy during development of multipass algorithms."));
 
 ConfigVariableBool prefer_parasite_buffer
 ("prefer-parasite-buffer", true,
- "Set this true to make GraphicsOutput::make_render_texture() try to "
+ PRC_DESC("Set this true to make GraphicsOutput::make_render_texture() try to "
- "create a parasite buffer before it tries to create an offscreen "
+          "create a parasite buffer before it tries to create an offscreen "
- "buffer.  This may be desired if you know your graphics API does not "
+          "buffer.  This may be desired if you know your graphics API does not "
- "support render-directly-to-texture and you want to minimize "
+          "support render-directly-to-texture and you want to minimize "
- "framebuffer memory.");
+          "framebuffer memory."));
 
 ConfigVariableBool prefer_single_buffer
 ("prefer-single-buffer", true,
- "Set this true to make GraphicsOutput::make_render_texture() first "
+ PRC_DESC("Set this true to make GraphicsOutput::make_render_texture() first "
- "try to create a single-buffered offscreen buffer, before falling "
+          "try to create a single-buffered offscreen buffer, before falling "
- "back to a double-buffered one (or whatever kind the source window "
+          "back to a double-buffered one (or whatever kind the source window "
- "has).  This is true by default to reduce waste of framebuffer "
+          "has).  This is true by default to reduce waste of framebuffer "
- "memory, but you may get a performance benefit by setting it to "
+          "memory, but you may get a performance benefit by setting it to "
- "false (since in that case the buffer can share a graphics context "
+          "false (since in that case the buffer can share a graphics context "
- "with the window).");
+          "with the window)."));
 
 
 ConfigVariableBool copy_texture_inverted
 ("copy-texture-inverted", false,
- "Set this true to indicate that the GSG in use will invert textures when "
+ PRC_DESC("Set this true to indicate that the GSG in use will invert textures when "
- "it performs a framebuffer-to-texture copy operation, or false to indicate "
+          "it performs a framebuffer-to-texture copy operation, or false to indicate "
- "that it does the right thing.  If this is not set, the default behavior is "
+          "that it does the right thing.  If this is not set, the default behavior is "
- "determined by the GSG's internal logic.");
+          "determined by the GSG's internal logic."));
 
 ConfigVariableBool window_inverted
 ("window-inverted", false,
- "Set this true to create all windows with the inverted flag set, so that "
+ PRC_DESC("Set this true to create all windows with the inverted flag set, so that "
- "they will render upside-down and backwards.  Normally this is useful only "
+          "they will render upside-down and backwards.  Normally this is useful only "
- "for debugging.");
+          "for debugging."));
 
 
 ////////////////////////////////////////////////////////////////////

panda/src/display/graphicsPipeSelection.cxx

@@ -37,17 +37,17 @@ GraphicsPipeSelection() {
   // case this constructor is running at static init time.
   ConfigVariableString load_display
     ("load-display", "*",
-     "Specify the name of the default graphics display library or "
+     PRC_DESC("Specify the name of the default graphics display library or "
-     "GraphicsPipe to load.  It is the name of a shared library (or * for "
+              "GraphicsPipe to load.  It is the name of a shared library (or * for "
-     "all libraries named in aux-display), optionally followed by the "
+              "all libraries named in aux-display), optionally followed by the "
-     "name of the particular GraphicsPipe class to create.");
+              "name of the particular GraphicsPipe class to create."));
   
   ConfigVariableList aux_display
     ("aux-display",
-     "Names each of the graphics display libraries that are available on "
+     PRC_DESC("Names each of the graphics display libraries that are available on "
-     "a particular platform.  This variable may be repeated several "
+              "a particular platform.  This variable may be repeated several "
-     "times.  These libraries will be tried one at a time if the library "
+              "times.  These libraries will be tried one at a time if the library "
-     "specified by load_display cannot be loaded.");
+              "specified by load_display cannot be loaded."));
 
   _default_display_module = load_display.get_word(0);
   _default_pipe_name = load_display.get_word(1);
@@ -61,7 +61,7 @@ GraphicsPipeSelection() {
   }
 
   // Also get the set of modules named in the various aux-display
-  // Configrc variables.  We'll want to know this when we call
+  // Config variables.  We'll want to know this when we call
   // load_modules() later.
   int num_aux = aux_display.get_num_unique_values();
   for (int i = 0; i < num_aux; i++) {