Very minor change to input of virtualPlane

gabrielDiaz-performlab · gabrielDiaz-performlab · commit 1adf7795dc31 · 2016-07-07T14:08:05.000-04:00
Removed an unnecessary argument passed to virtualplane
diff --git a/Utils/configobj.pyc b/Utils/configobj.pyc
diff --git a/Utils/validate.pyc b/Utils/validate.pyc
diff --git a/Utils/virtualPlane.py b/Utils/virtualPlane.py
@@ -118,7 +118,7 @@ def useDefaultView(self):
 
 		
 		
-	def attachViewToGlasses(self,visNode,glassesRigid):
+	def attachViewToGlasses(self,visNode):
 		
 		"""
 		Create tracker object that represents the users head position, specifically the center of the eyes.
diff --git a/caveWallDimensions.cave b/caveWallDimensions.cave
@@ -3,9 +3,9 @@
 <nearPlane>0.100000</nearPlane>
 <wall>
 <name>floor</name>
-<upperLeft>-1.186075 0.000000 2.121046</upperLeft>
-<upperRight>1.401030 0.000000 2.106692</upperRight>
-<lowerLeft>-1.207397 0.000000 -2.433407</lowerLeft>
-<lowerRight>1.395413 0.000000 -2.405881</lowerRight>
+<upperLeft>-1.189208 0.000000 2.129075</upperLeft>
+<upperRight>1.372727 0.000000 2.121089</upperRight>
+<lowerLeft>-1.184819 0.000000 -2.400250</lowerLeft>
+<lowerRight>1.391910 0.000000 -2.347974</lowerRight>
 </wall>
 </vizcave>
diff --git a/main.py b/main.py
@@ -1234,7 +1234,10 @@ def setupShutterGlasses(self):
 		shutterRigid = config.mocap.returnPointerToRigid('shutter') # Here, 
 		shutterRigid.link_pose(eyeSphere.node3D)
 				
-		self.config.virtualPlane.attachViewToGlasses(eyeSphere.node3D,shutterRigid)
+		self.config.virtualPlane.attachViewToGlasses(eyeSphere.node3D)
+		
+		###
+		
 			
 	def setupFeet(self):
 
@@ -1778,8 +1781,8 @@ def checkObs():
 	print experimentObject.currentTrial.obsObj.collisionBox.physNode.body.getPosition()
 	
 	
-#vizshape.addAxes().setScale([0.5, 0.5, 0.5])
-#vizshape.addBox(size=(0.05,0.05,0.05))
+#ax = vizshape.addAxes().setScale([0.5, 0.5, 0.5])
+#box = vizshape.addBox(size=(0.05,0.05,0.05))
 # experimentObject.config.mocap.get_MarkerPos(0,0.5)
 
 viz.MainWindow.setStereoSwap(viz.TOGGLE)
diff --git a/performLabVR2.cfg b/performLabVR2.cfg
@@ -1,5 +1,5 @@
 
-displays = 2,
+displays = 3,
 
 use_phasespace = true
 
diff --git a/vizConnect/virtualPlane.py b/vizConnect/virtualPlane.py
@@ -70,7 +70,7 @@ def initDisplays(initFlag=vizconnect.INIT_INDEPENDENT, initList=None):
 			_window = viz.MainWindow
 			
 			#VC: set the fullscreen monitor
-			viz.window.setFullscreenMonitor(2)
+			viz.window.setFullscreenMonitor(3)
 			viz.window.setFullscreen(True)
 			
 			#VC: set some parameters

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-displays = 2,`
	`2`	`+displays = 3,`
`3`	`3`
`4`	`4`	`use_phasespace = true`
`5`	`5`