Changeset 518

Timestamp:

09/14/10 15:07:03 (21 months ago)

Author:

ddangelo

Message:

Function to get the osg camera object for a given subdisplay. Not the best way (according to the avango.display idea), but the fastest one.
TODO: Think about an abstract way to do this in concept of avango.display.

Location:

trunk/avango-display/python/avango/display

Files:

• __init__.py (modified) (1 diff)
• _display.py (modified) (3 diffs)
• setups/Monitor.py (modified) (5 diffs)

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

@@ -107 +107 @@
     return _selected_display.get_num_users(subdisplay)
 
+def get_camera(subdisplay):
+    """
+    Get the osg.Camera object of the selected subdisplay. If no camera for the
+    given subdisplay is found, None is returned
+    """
+    return _selected_display.get_camera(subdisplay)
+
 def make_user(user=0, interface="", subdisplay=""):
     """Create a field container that represents the user position.

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

@@ -90 +90 @@
             self.connect_view_field(user_selector.ViewOut)
 
-            self.view_created(camera,view)
+            self.view_created(camera,view,subdisplay)
 
         if self._inspector and len(self._inspector.Children.value) == 0:
@@ -99 +99 @@
 
         return display_view
+
+    def get_camera(self, subdisplay):
+        return None
 
     def make_device(self, device, interface):
@@ -214 +217 @@
         self._users.append(user)
 
-    def view_created(self,camera,view):
+    def view_created(self,camera,view,subdisplay=""):
         '''
         Template function, which can be overridden by subclasses.

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

@@ -59 +59 @@
         self.add_user(user)
     
-    def make_view(self, subdisplay, trackball_support=True):
-        
+    def make_view(self, subdisplay):
         display_view = avango.display.nodes.MonitorView()
         if subdisplay == "":
@@ -67 +66 @@
         # In the Monitor setting each subdisplay simply get a new window
         else:
-            window = self.make_window(0, 0, 1024, 768, 4, 3, False, self._screen_identifier, 2)
+            window = self.make_window(0, 0, 1024, 768, 0.4, 0.3, False, self._screen_identifier, 2)
             window.Decoration.value = True
             window.AutoHeight.value = True
@@ -73 +72 @@
             window.Title.value = subdisplay
             window.Name.value = subdisplay
-    
-            camera, view = self.make_camera(display_view, 0., window)
-            camera.ScreenTransform.value = avango.osg.make_trans_mat(0, 1.2, -2.4)
-    
+            
+            window_translation = avango.osg.make_trans_mat(0, 1.7, -0.6)
+            current_user = 0
+            
+        
+            eye_offset = 0.0
+            if window.StereoMode.value != avango.osg.viewer.stereo_mode.STEREO_MODE_NONE:
+                eye_offset = 0.03
+
+            camera, view = self.make_camera_with_viewport(
+                display_view, eye_offset, window_translation, window)
+            camera.EyeTransform.connect_from(self._users[current_user].Matrix)
+            
+            #self.connect_view_field(user_selector.ViewOut)
+            self._subdisplay_window[subdisplay] = window
+            
+            #print "<" + str(subdisplay) + "> make_view"
             self.add_view(view)
-    
-            window_event = avango.osg.viewer.nodes.EventFields(View = view)
-            self._subdisplay_window_events[subdisplay] = window_event
-            window.DragEvent.connect_from(window_event.DragEvent)
-            window.MoveEvent.connect_from(window_event.MoveEvent)
-            self._subdisplay_camera[subdisplay] = camera
-            self._subdisplay_window[subdisplay] = window
-        
+            
+            self.view_created(camera,view,subdisplay)
         
         #configure trackball
@@ -131 +137 @@
  
     
-    def view_created(self, camera, view):
+    def view_created(self, camera, view, subdisplay):
         'Primary window is automatically created by the constructor. All other windows are created by explicit calls of make_view(subdisplay)'
         # It seems that a view is only allowed to be associated with one EventField at a time.
-        if self._subdisplay_window_events.has_key(""):
+        
+        if self._subdisplay_window_events.has_key(subdisplay):
             return
         else:
             window_event = avango.osg.viewer.nodes.EventFields(View = view)
-            self._subdisplay_window_events[""] = window_event
-            self._subdisplay_window[""].DragEvent.connect_from(window_event.DragEvent)
-            self._subdisplay_window[""].MoveEvent.connect_from(window_event.MoveEvent)
-            self._subdisplay_camera[""] = camera
+            self._subdisplay_window_events[subdisplay] = window_event
+            self._subdisplay_window[subdisplay].DragEvent.connect_from(window_event.DragEvent)
+            self._subdisplay_window[subdisplay].MoveEvent.connect_from(window_event.MoveEvent)
+            self._subdisplay_camera[subdisplay] = camera
+            
+            
+    def get_camera(self, subdisplay):
+        if self._subdisplay_camera.has_key(subdisplay):
+            return self._subdisplay_camera[subdisplay]
+        return None
+        
 
 
@@ -221 +235 @@
             
             return gamepad
+