final tweaks

CLOUDS-Interactive-Documentary · Apr 24, 2016 · 864ac94 · 864ac94
1 parent c1e1570
commit 864ac94
Show file tree

Hide file tree

Showing 15 changed files with 169 additions and 81 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>377.000000000</XPosition>
-    <YPosition>30.000000000</YPosition>
+    <XPosition>386.000000000</XPosition>
+    <YPosition>75.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>4</Kind>
@@ -69,15 +69,15 @@
 <Widget>
     <Kind>4</Kind>
     <Name>SUBTITLE SCALE</Name>
-    <Value>0.158653840</Value>
+    <Value>0.200980395</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
     <Name>SUBTITLE HUD Z</Name>
-    <Value>-0.857843161</Value>
+    <Value>-3.284313679</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
     <Name>SUBTITLE HUD SCALE</Name>
-    <Value>0.740196049</Value>
+    <Value>3.000000000</Value>
 </Widget>
diff --git a/CloudsData/visualsystems/_Intro/Presets/Oculus_fast/Menu.xml b/CloudsData/visualsystems/_Intro/Presets/Oculus_fast/Menu.xml
@@ -8,7 +8,7 @@
 <Widget>
     <Kind>42</Kind>
     <Name>FONT SIZE</Name>
-    <Value>20</Value>
+    <Value>31</Value>
 </Widget>
 <Widget>
     <Kind>42</Kind>
@@ -18,7 +18,7 @@
 <Widget>
     <Kind>4</Kind>
     <Name>Y OFFSET</Name>
-    <Value>206.250000000</Value>
+    <Value>211.764709473</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>

diff --git a/CloudsData/visualsystems/_Intro/Presets/Oculus_fast/Settings.xml b/CloudsData/visualsystems/_Intro/Presets/Oculus_fast/Settings.xml
@@ -2,8 +2,8 @@
     <Kind>40</Kind>
     <Name>Settings</Name>
     <IsMinified>0</IsMinified>
-    <XPosition>644.000000000</XPosition>
-    <YPosition>132.000000000</YPosition>
+    <XPosition>512.000000000</XPosition>
+    <YPosition>45.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>2</Kind>

diff --git a/CloudsData/visualsystems/_Intro/Presets/Oculus_fast/UITimelineMappings.xml b/CloudsData/visualsystems/_Intro/Presets/Oculus_fast/UITimelineMappings.xml
@@ -13,40 +13,40 @@
     <SliderCurves>
         <Mapping>
             <Widget>
-                <WidgetName>camera fwd force</WidgetName>
-                <WidgetID>70</WidgetID>
-                <WidgetCanvasParent>CamSettings</WidgetCanvasParent>
+                <WidgetName>Max Distance</WidgetName>
+                <WidgetID>7</WidgetID>
+                <WidgetCanvasParent>RenderSettings</WidgetCanvasParent>
             </Widget>
             <Track></Track>
         </Mapping>
         <Mapping>
             <Widget>
-                <WidgetName>Wireframe Alpha</WidgetName>
-                <WidgetID>15</WidgetID>
+                <WidgetName>Max Point Size</WidgetName>
+                <WidgetID>3</WidgetID>
                 <WidgetCanvasParent>RenderSettings</WidgetCanvasParent>
             </Widget>
             <Track></Track>
         </Mapping>
         <Mapping>
             <Widget>
-                <WidgetName>Perlin Amplitude</WidgetName>
-                <WidgetID>9</WidgetID>
+                <WidgetName>Wireframe Alpha</WidgetName>
+                <WidgetID>15</WidgetID>
                 <WidgetCanvasParent>RenderSettings</WidgetCanvasParent>
             </Widget>
             <Track></Track>
         </Mapping>
         <Mapping>
             <Widget>
-                <WidgetName>Max Distance</WidgetName>
-                <WidgetID>7</WidgetID>
-                <WidgetCanvasParent>RenderSettings</WidgetCanvasParent>
+                <WidgetName>camera fwd force</WidgetName>
+                <WidgetID>70</WidgetID>
+                <WidgetCanvasParent>CamSettings</WidgetCanvasParent>
             </Widget>
             <Track></Track>
         </Mapping>
         <Mapping>
             <Widget>
-                <WidgetName>Max Point Size</WidgetName>
-                <WidgetID>3</WidgetID>
+                <WidgetName>Perlin Amplitude</WidgetName>
+                <WidgetID>9</WidgetID>
                 <WidgetCanvasParent>RenderSettings</WidgetCanvasParent>
             </Widget>
             <Track></Track>

