Ver código fonte

Took out borders in a couple configurations. Added comments.

khillesl 24 anos atrás
pai
commit
710ec924bd
2 arquivos alterados com 8 adições e 2 exclusões
  1. 6 0
      panda/src/chancfg/chancfg.cxx
  2. 2 2
      panda/src/chancfg/window_db

+ 6 - 0
panda/src/chancfg/chancfg.cxx

@@ -247,6 +247,12 @@ void ChanConfig::chan_eval(GraphicsWindow* win, WindowItem& W, LayoutItem& L,
      dr->set_camera(cam);
      _display_region.push_back(dr);
      SetupFOV fov = (*k).getFOV();
+     // The distinction between ConsoleSize and DisplaySize
+     // is to handle display regions with orientations that
+     // are rotated 90 degrees left or right.  For example,
+     // the model shop cave (LAIR) uses projectors on their
+     // sides, so that what's horizontal on the console is 
+     // vertical in the cave (Display).
      float xConsoleSize = xsize*(v2.right()-v2.left());
      float yConsoleSize = ysize*(v2.top()-v2.bottom());
      float xDisplaySize, yDisplaySize;

+ 2 - 2
panda/src/chancfg/window_db

@@ -55,9 +55,9 @@
                            4 setup-mono-plain 5 setup-mono-plain))
                 (720 640) #t #t))
 (mono-modelcave-pipe0 (layout2x2-vflip-2last ((0 setup-mono-cave 1 setup-mono-cave
-                                   2 setup-mono-cave)) (1280 1440) #t #t))
+                                   2 setup-mono-cave)) (1280 1440) #f #t))
 (mono-modelcave-pipe1 (layout1x2 ((0 setup-mono-cave 1 setup-mono-cave))
-                       (640 960) #t #t))
+                       (640 960) #f #f))
 (mono-cave (layout3x2 ((0 setup-mono-cave 1 setup-mono-cave
                         2 setup-mono-cave 3 setup-mono-cave
                         4 setup-mono-cave 5 setup-mono-cave))