Merge branch 'master' of github.com:obviousjim/CLOUDS into feature-64

Conflicts: .gitignore CLOUDS/CLOUDS_64 copy-Info.plist CloudsLibrary/src/RGBD/CloudsPlaybackController.cpp CloudsLibrary/src/VisualSystems/Flying/vs_src/CloudsVisualSystemFlying.cpp CloudsLibrary/src/VisualSystems/Swim/vs_src/CloudsVisualSystemSwim.cpp CloudsLibrary/src/VisualSystems/Twitter/vs_src/CloudsVisualSystemTwitter.cpp CloudsLibrary/src/VisualSystems/_ClusterMap/vs_src/CloudsVisualSystemClusterMap.cpp RTCMIX_proof_of_concept1/src/main.cpp VSCandyMountains/CandyMountains.xcodeproj/project.pbxproj cloneaddons.sh
CLOUDS-Interactive-Documentary · Jun 9, 2014 · 2a4d5ce · 2a4d5ce
2 parents 54a5059 + ec36481
commit 2a4d5ce
Show file tree

Hide file tree

Showing 806 changed files with 28,644 additions and 2,639 deletions.
diff --git a/.gitignore b/.gitignore
@@ -371,3 +371,5 @@ screencapture_*
 CLOUDS/fmod.log
 *.log
 CloudsVisualSystemTester/bin/data/log_05_27_13_04_35.txt
+
+SCREENSHOT_*
diff --git a/CLOUDS/CLOUDS.xcodeproj/project.pbxproj b/CLOUDS/CLOUDS.xcodeproj/project.pbxproj
@@ -11657,7 +11657,7 @@
 					"-lpthread",
 					"-mtune=native",
 				);
-				SDKROOT = macosx;
+				SDKROOT = macosx10.8;
 			};
 			name = Debug;
 		};
@@ -11700,7 +11700,7 @@
 					"-lpthread",
 					"-mtune=native",
 				);
-				SDKROOT = macosx;
+				SDKROOT = macosx10.8;
 			};
 			name = Release;
 		};
@@ -12044,6 +12044,7 @@
 					"AVF_PLAYER=1",
 					"SHOW_SUBTITLES=1",
 					"CLOUDS_SCREENING=1",
+					"KINECT_INPUT=1",
 					"CLOUDS_APP=1",
 				);
 				INFOPLIST_FILE = CLOUDS_SCREENING.plist;

diff --git a/CloudsData/CloudsMovieDirectory_sundance.txt b/CloudsData/CloudsMovieDirectory_sundance.txt
diff --git a/CloudsData/Kinect.xml b/CloudsData/Kinect.xml
@@ -2,8 +2,8 @@
     <Kind>42</Kind>
     <Name>Kinect</Name>
     <IsMinified>0</IsMinified>
-    <XPosition>1061.000000000</XPosition>
-    <YPosition>1.000000000</YPosition>
+    <XPosition>753.000000000</XPosition>
+    <YPosition>65.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>2</Kind>
@@ -25,20 +25,20 @@
 <Widget>
     <Kind>6</Kind>
     <Name>BODY RANGE X</Name>
-    <HighValue>0.320197105</HighValue>
-    <LowValue>-0.251231551</LowValue>
+    <HighValue>0.852216721</HighValue>
+    <LowValue>-0.704433501</LowValue>
 </Widget>
 <Widget>
     <Kind>6</Kind>
     <Name>BODY RANGE Y</Name>
     <HighValue>0.280786991</HighValue>
-    <LowValue>-0.576354682</LowValue>
+    <LowValue>-0.714285731</LowValue>
 </Widget>
 <Widget>
     <Kind>6</Kind>
     <Name>BODY RANGE Z</Name>
     <HighValue>2.411330223</HighValue>
-    <LowValue>1.997536898</LowValue>
+    <LowValue>1.977832556</LowValue>
 </Widget>
 <Widget>
     <Kind>2</Kind>
@@ -53,12 +53,12 @@
 <Widget>
     <Kind>4</Kind>
     <Name>ACTIVE THRESHOLD Z</Name>
-    <Value>0.399014771</Value>
+    <Value>0.477832526</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
     <Name>FOCUS RANGE</Name>
-    <Value>0.261083752</Value>
+    <Value>0.463054180</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
@@ -90,18 +90,3 @@
     <Name>FEEDBACK MARGIN</Name>
     <Value>0.020000000</Value>
 </Widget>
-<Widget>
-    <Kind>25</Kind>
-    <Name>FEEDBACK HUE</Name>
-    <Value>255.000000000</Value>
-</Widget>
-<Widget>
-    <Kind>25</Kind>
-    <Name>FEEDBACK SAT</Name>
-    <Value>0.000000000</Value>
-</Widget>
-<Widget>
-    <Kind>25</Kind>
-    <Name>FEEDBACK BRI</Name>
-    <Value>255.000000000</Value>
-</Widget>