stand alones and fixes

CLOUDS-Interactive-Documentary · May 27, 2014 · 7b7a70f · 7b7a70f
1 parent b57369e
commit 7b7a70f
Show file tree

Hide file tree

Showing 15 changed files with 1,053 additions and 138 deletions.
diff --git a/CloudsLibrary/src/RGBD/CloudsPlaybackController.cpp b/CloudsLibrary/src/RGBD/CloudsPlaybackController.cpp
@@ -175,65 +175,34 @@ void CloudsPlaybackController::threadedFunction(){
 	parser.loadFromFiles();
 	if(!isThreadRunning()) return;
 
-	if(!ofFile::doesFileExist(GetCloudsDataPath() + "CloudsMovieDirectory.txt")){
-		ofSystemAlertDialog("Could not find movie file path. \
-							Create a file called CloudsMovieDirectory.txt \
-							that contains one line, the path to your movies folder");
+	cout << "*****LOAD STEP MEDIA" << endl;
+	if(ofFile::doesFileExist(GetCloudsDataPath() + "CloudsMovieDirectory.txt")){
+		parser.setCombinedVideoDirectory(ofBufferFromFile(GetCloudsDataPath() + "CloudsMovieDirectory.txt").getText());
+	}
+	else{
+		string defaultFilePath = GetCloudsDataPath(true) + "media/";
+		if(ofFile::doesFileExist(defaultFilePath)){
+			parser.setCombinedVideoDirectory(defaultFilePath);
+		}
+		else{
+			ofSystemAlertDialog("Could not find movie file path. \
+								Create a file called CloudsMovieDirectory.txt \
+								that contains one line, the path to your movies folder");	
+		}
 	}
 
-	cout << "*****LOAD STEP MEDIA" << endl;
-	parser.setCombinedVideoDirectory(ofBufferFromFile(GetCloudsDataPath() + "CloudsMovieDirectory.txt").getText());
-//<<<<<<< HEAD
-//	cout << "*****LOAD STEP PRESETS" << endl;
-//	visualSystems.loadPresets();
-//  visualSystems.loadCachedDataForSystems();
-
-//	cout << "*****LOAD STEP STORY ENGINE" << endl;
-//	storyEngine.parser = &parser;
-//	storyEngine.visualSystems = &visualSystems;
-//	storyEngine.printDecisions = false;
-//	storyEngine.combinedClipsOnly = true;
-//	storyEngine.setup();
-//=======
-
 	if(!isThreadRunning()) return;
 
 	visualSystems.loadPresets();
 	visualSystems.loadCachedDataForSystems();
 
 	if(!isThreadRunning()) return;
 
-//>>>>>>> master
 	///SOUND
 	cout << "*****LOAD STEP SOUND" << endl;
 	mixer.setup();
 	sound.setup(storyEngine);
 
-//<<<<<<< HEAD
-/*    
-#ifndef OCULUS_RIFT
-	////COMMUNICATION
-	oscSender.setup();
-#endif
-    
-	//END THREADED
-	cout << "*****LOAD STEP RGBD SYSTEM" << endl;
-	rgbdVisualSystem = new CloudsVisualSystemRGBD();
-	rgbdVisualSystem->setup();
-	rgbdVisualSystem->setDrawToScreen(false);
-	
-	cout << "*****LOAD STEP CLUSTER MAP" << endl;
-
-	cout << "*****LOAD STEP INTRO" << endl;
-	introSequence = new CloudsIntroSequence();
-	introSequence->setup();
-	introSequence->setDrawToScreen(false);
-	
-	
-	cout << "*****LOAD STEP HUD" << endl;
-	hud.setup();
-	*/
-//=======
 	sound.enterTunnel();
 
 	if(!isThreadRunning()) return;

diff --git a/CloudsLibrary/src/RGBD/CloudsVisualSystemRGBD.cpp b/CloudsLibrary/src/RGBD/CloudsVisualSystemRGBD.cpp
@@ -1,7 +1,3 @@
-//TODO: replace string keys with RGBDTransitionType
-//TODO: confirm where does duration get set
-
-
 
 #include "CloudsVisualSystemRGBD.h"
 #include "CloudsRGBDVideoPlayer.h"
@@ -181,9 +177,10 @@ void CloudsVisualSystemRGBD::playTestVideo(){
 	//string sourceFile = "E:\\CLOUDS_MEDIA\\Aaron_networked_creativity";
 	//string sourceFile = "E:\\CLOUDS_MEDIA\\Aaron_dreaming_together";
 	//string sourceFile = "E:\\CLOUDS_MEDIA\\Fernanda_Social_dynamics";
-	string sourceFile = "E:\\CLOUDS_MEDIA\\Fernanda_What_people_are_thinking";
+	//string sourceFile = "E:\\CLOUDS_MEDIA\\Fernanda_What_people_are_thinking";
 	//string sourceFile = "E:\\CLOUDS_MEDIA\\Lauren_sentiment_anaylsis";
 	//string sourceFile = "E:\\CLOUDS_MEDIA\\Jen_a_different_mathematics";
+	string sourceFile = GetCloudsDataPath(true) + "media/Jen_a_different_mathematics";
 
 	string filePathMov = sourceFile+".mov";
 	string filePathXml = sourceFile+".xml";
@@ -696,9 +693,11 @@ void CloudsVisualSystemRGBD::selfUpdate(){
 	else {
         //this stops the camera from drifting around as you move closer tothe question
 		//cloudsCamera.driftNoiseSpeed = caughtPortal ? 0 : attenuatedCameraDrift;
-		float cameraDriftDamp = powf(ofMap(minDistanceToQuestion, portalTugDistance.max, portalTugDistance.center(),
-										   1.0, 0,true), 2.0);
-        cloudsCamera.driftNoiseSpeed = attenuatedCameraDrift * cameraDriftDamp;
+		if( portalTugDistance.max != portalTugDistance.center() ){
+			float cameraDriftDamp = powf(ofMap(minDistanceToQuestion, portalTugDistance.max, portalTugDistance.center(),
+											   1.0, 0,true), 2.0);
+			cloudsCamera.driftNoiseSpeed = attenuatedCameraDrift * cameraDriftDamp;
+		}
 	}
 
 	if(bSaveTransition) {

diff --git a/CloudsLibrary/src/StoryEngine/CloudsFCPParser.cpp b/CloudsLibrary/src/StoryEngine/CloudsFCPParser.cpp
@@ -112,7 +112,7 @@ void CloudsFCPParser::parseVOClips(){
 		string fileName = components[0];
 		CloudsClip* clip = new CloudsClip();
 		clip->voiceOverAudio = true;
-		clip->voiceOverAudioPath = GetCloudsDataPath() + "VO/" + fileName;
+		clip->voiceOverAudioPath = GetCloudsDataPath(true) + "VO/" + fileName;
 		clip->sourceVideoFilePath = clip->voiceOverAudioPath;
 		clip->hasMediaAsset = ofFile(clip->voiceOverAudioPath).exists();
 		if (!clip->hasMediaAsset) {

diff --git a/CloudsLibrary/src/VisualSystems/Memory/vs_src/CloudsVisualSystemMemory.cpp b/CloudsLibrary/src/VisualSystems/Memory/vs_src/CloudsVisualSystemMemory.cpp
@@ -9,8 +9,6 @@
 #include "CloudsVisualSystemMemory.h"
 #include "CloudsGlobal.h"
 
-using namespace Tonic;
-
 string CloudsVisualSystemMemory::getSystemName()
 {
 	return "Memory";
@@ -469,20 +467,15 @@ void CloudsVisualSystemMemory::selfDrawBackground()
 }
 
 
-Generator CloudsVisualSystemMemory::buildSynth()
+Tonic::Generator CloudsVisualSystemMemory::buildSynth()
 {
-    string strDir = GetCloudsDataPath(true)+"sound/textures/";
+    string strDir = GetCloudsDataPath(true) + "sound/textures/";
     ofDirectory sdir(strDir);
-//    string strAbsPath = sdir.getAbsolutePath() + "/CPUBeepsFastDrone_.aif";
-    string strAbsPath = ofToDataPath(strDir + "/" + "CPUBeepsFastDrone_.aif", true);
-//    for(int i=0; i<tonicSamples.size();i++){
-//        string strAbsPath = ofToDataPath(strDir + "/" + tonicSamples[i].soundFile, true);
-//        samples[i] = loadAudioFile(strAbsPath);
-//    }
+    string strAbsPath = ofToDataPath(strDir + "/CPUBeepsFastDrone_.aif", true);
 
-    SampleTable sample = loadAudioFile(strAbsPath);
+    Tonic::SampleTable sample = Tonic::loadAudioFile(strAbsPath);
 
-    Generator sampleGen = BufferPlayer().setBuffer(sample).trigger(1).loop(1);
+    Tonic::Generator sampleGen = Tonic::BufferPlayer().setBuffer(sample).trigger(1).loop(1);
 
     return sampleGen * 5;
 }
@@ -492,7 +485,6 @@ void CloudsVisualSystemMemory::audioRequested(ofAudioEventArgs& args)
     synth.fillBufferOfFloats(args.buffer, args.bufferSize, args.nChannels);
 }
 
-
 void CloudsVisualSystemMemory::selfSetupGuis()
 {
 

diff --git a/VSCubeCraft/VSCubeCraft.sln b/VSCubeCraft/VSCubeCraft.sln
@@ -10,40 +10,76 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VSCubeCraft", "VSCubeCraft.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_Oculus|Win32 = Debug_Oculus|Win32
+		Debug_Oculus|x64 = Debug_Oculus|x64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Release_Oculus|Win32 = Release_Oculus|Win32
+		Release_Oculus|x64 = Release_Oculus|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug_Oculus|Win32.ActiveCfg = Debug|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug_Oculus|Win32.Build.0 = Debug|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug_Oculus|x64.ActiveCfg = Debug|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug_Oculus|x64.Build.0 = Debug|x64
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|x64
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|x64
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release_Oculus|Win32.ActiveCfg = Release|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release_Oculus|Win32.Build.0 = Release|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release_Oculus|x64.ActiveCfg = Release|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release_Oculus|x64.Build.0 = Release|x64
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug_Oculus|Win32.ActiveCfg = Debug|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug_Oculus|Win32.Build.0 = Debug|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug_Oculus|x64.ActiveCfg = Debug|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug_Oculus|x64.Build.0 = Debug|x64
 		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|Win32.Build.0 = Debug|Win32
 		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|x64.ActiveCfg = Debug|x64
 		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Debug|x64.Build.0 = Debug|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release_Oculus|Win32.ActiveCfg = Release|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release_Oculus|Win32.Build.0 = Release|Win32
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release_Oculus|x64.ActiveCfg = Release|x64
+		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release_Oculus|x64.Build.0 = Release|x64
 		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|Win32.ActiveCfg = Release|Win32
 		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|Win32.Build.0 = Release|Win32
 		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|x64.ActiveCfg = Release|x64
 		{641DB976-E775-4D72-86EB-897E2C4A0EEE}.Release|x64.Build.0 = Release|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug_Oculus|Win32.ActiveCfg = Debug|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug_Oculus|Win32.Build.0 = Debug|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug_Oculus|x64.ActiveCfg = Debug|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug_Oculus|x64.Build.0 = Debug|x64
 		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|Win32.Build.0 = Debug|Win32
 		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|x64.ActiveCfg = Debug|x64
 		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Debug|x64.Build.0 = Debug|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release_Oculus|Win32.ActiveCfg = Release|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release_Oculus|Win32.Build.0 = Release|Win32
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release_Oculus|x64.ActiveCfg = Release|x64
+		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release_Oculus|x64.Build.0 = Release|x64
 		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|Win32.ActiveCfg = Release|Win32
 		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|Win32.Build.0 = Release|Win32
 		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|x64.ActiveCfg = Release|x64
 		{A72C4F16-CB16-4143-BA5C-5E4FA802D636}.Release|x64.Build.0 = Release|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug_Oculus|Win32.ActiveCfg = Debug_Oculus|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug_Oculus|Win32.Build.0 = Debug_Oculus|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug_Oculus|x64.ActiveCfg = Debug_Oculus|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug_Oculus|x64.Build.0 = Debug_Oculus|x64
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release_Oculus|Win32.ActiveCfg = Release_Oculus|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release_Oculus|Win32.Build.0 = Release_Oculus|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release_Oculus|x64.ActiveCfg = Release_Oculus|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release_Oculus|x64.Build.0 = Release_Oculus|x64
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64