hud rendering new way

CLOUDS-Interactive-Documentary · Apr 23, 2016 · 8e16e52 · 8e16e52
1 parent 2fb93fa
commit 8e16e52
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 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>745.000000000</XPosition>
-    <YPosition>281.000000000</YPosition>
+    <XPosition>377.000000000</XPosition>
+    <YPosition>30.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>4</Kind>
@@ -74,10 +74,10 @@
 <Widget>
     <Kind>4</Kind>
     <Name>SUBTITLE HUD Z</Name>
-    <Value>-209.615386963</Value>
+    <Value>-0.857843161</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
     <Name>SUBTITLE HUD SCALE</Name>
-    <Value>0.153846160</Value>
+    <Value>0.740196049</Value>
 </Widget>
diff --git a/CloudsLibrary/src/Core/CloudsPlaybackController.cpp b/CloudsLibrary/src/Core/CloudsPlaybackController.cpp
@@ -1825,7 +1825,7 @@ void CloudsPlaybackController::drawKinectFeedback(){
 //--------------------------------------------------------------------
 void CloudsPlaybackController::preDraw(ofEventArgs& args){
 #ifdef OCULUS_RIFT
-    /*
+
     float hudDistance = CloudsVisualSystem::subtitleHudZ;
     float hudScale = CloudsVisualSystem::subtitleHudScale;
     CloudsVisualSystem::getOculusRift().beginOverlay(hudDistance, hudScale, 1920, 1080);
@@ -1837,7 +1837,7 @@ void CloudsPlaybackController::preDraw(ofEventArgs& args){
     hud.draw();
 
     CloudsVisualSystem::getOculusRift().endOverlay();
-	*/
+
 #endif
 }
 

diff --git a/CloudsLibrary/src/VisualSystemsLibrary/CloudsVisualSystem.cpp b/CloudsLibrary/src/VisualSystemsLibrary/CloudsVisualSystem.cpp
@@ -3347,7 +3347,7 @@ void CloudsVisualSystem::setupOculusGui()
 	oculusGui->addSlider("SUBTITLE Z POS", 0, -100, &subtitle3DBasePosZ);
 	oculusGui->addSlider("SUBTITLE SCALE", 0,  1.0, &subtitle3DScale);
 	oculusGui->addSpacer();
-	oculusGui->addSlider("SUBTITLE HUD Z", -100, -700, &subtitleHudZ);
+	oculusGui->addSlider("SUBTITLE HUD Z", -0, -5, &subtitleHudZ);
 	oculusGui->addSlider("SUBTITLE HUD SCALE", .0, 1.0, &subtitleHudScale);
 	//oculusGui->addSlider("SUBTITLE HUD Y", 0, 1.0, &subtitleHudY);
 

diff --git a/OculusDirectTest/src/testApp.cpp b/OculusDirectTest/src/testApp.cpp
@@ -31,7 +31,7 @@ void testApp::draw(){
 
 	if (oculus.isSetup()) {
 
-
+		showOverlay = false;
         if (showOverlay) {
 
 			oculus.beginOverlay(-(float)ofGetMouseY() / (float)ofGetHeight(), 1., 1920, 1080);

diff --git a/VSPointCloudPeople/src/testApp.cpp b/VSPointCloudPeople/src/testApp.cpp
@@ -100,7 +100,15 @@ void testApp::update(){
 void testApp::draw(){
 
 #ifdef OCULUS_RIFT
-
+	float hudDistance = CloudsVisualSystem::subtitleHudZ;
+    float hudScale = CloudsVisualSystem::subtitleHudScale;
+
+	CloudsVisualSystem::getOculusRift().beginOverlay(hudDistance, hudScale, 1920, 1080);
+    CloudsVisualSystem::getRGBDVideoPlayer().drawSubtitles();
+
+    hud.draw();
+
+    CloudsVisualSystem::getOculusRift().endOverlay();	
 #else
 	ofBackground(0);
 	ofDisableDepthTest();