diff --git a/CloudsData/visualsystems/_Intro/Presets/Oculus_pretty/CamSettings.xml b/CloudsData/visualsystems/_Intro/Presets/Oculus_pretty/CamSettings.xml
@@ -153,7 +153,7 @@
 <Widget>
     <Kind>4</Kind>
     <Name>camera fwd force</Name>
-    <Value>0.935999990</Value>
+    <Value>0.004000000</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
@@ -183,5 +183,5 @@
 <Widget>
     <Kind>2</Kind>
     <Name>hold camera</Name>
-    <Value>0</Value>
+    <Value>1</Value>
 </Widget>
diff --git a/CloudsData/visualsystems/_Intro/Presets/Oculus_pretty/Helpertext.xml b/CloudsData/visualsystems/_Intro/Presets/Oculus_pretty/Helpertext.xml
@@ -1,9 +1,9 @@
 <Canvas>
     <Kind>40</Kind>
     <Name>Helpertext</Name>
-    <IsMinified>0</IsMinified>
-    <XPosition>409.000000000</XPosition>
-    <YPosition>375.000000000</YPosition>
+    <IsMinified>1</IsMinified>
+    <XPosition>1.000000000</XPosition>
+    <YPosition>340.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>42</Kind>

diff --git a/CloudsData/visualsystems/_Intro/Presets/Oculus_pretty/Menu.xml b/CloudsData/visualsystems/_Intro/Presets/Oculus_pretty/Menu.xml
@@ -1,14 +1,14 @@
 <Canvas>
     <Kind>40</Kind>
     <Name>Menu</Name>
-    <IsMinified>1</IsMinified>
-    <XPosition>1.000000000</XPosition>
-    <YPosition>361.000000000</YPosition>
+    <IsMinified>0</IsMinified>
+    <XPosition>616.000000000</XPosition>
+    <YPosition>150.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>42</Kind>
     <Name>FONT SIZE</Name>
-    <Value>5</Value>
+    <Value>32</Value>
 </Widget>
 <Widget>
     <Kind>42</Kind>
@@ -18,7 +18,7 @@
 <Widget>
     <Kind>4</Kind>
     <Name>Y OFFSET</Name>
-    <Value>0.000000000</Value>
+    <Value>238.235290527</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>

diff --git a/CloudsData/visualsystems/_Intro/Presets/Oculus_pretty/RenderSettings.xml b/CloudsData/visualsystems/_Intro/Presets/Oculus_pretty/RenderSettings.xml
@@ -8,7 +8,7 @@
 <Widget>
     <Kind>4</Kind>
     <Name>Max Point Size</Name>
-    <Value>0.741990328</Value>
+    <Value>0.328999937</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
@@ -18,12 +18,12 @@
 <Widget>
     <Kind>4</Kind>
     <Name>Max Distance</Name>
-    <Value>167.000061035</Value>
+    <Value>0.516455531</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
     <Name>Perlin Amplitude</Name>
-    <Value>5.000000000</Value>
+    <Value>0.000000000</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
@@ -38,5 +38,5 @@
 <Widget>
     <Kind>4</Kind>
     <Name>Wireframe Alpha</Name>
-    <Value>0.470000118</Value>
+    <Value>0.000000000</Value>
 </Widget>
diff --git a/CloudsData/visualsystems/_Intro/Presets/Oculus_pretty/Settings.xml b/CloudsData/visualsystems/_Intro/Presets/Oculus_pretty/Settings.xml
@@ -2,8 +2,8 @@
     <Kind>40</Kind>
     <Name>Settings</Name>
     <IsMinified>0</IsMinified>
-    <XPosition>553.000000000</XPosition>
-    <YPosition>135.000000000</YPosition>
+    <XPosition>339.000000000</XPosition>
+    <YPosition>10.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>2</Kind>

diff --git a/CloudsData/visualsystems/_Intro/Presets/Oculus_pretty/UITimelineMappings.xml b/CloudsData/visualsystems/_Intro/Presets/Oculus_pretty/UITimelineMappings.xml
@@ -13,40 +13,40 @@
     <SliderCurves>
         <Mapping>
             <Widget>
