Explorar o código

fix red-blue-stereo

David Rose %!s(int64=19) %!d(string=hai) anos
pai
achega
cbd873fc23

+ 0 - 6
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 "

+ 0 - 1
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;

+ 5 - 0
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);