fixing HUD scales

CLOUDS-Interactive-Documentary · Jul 9, 2016 · 28605ae · 28605ae
1 parent 117f000
commit 28605ae
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 19 deletions.
diff --git a/CloudsData/OculusRift.xml b/CloudsData/OculusRift.xml
@@ -2,8 +2,8 @@
     <Kind>40</Kind>
     <Name>OculusRift</Name>
     <IsMinified>0</IsMinified>
-    <XPosition>619.000000000</XPosition>
-    <YPosition>120.000000000</YPosition>
+    <XPosition>839.000000000</XPosition>
+    <YPosition>35.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>4</Kind>
@@ -64,7 +64,7 @@
 <Widget>
     <Kind>4</Kind>
     <Name>SUBTITLE Z POS</Name>
-    <Value>-54.901962280</Value>
+    <Value>-35.784313202</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
@@ -74,10 +74,10 @@
 <Widget>
     <Kind>4</Kind>
     <Name>SUBTITLE HUD Z</Name>
-    <Value>-0.563725471</Value>
+    <Value>-0.392156869</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
     <Name>SUBTITLE HUD SCALE</Name>
-    <Value>0.500000000</Value>
+    <Value>0.308823526</Value>
 </Widget>
diff --git a/CloudsData/visualsystems/RGBD/Presets/RGBD_OC_BASE_fast/Camera.xml b/CloudsData/visualsystems/RGBD/Presets/RGBD_OC_BASE_fast/Camera.xml
@@ -2,13 +2,13 @@
     <Kind>40</Kind>
     <Name>Camera</Name>
     <IsMinified>0</IsMinified>
-    <XPosition>1161.000000000</XPosition>
-    <YPosition>305.000000000</YPosition>
+    <XPosition>950.000000000</XPosition>
+    <YPosition>69.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>4</Kind>
     <Name>FRONT DISTANCE</Name>
-    <Value>163.054199219</Value>
+    <Value>133.823532104</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
@@ -33,7 +33,7 @@
 <Widget>
     <Kind>4</Kind>
     <Name>DROP AMOUNT</Name>
-    <Value>33.497535706</Value>
+    <Value>26.470588684</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>

diff --git a/CloudsData/visualsystems/RGBD/Presets/RGBD_OC_BASE_pretty/Camera.xml b/CloudsData/visualsystems/RGBD/Presets/RGBD_OC_BASE_pretty/Camera.xml
@@ -1,14 +1,14 @@
 <Canvas>
     <Kind>40</Kind>
     <Name>Camera</Name>
-    <IsMinified>1</IsMinified>
-    <XPosition>1.000000000</XPosition>
-    <YPosition>452.000000000</YPosition>
+    <IsMinified>0</IsMinified>
+    <XPosition>907.000000000</XPosition>
+    <YPosition>27.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>4</Kind>
     <Name>FRONT DISTANCE</Name>
-    <Value>163.054199219</Value>
+    <Value>154.411758423</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
@@ -23,7 +23,7 @@
 <Widget>
     <Kind>4</Kind>
     <Name>LIFT RANGE</Name>
-    <Value>65.024635315</Value>
+    <Value>58.823532104</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
@@ -33,7 +33,7 @@
 <Widget>
     <Kind>4</Kind>
     <Name>DROP AMOUNT</Name>
-    <Value>33.497535706</Value>
+    <Value>29.411766052</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>

diff --git a/CloudsLibrary/src/Core/CloudsPlaybackController.cpp b/CloudsLibrary/src/Core/CloudsPlaybackController.cpp
@@ -1873,8 +1873,17 @@ void CloudsPlaybackController::drawKinectFeedback(){
 void CloudsPlaybackController::preDraw(ofEventArgs& args){
 #ifdef OCULUS_RIFT
 
-    float hudDistance = CloudsVisualSystem::subtitleHudZ;
-    float hudScale = CloudsVisualSystem::subtitleHudScale;
+    float hudDistance;// = CloudsVisualSystem::subtitleHudZ;
+    float hudScale;// = CloudsVisualSystem::subtitleHudScale;
+	if(currentVisualSystem == introSequence){
+	    hudDistance = CloudsVisualSystem::subtitleHudZ*8;
+		hudScale = CloudsVisualSystem::subtitleHudScale*8;
+	}
+	else{
+	    hudDistance = CloudsVisualSystem::subtitleHudZ;
+		hudScale = CloudsVisualSystem::subtitleHudScale;
+	}
+
     CloudsVisualSystem::getOculusRift().beginOverlay(hudDistance, hudScale, 1920, 1080);
 
     if(currentVisualSystem == introSequence){

diff --git a/CloudsLibrary/src/VisualSystems/_Intro/vs_src/CloudsIntroSequence.cpp b/CloudsLibrary/src/VisualSystems/_Intro/vs_src/CloudsIntroSequence.cpp
@@ -1651,6 +1651,13 @@ void CloudsIntroSequence::selfDrawOverlay(){
     if(!bUseOculusRift || (bUseOculusRift && (currentState < CLOUDS_INTRO_MENU || showVHXPrompt || alertBoundsActivated) ) ){
         drawMenu();
     }
+	if(bUseOculusRift && currentState >= CLOUDS_INTRO_MENU){
+		ofPushStyle();
+		ofSetRectMode(OF_RECTMODE_CENTER);
+		ofSetColor(255);
+		ofCircle(1920*.5, 1080*.5,5);
+		ofPopStyle();
+	}
     #endif
 
 }

diff --git a/CloudsLibrary/src/VisualSystemsLibrary/CloudsRGBDCamera.cpp b/CloudsLibrary/src/VisualSystemsLibrary/CloudsRGBDCamera.cpp
@@ -134,10 +134,14 @@ void CloudsRGBDCamera::setPositionFromMouse(){
 
 	position.y += ofMap(abs(.5 - percentOnCurve), 0, .5, (liftDrift + liftAmount), (liftDrift-liftAmount)*.5);
 	position.z -= MAX(liftDrift,0) * .5; // zoom in on mouse up
+	#ifdef OCULUS_RIFT
+	//dropamount is making the camera not straight
+	position.y -= dropAmount;
+	#endif
 
 	targetPosition = position;
+
 	currentPosition += (targetPosition - currentPosition) * damp;
-
 	currentLookTarget = lookTarget - ofVec3f(0,dropAmount,-sidePullback);
 
 	//calculate drift;

diff --git a/CloudsLibrary/src/VisualSystemsLibrary/CloudsVisualSystem.cpp b/CloudsLibrary/src/VisualSystemsLibrary/CloudsVisualSystem.cpp
@@ -867,7 +867,7 @@ void CloudsVisualSystem::drawScene(){
 	if(isInterlude){
 		//drawInterludeInterface();
 	}
-	draw3DCursor();
+//	draw3DCursor();
 #endif
 
 }