Merge branch 'master' of https://github.com/CLOUDS-Interactive-Docume…

…ntary/CLOUDS # By James George (124) and others # Via James George (19) and rev3rend (1) * 'master' of https://github.com/CLOUDS-Interactive-Documentary/CLOUDS: (127 commits) Fixed compile for 10.9 fixing up project files for prints removed couts from HUD icons for windows reset button fixed again temp defined out tonic textures for file size adding project files os x icon stuff quick fix for os x code changes on mac updated cluster map updating OS X project files subtitle fix on english switch back to english test video for talk keyword adjust updated translations prep for yebizo screening show use mouse to interact prompt subtitle tweaking ...
CLOUDS-Interactive-Documentary · Mar 17, 2015 · a459772 · a459772
2 parents fa264ea + 6a4c484
commit a459772
Show file tree

Hide file tree

Showing 1,109 changed files with 58,374 additions and 26,895 deletions.
diff --git a/.com.apple.timemachine.supported b/.com.apple.timemachine.supported
diff --git a/.gitignore b/.gitignore
@@ -376,3 +376,6 @@ SCREENSHOT_*
 
 /gephi_edges.csv
 *.log
+CloudsData/language/MASTER/output/*
+CloudsData/language/MASTER/utf8_converted/*
+*.xlsm
diff --git a/CLOUDS/CLOUDS.icns b/CLOUDS/CLOUDS.icns
diff --git a/CLOUDS/CLOUDS.ico b/CLOUDS/CLOUDS.ico
diff --git a/CLOUDS/CLOUDS.plist b/CLOUDS/CLOUDS.plist
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>CLOUDS</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.openFrameworks</string>
+	<string>com.cloudsdocumentary.CLOUDS</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
@@ -16,5 +18,7 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.entertainment</string>
 </dict>
 </plist>
diff --git a/CLOUDS/CLOUDS.sln b/CLOUDS/CLOUDS.sln
@@ -12,7 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLOUDS", "CLOUDS.vcxproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxCvLib", "..\..\..\addons\ofxCv\ofxCvLib\ofxCvLib.vcxproj", "{FAA73572-FD12-41FA-8FBE-CB47482D2D87}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxOculusRiftLib", "..\..\..\addons\ofxOculusRift\ofxOculusRiftLib\ofxOculusRiftLib.vcxproj", "{06DF4A39-7102-462B-8F20-FC26E9A93826}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxOculusDK2Lib", "..\..\..\addons\ofxOculusDK2\ofxOculusDK2Lib\ofxOculusDK2Lib.vcxproj", "{06DF4A39-7102-462B-8F20-FC26E9A93826}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/CLOUDS/CLOUDS.vcxproj b/CLOUDS/CLOUDS.vcxproj
diff --git a/CLOUDS/CLOUDS.vcxproj.filters b/CLOUDS/CLOUDS.vcxproj.filters
@@ -301,15 +301,9 @@
     <ClCompile Include="..\..\..\addons\ofxOsc\libs\oscpack\src\ip\IpEndpointName.cpp">
       <Filter>addons\ofxOsc\libs\oscpack\ip</Filter>
     </ClCompile>
-    <ClCompile Include="..\CloudsLibrary\src\RGBD\CloudsPlaybackController.cpp">
-      <Filter>CloudsLibrary\src\RGBD</Filter>
-    </ClCompile>
     <ClCompile Include="..\CloudsLibrary\src\RGBD\CloudsRGBDPointLayer.cpp">
       <Filter>CloudsLibrary\src\RGBD</Filter>
     </ClCompile>
-    <ClCompile Include="..\CloudsLibrary\src\RGBD\CloudsTransitionController.cpp">
-      <Filter>CloudsLibrary\src\RGBD</Filter>
-    </ClCompile>
     <ClCompile Include="..\CloudsLibrary\src\RGBD\CloudsVisualSystemRGBD.cpp">
       <Filter>CloudsLibrary\src\RGBD</Filter>
     </ClCompile>
@@ -1036,9 +1030,6 @@
     <ClCompile Include="..\CloudsLibrary\src\StoryEngine\CloudsStoryEngine.cpp">
       <Filter>CloudsLibrary\src\StoryEngine</Filter>
     </ClCompile>
-    <ClCompile Include="..\CloudsLibrary\src\StoryEngine\CloudsVisualSystemManager.cpp">
-      <Filter>CloudsLibrary\src\StoryEngine</Filter>
-    </ClCompile>
     <ClCompile Include="..\CloudsLibrary\src\StoryEngine\CloudsVisualSystemPreset.cpp">
       <Filter>CloudsLibrary\src\StoryEngine</Filter>
     </ClCompile>
@@ -1141,9 +1132,6 @@
     <ClCompile Include="..\CloudsLibrary\src\Sound\CloudsSoundFuncs.cpp">
       <Filter>CloudsLibrary\src\Sound</Filter>
     </ClCompile>
-    <ClCompile Include="..\CloudsLibrary\src\RGBD\CloudsCalibrationNode.cpp">
-      <Filter>CloudsLibrary\src\RGBD</Filter>
-    </ClCompile>
     <ClCompile Include="..\CloudsLibrary\src\Input\CloudsInputOculus.cpp">
       <Filter>CloudsLibrary\src\Input</Filter>
     </ClCompile>
@@ -1156,6 +1144,27 @@
     <ClCompile Include="..\..\..\addons\ofxAnimationPrimitives\src\ofxAnimationPrimitivesTimer.cpp">
       <Filter>addons\ofxAnimationPrimitives</Filter>
     </ClCompile>
+    <ClCompile Include="..\CloudsLibrary\src\CloudsGlobal.cpp">
+      <Filter>CloudsLibrary\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CloudsLibrary\src\CloudsLocalization.cpp">
+      <Filter>CloudsLibrary\src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CloudsLibrary\src\Core\CloudsCalibrationNode.cpp">
+      <Filter>CloudsLibrary\src\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CloudsLibrary\src\Core\CloudsPlaybackController.cpp">
+      <Filter>CloudsLibrary\src\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CloudsLibrary\src\Core\CloudsTransitionController.cpp">
+      <Filter>CloudsLibrary\src\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\CloudsLibrary\src\Core\CloudsVisualSystemManager.cpp">
+      <Filter>CloudsLibrary\src\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\addons\ofxLocalization\src\ofxLocalization.cpp">
+      <Filter>addons\ofxLocalization\src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="src">
@@ -1377,6 +1386,15 @@
     <Filter Include="addons\ofxBinaryMesh\src">
       <UniqueIdentifier>{11ce0b07-6ae0-4426-8d5d-85163dad0340}</UniqueIdentifier>
     </Filter>
+    <Filter Include="CloudsLibrary\src\Core">
+      <UniqueIdentifier>{c662ab59-fb13-4962-a5af-7eb49e66602b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxLocalization">
+      <UniqueIdentifier>{1148e1e1-0d89-40a0-bf15-8fc8ccff0461}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="addons\ofxLocalization\src">
+      <UniqueIdentifier>{8c128525-8ed1-48a4-961c-8fcd2d7a12d8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\testApp.h">
@@ -1931,15 +1949,9 @@
     <ClInclude Include="..\..\..\addons\ofxOsc\libs\oscpack\src\ip\UdpSocket.h">
       <Filter>addons\ofxOsc\libs\oscpack\ip</Filter>
     </ClInclude>
-    <ClInclude Include="..\CloudsLibrary\src\RGBD\CloudsPlaybackController.h">
-      <Filter>CloudsLibrary\src\RGBD</Filter>
-    </ClInclude>
     <ClInclude Include="..\CloudsLibrary\src\RGBD\CloudsRGBDPointLayer.h">
       <Filter>CloudsLibrary\src\RGBD</Filter>
     </ClInclude>
-    <ClInclude Include="..\CloudsLibrary\src\RGBD\CloudsTransitionController.h">
-      <Filter>CloudsLibrary\src\RGBD</Filter>
-    </ClInclude>
     <ClInclude Include="..\CloudsLibrary\src\RGBD\CloudsVisualSystemRGBD.h">
       <Filter>CloudsLibrary\src\RGBD</Filter>
     </ClInclude>
@@ -2747,9 +2759,6 @@
     <ClInclude Include="..\CloudsLibrary\src\StoryEngine\CloudsDichotomy.h">
       <Filter>CloudsLibrary\src\StoryEngine</Filter>
     </ClInclude>
-    <ClInclude Include="..\CloudsLibrary\src\StoryEngine\CloudsEvents.h">
-      <Filter>CloudsLibrary\src\StoryEngine</Filter>
-    </ClInclude>
     <ClInclude Include="..\CloudsLibrary\src\StoryEngine\CloudsFCPParser.h">
       <Filter>CloudsLibrary\src\StoryEngine</Filter>
     </ClInclude>
@@ -2771,9 +2780,6 @@
     <ClInclude Include="..\CloudsLibrary\src\StoryEngine\CloudsStoryEngine.h">
       <Filter>CloudsLibrary\src\StoryEngine</Filter>
     </ClInclude>
-    <ClInclude Include="..\CloudsLibrary\src\StoryEngine\CloudsVisualSystemManager.h">
-      <Filter>CloudsLibrary\src\StoryEngine</Filter>
-    </ClInclude>
     <ClInclude Include="..\CloudsLibrary\src\StoryEngine\CloudsVisualSystemPreset.h">
       <Filter>CloudsLibrary\src\StoryEngine</Filter>
     </ClInclude>
@@ -2960,9 +2966,6 @@
     <ClInclude Include="..\CloudsLibrary\src\VisualSystems\Paradox\vs_src\CloudsVisualSystemParadox.h">
       <Filter>CloudsLibrary\src\VisualSystems</Filter>
     </ClInclude>
-    <ClInclude Include="..\CloudsLibrary\src\RGBD\CloudsCalibrationNode.h">
-      <Filter>CloudsLibrary\src\RGBD</Filter>
-    </ClInclude>
     <ClInclude Include="..\CloudsLibrary\src\Input\CloudsInputOculus.h">
       <Filter>CloudsLibrary\src\Input</Filter>
     </ClInclude>
@@ -2999,6 +3002,28 @@
     <ClInclude Include="..\..\..\addons\ofxAnimationPrimitives\src\ofxAnimationPrimitivesTimer.h">
       <Filter>addons\ofxAnimationPrimitives</Filter>
     </ClInclude>
+    <ClInclude Include="..\CloudsLibrary\src\CloudsLocalization.h">
+      <Filter>CloudsLibrary\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CloudsLibrary\src\CloudsEvents.h">
+      <Filter>CloudsLibrary\src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CloudsLibrary\src\Core\CloudsCalibrationNode.h">
+      <Filter>CloudsLibrary\src\Core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CloudsLibrary\src\Core\CloudsPlaybackController.h">
+      <Filter>CloudsLibrary\src\Core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CloudsLibrary\src\Core\CloudsTransitionController.h">
+      <Filter>CloudsLibrary\src\Core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\CloudsLibrary\src\Core\CloudsVisualSystemManager.h">
+      <Filter>CloudsLibrary\src\Core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\addons\ofxLocalization\src\ofxLocalization.h">
+      <Filter>addons\ofxLocalization\src</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\addons\ofxJSON\libs\jsoncpp\src\json_internalarray.inl">
@@ -3034,4 +3059,10 @@
       <Filter>addons\ofxRegex</Filter>
     </Text>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Resource.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="CLOUDS.ico" />
+  </ItemGroup>
 </Project>