-                <WidgetName>camera fwd force</WidgetName>
-                <WidgetID>70</WidgetID>
-                <WidgetCanvasParent>CamSettings</WidgetCanvasParent>
+                <WidgetName>Max Distance</WidgetName>
+                <WidgetID>7</WidgetID>
+                <WidgetCanvasParent>RenderSettings</WidgetCanvasParent>
             </Widget>
             <Track></Track>
         </Mapping>
         <Mapping>
             <Widget>
-                <WidgetName>Wireframe Alpha</WidgetName>
-                <WidgetID>15</WidgetID>
+                <WidgetName>Max Point Size</WidgetName>
+                <WidgetID>3</WidgetID>
                 <WidgetCanvasParent>RenderSettings</WidgetCanvasParent>
             </Widget>
             <Track></Track>
         </Mapping>
         <Mapping>
             <Widget>
-                <WidgetName>Perlin Amplitude</WidgetName>
-                <WidgetID>9</WidgetID>
+                <WidgetName>Wireframe Alpha</WidgetName>
+                <WidgetID>15</WidgetID>
                 <WidgetCanvasParent>RenderSettings</WidgetCanvasParent>
             </Widget>
             <Track></Track>
         </Mapping>
         <Mapping>
             <Widget>
-                <WidgetName>Max Distance</WidgetName>
-                <WidgetID>7</WidgetID>
-                <WidgetCanvasParent>RenderSettings</WidgetCanvasParent>
+                <WidgetName>camera fwd force</WidgetName>
+                <WidgetID>70</WidgetID>
+                <WidgetCanvasParent>CamSettings</WidgetCanvasParent>
             </Widget>
             <Track></Track>
         </Mapping>
         <Mapping>
             <Widget>
-                <WidgetName>Max Point Size</WidgetName>
-                <WidgetID>3</WidgetID>
+                <WidgetName>Perlin Amplitude</WidgetName>
+                <WidgetID>9</WidgetID>
                 <WidgetCanvasParent>RenderSettings</WidgetCanvasParent>
             </Widget>
             <Track></Track>

diff --git a/CloudsLibrary/src/Core/CloudsPlaybackController.cpp b/CloudsLibrary/src/Core/CloudsPlaybackController.cpp
@@ -790,6 +790,22 @@ void CloudsPlaybackController::playCurrentAct(){
 
 //--------------------------------------------------------------------
 void CloudsPlaybackController::keyPressed(ofKeyEventArgs & args){
+
+	/*
+	if( (args.key == OF_KEY_BACKSPACE || args.key == OF_KEY_DEL) && !transitionController.isTransitioning()){
+        if(showingInterlude){
+            interludeSystem->getTimeline()->stop();
+        }
+        else if(showingClusterMap){
+            clusterMap->getTimeline()->stop();
+        }
+        else if(!showingIntro){
+            returnToIntro = true;
+            CloudsVisualSystem::getRGBDVideoPlayer().stop();
+            currentAct->getTimeline().stop();
+        }
+    }
+	*/
 #ifndef CLOUDS_RELEASE
 	if(args.key == '\\'){
 		if(showingIntro){
@@ -827,6 +843,8 @@ void CloudsPlaybackController::keyPressed(ofKeyEventArgs & args){
 
 
     #ifdef OCULUS_RIFT
+	//moved up
+	/*
     if(!transitionController.isTransitioning()){
         if(args.key == OF_KEY_RETURN){
             if(showingInterlude){
@@ -842,6 +860,7 @@ void CloudsPlaybackController::keyPressed(ofKeyEventArgs & args){
             }
         }
     }
+	*/
     #endif
 
     #ifdef CLOUDS_SCREENING
@@ -940,6 +959,12 @@ void CloudsPlaybackController::mouseMoved(ofMouseEventArgs & args){
 }
 
 void CloudsPlaybackController::mousePressed(ofMouseEventArgs & args){
+#ifdef OCULUS_RIFT
+	//for VHX & new download link
+	if(currentVisualSystem == introSequence){
+		introSequence->selfMousePressed(args);
+	}
+#endif
 }
 
 void CloudsPlaybackController::mouseReleased(ofMouseEventArgs & args){
@@ -987,7 +1012,7 @@ void CloudsPlaybackController::update(ofEventArgs & args){
     }
     ////////////////////
 	//OS CURSOR
-#ifdef CLOUDS_RELEASE
+#if defined(CLOUDS_RELEASE) && !defined(OCULUS_RIFT)
     ofHideCursor();
 #endif