Changeset 523

Timestamp:

09/24/10 14:12:50 (20 months ago)

Author:

ddangelo

Message:

-The Monitor setup automatically generates a keyboard device for all subdisplays and caches it for future use. Also uses this instance for the default actions of the viewer (Fullscreen, Position reset, ...)
-The combination "ALT-O" now triggers a run of the osg::optimizer on the root of the scenegraph of the given subdisplay. This can result in big performance benefit for badly balanced scenegraphs.

Location:

trunk/avango-display/python/avango/display

Files:

• _device.py (modified) (3 diffs)
• _display.py (modified) (1 diff)
• setups/Monitor.py (modified) (7 diffs)

trunk/avango-display/python/avango/display/_device.py

@@ -92 +92 @@
     Key8 = avango.SFBool()
     Key9 = avango.SFBool()
+    
+    KeyO = avango.SFBool()
 
     KeyX = avango.SFBool()
@@ -116 +118 @@
         self.__keymap[56] = self.Key8
         self.__keymap[57] = self.Key9
+        
+        self.__keymap[111] = self.KeyO
 
         self.__keymap[120] = self.KeyX
@@ -146 +150 @@
         for k in self.KeysPressed.value:
             pressed_keys.append(k)
-
+            
         #pressed keys
         for key in pressed_keys:

trunk/avango-display/python/avango/display/_display.py

@@ -90 +90 @@
             self.connect_view_field(user_selector.ViewOut)
 
-            self.view_created(camera,view,subdisplay)
+            self.view_created(camera, view, subdisplay)
 
         if self._inspector and len(self._inspector.Children.value) == 0:

trunk/avango-display/python/avango/display/setups/Monitor.py

@@ -36 +36 @@
         self._subdisplay_window = {}
         self._subdisplay_window_events = {}
+        self._subdisplay_keyboard = {}
         self._subdisplay_camera = {}
 
@@ -92 +93 @@
             
             self.view_created(camera,view,subdisplay)
+            
+        #generate and connect keyboard
+        self._subdisplay_keyboard[subdisplay] = avango.display.KeyboardDevice()
+        self._subdisplay_keyboard[subdisplay].connect(self._subdisplay_window_events[subdisplay])
         
         #configure trackball
@@ -100 +105 @@
         trackball.Enable.connect_from(display_view.EnableTrackball)
         toggle_field = avango.utils.make_key_toggle_trigger_alternate(
-                        avango.utils.make_bool2_and(self._subdisplay_window_events[subdisplay].KeyShift,
-                                                    self._subdisplay_window_events[subdisplay].KeyEnter),
+                        avango.utils.make_bool2_and(self._subdisplay_keyboard[subdisplay].KeyShift,
+                                                    self._subdisplay_keyboard[subdisplay].KeyEnter),
                        True)
         trackball.CenterToBoundingSphere.connect_from(toggle_field)
@@ -108 +113 @@
         trackball.SpinningTimeThreshold.value = 0.5
         trackball.Direction.connect_from(self._subdisplay_window[subdisplay].MousePositionNorm)
-        trackball.RotateTrigger.connect_from(self._subdisplay_window_events[subdisplay].MouseButtons_OnlyMiddle)
-        trackball.PanTrigger.connect_from(self._subdisplay_window_events[subdisplay].MouseButtons_LeftAndMiddle)
-        trackball.ZoomTrigger.connect_from(self._subdisplay_window_events[subdisplay].MouseButtons_OnlyRight)
-        trackball.ResetTrigger.connect_from(self._subdisplay_window_events[subdisplay].KeySpace)
+        trackball.RotateTrigger.connect_from(self._subdisplay_keyboard[subdisplay].MouseButtons_OnlyMiddle)
+        trackball.PanTrigger.connect_from(self._subdisplay_keyboard[subdisplay].MouseButtons_LeftAndMiddle)
+        trackball.ZoomTrigger.connect_from(self._subdisplay_keyboard[subdisplay].MouseButtons_OnlyRight)
+        trackball.ResetTrigger.connect_from(self._subdisplay_keyboard[subdisplay].KeySpace)
         
         display_view.Camera.connect_from(trackball.Matrix)
@@ -122 +127 @@
         #show window decoration (Ctrl+Enter)
         toggle_field = avango.utils.make_key_toggle_trigger_alternate(
-                          avango.utils.make_bool2_and(self._subdisplay_window_events[subdisplay].KeyCtrl,
-                                                      self._subdisplay_window_events[subdisplay].KeyEnter),
+                          avango.utils.make_bool2_and(self._subdisplay_keyboard[subdisplay].KeyCtrl,
+                                                      self._subdisplay_keyboard[subdisplay].KeyEnter),
                           True)
         display_view.WindowDecoration.connect_from(toggle_field)
@@ -129 +134 @@
         #toggle fullscreen (Alt+Enter)
         toggle_field = avango.utils.make_key_toggle_trigger( 
-                            avango.utils.make_bool2_and(self._subdisplay_window_events[subdisplay].KeyAlt,
-                                                        self._subdisplay_window_events[subdisplay].KeyEnter) )
+                            avango.utils.make_bool2_and(self._subdisplay_keyboard[subdisplay].KeyAlt,
+                                                        self._subdisplay_keyboard[subdisplay].KeyEnter) )
         display_view.ToggleFullScreen.connect_from(toggle_field)
         self._subdisplay_window[subdisplay].ToggleFullScreen.connect_from(display_view.ToggleFullScreen)
+        
+        node_optimizer = avango.utils.nodes.NodeOptimizer()
+        node_optimizer.Node.connect_from(display_view.Root)
+        toggle_field = avango.utils.make_key_released_trigger( 
+                            avango.utils.make_bool2_and(self._subdisplay_keyboard[subdisplay].KeyAlt,
+                                                        self._subdisplay_keyboard[subdisplay].KeyO) )
+        node_optimizer.Trigger.connect_from(toggle_field)
+        self.keep_alive(node_optimizer)
         
         return display_view
@@ -163 +176 @@
 
         if interface == "Keyboard":
-            keyboard = avango.display.KeyboardDevice()
-            keyboard.connect(self._subdisplay_window_events[subdisplay])
-            return keyboard
+            return self._subdisplay_keyboard[subdisplay]
 
         elif interface == "Mouse":