diff --git a/panda/src/display/config_display.cxx b/panda/src/display/config_display.cxx index e8e4912d06..21b3a8547f 100644 --- a/panda/src/display/config_display.cxx +++ b/panda/src/display/config_display.cxx @@ -190,11 +190,12 @@ ConfigVariableBool red_blue_stereo "rendering.")); 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 " "right eye, respectively, for red-blue-stereo mode. This should " "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 ("color-scale-via-lighting", true, diff --git a/panda/src/display/graphicsWindow.cxx b/panda/src/display/graphicsWindow.cxx index b8744e44cb..a34ab1282b 100644 --- a/panda/src/display/graphicsWindow.cxx +++ b/panda/src/display/graphicsWindow.cxx @@ -867,6 +867,15 @@ parse_color_mask(const string &word) { } else if (w == "blue" || w == "b") { 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") { result |= 0x008;