Browse Source

red-cyan is better than red-blue

David Rose 17 years ago
parent
commit
74166de769
2 changed files with 12 additions and 2 deletions
  1. 3 2
      panda/src/display/config_display.cxx
  2. 9 0
      panda/src/display/graphicsWindow.cxx

+ 3 - 2
panda/src/display/config_display.cxx

@@ -190,11 +190,12 @@ ConfigVariableBool red_blue_stereo
 	  "rendering."));
 	  "rendering."));
 
 
 ConfigVariableString red_blue_stereo_colors
 ConfigVariableString red_blue_stereo_colors
-("red-blue-stereo-colors", "red blue",
+("red-blue-stereo-colors", "red cyan",
  PRC_DESC("This defines the color channels that are used for the left and "
  PRC_DESC("This defines the color channels that are used for the left and "
           "right eye, respectively, for red-blue-stereo mode.  This should "
           "right eye, respectively, for red-blue-stereo mode.  This should "
           "be a two-word string, where each word is one of 'red', 'blue', "
           "be a two-word string, where each word is one of 'red', 'blue', "
-          "'green', or 'alpha'."));
+          "'green', 'cyan', 'magenta', 'yellow', or 'alpha', or a union "
+          "of two or more words separated by a vertical pipe (|)."));
 
 
 ConfigVariableBool color_scale_via_lighting
 ConfigVariableBool color_scale_via_lighting
 ("color-scale-via-lighting", true,
 ("color-scale-via-lighting", true,

+ 9 - 0
panda/src/display/graphicsWindow.cxx

@@ -867,6 +867,15 @@ parse_color_mask(const string &word) {
     } else if (w == "blue" || w == "b") {
     } else if (w == "blue" || w == "b") {
       result |= 0x004;
       result |= 0x004;
 
 
+    } else if (w == "yellow" || w == "y") {
+      result |= 0x003;
+
+    } else if (w == "magenta" || w == "m") {
+      result |= 0x005;
+
+    } else if (w == "cyan" || w == "c") {
+      result |= 0x006;
+
     } else if (w == "alpha" || w == "a") {
     } else if (w == "alpha" || w == "a") {
       result |= 0x008;
       result |= 0x008;