Changeset 592

Timestamp:

11/29/11 18:31:58 (6 months ago)

Author:

ddangelo

Message:

avango-display setup for the TwoView? updated

Location:

trunk/avango-display/python

Files:

• avango-display-daemon.py (modified) (1 diff)
• avango/display/_screen_descriptor.py (modified) (1 diff)
• avango/display/setups/TwoView.py (modified) (3 diffs)
• avango/display/setups/iCone.py (modified) (2 diffs)

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

@@ -173 +173 @@
     dtrack.stations[14] = avango.daemon.Station("ve-dtrack-head8")
     dtrack.stations[15] = avango.daemon.Station("ve-dtrack-logitech")
+    dtrack.stations[16] = avango.daemon.Station("ve-dtrack-tablet2")
+    dtrack.stations[17] = avango.daemon.Station("ve-dtrack-xpand2")
+    dtrack.stations[18] = avango.daemon.Station("ve-dtrack-xpand1")
 
     #add the wiimotes

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

@@ -66 +66 @@
 
     def evaluate(self):
+        print "PixelSize: " +str(self.PixelSize.value)
+        print "RealSize: " +str(self.RealSize.value)
+        
+        if self.PixelSize.value.x==0:
+            return
+        
         x_trans = -(self.PixelSize.value.x*0.5)
         y_trans = -(self.PixelSize.value.y*0.5)

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

@@ -77 +77 @@
 
         # Connect head-tracking
-        view1_yellow_glasses = self.make_glasses("ve-dtrack-head4", avango.osg.Vec3(-0.074, -0.018, 0.025))
+        #view1_yellow_glasses = self.make_glasses("ve-dtrack-head4", avango.osg.Vec3(-0.074, -0.018, 0.025))
+        view1_yellow_glasses = self.make_glasses("ve-dtrack-xpand1", avango.osg.Vec3(-0.0825, 0.0, -0.045))
+        
         user1.Matrix.connect_from(view1_yellow_glasses.Matrix)
         self.keep_alive(view1_yellow_glasses)
@@ -84 +86 @@
         #user2.Matrix.connect_from(view2_blue_glasses.Matrix)
         #self.keep_alive(view2_blue_glasses)
-        view2_purple_glasses = self.make_glasses("ve-dtrack-head1", avango.osg.Vec3(-0.089, 0.015, -0.040))
+        #view2_purple_glasses = self.make_glasses("ve-dtrack-head1", avango.osg.Vec3(-0.089, 0.015, -0.040))
+        view2_purple_glasses = self.make_glasses("ve-dtrack-head1", avango.osg.Vec3(0.12, 0.043, 0.0 ))
+        
         user2.Matrix.connect_from(view2_purple_glasses.Matrix)
         self.keep_alive(view2_purple_glasses)
@@ -94 +98 @@
         self._wiimote_config["wiimote4"] = ["ve-dtrack-raytac",   avango.osg.Vec3( 0.068, 0.02, 0.035)]
 
-    def view_created(self, camera, view):
+    def view_created(self, camera, view,subdisplay=""):
         self._views.append(view)
 

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

@@ -98 +98 @@
         screen.PixelSize.connect_from(pixel_size.Output)
 
-        for window_config in self._windows:
+        #print "num_windows: " + str(len(self._cone_windows))
+        for window_config in self._cone_windows:
             window = window_config[0]
             real_size_sum_width.add_and_connect_float_field(window.RealActualWidth)
@@ -106 +107 @@
             pixel_size_min_height.add_and_connect_float_field(window.ActualHeight)
 
-        return screen
+        return screenz