From cbd873fc231c6e067efecd975fa9da4177b73cb5 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 12 May 2006 20:38:18 +0000 Subject: [PATCH] fix red-blue-stereo --- panda/src/display/config_display.cxx | 6 ------ panda/src/display/config_display.h | 1 - panda/src/display/graphicsWindow.cxx | 5 +++++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/panda/src/display/config_display.cxx b/panda/src/display/config_display.cxx index c3e43297be..3bec79eabb 100644 --- a/panda/src/display/config_display.cxx +++ b/panda/src/display/config_display.cxx @@ -176,12 +176,6 @@ ConfigVariableString red_blue_stereo_colors "be a two-word string, where each word is one of 'red', 'blue', " "'green', or 'alpha'.")); -ConfigVariableBool invert_red_blue_stereo -("invert-red-blue-stereo", false, - PRC_DESC("When this is true, the red and blue colors of red-blue stereo mode " - "are inverted from their default convention, so the blue is on the " - "left and red is on the right.")); - ConfigVariableBool depth_offset_decals ("depth-offset-decals", false, PRC_DESC("Set this true to allow decals to be implemented via the advanced " diff --git a/panda/src/display/config_display.h b/panda/src/display/config_display.h index b8ac5e5014..da521b0a3b 100644 --- a/panda/src/display/config_display.h +++ b/panda/src/display/config_display.h @@ -58,7 +58,6 @@ extern EXPCL_PANDA ConfigVariableBool copy_texture_inverted; extern EXPCL_PANDA ConfigVariableBool window_inverted; extern EXPCL_PANDA ConfigVariableBool red_blue_stereo; extern EXPCL_PANDA ConfigVariableString red_blue_stereo_colors; -extern EXPCL_PANDA ConfigVariableBool invert_red_blue_stereo; extern EXPCL_PANDA ConfigVariableBool depth_offset_decals; extern EXPCL_PANDA ConfigVariableBool auto_generate_mipmaps; extern EXPCL_PANDA ConfigVariableBool color_scale_via_lighting; diff --git a/panda/src/display/graphicsWindow.cxx b/panda/src/display/graphicsWindow.cxx index caa0318e98..40fd055661 100644 --- a/panda/src/display/graphicsWindow.cxx +++ b/panda/src/display/graphicsWindow.cxx @@ -54,6 +54,11 @@ GraphicsWindow(GraphicsPipe *pipe, << "Creating new window " << get_name() << "\n"; } + _red_blue_stereo = red_blue_stereo && !properties.is_stereo(); + if (_red_blue_stereo) { + _left_eye_color_mask = parse_color_mask(red_blue_stereo_colors.get_word(0)); _right_eye_color_mask = parse_color_mask(red_blue_stereo_colors.get_word(1)); + } + _properties.set_open(false); _properties.set_undecorated(false); _properties.set_fullscreen(false);