fixing project files

CLOUDS-Interactive-Documentary · Jan 7, 2014 · 2f31d9f · 2f31d9f
1 parent 46212b5
commit 2f31d9f
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 13 deletions.
diff --git a/CloudsData/links/visualsystems_keywords_db.xml b/CloudsData/links/visualsystems_keywords_db.xml
@@ -2179,6 +2179,16 @@
     <oculus>0</oculus>
     <sound>0</sound>
 </system>
+<system name="Circuit_JG_AggregiousSweep">
+    <keywords></keywords>
+    <links></links>
+    <suppressions></suppressions>
+    <comments></comments>
+    <grade></grade>
+    <enabled>0</enabled>
+    <oculus>0</oculus>
+    <sound>0</sound>
+</system>
 <system name="Cities_Archiving">
     <keywords>Big data|memory|data ownership|data mining|big data</keywords>
     <links></links>

diff --git a/CloudsLibrary/src/SecondaryDisplay/Receiver/CloudsSecondaryDisplayController.cpp b/CloudsLibrary/src/SecondaryDisplay/Receiver/CloudsSecondaryDisplayController.cpp
@@ -376,17 +376,17 @@ void CloudsSecondaryDisplayController::animateOut(){
 }
 
 void CloudsSecondaryDisplayController::draw(){
-
+
+    //return;
+
 	displayTarget.begin();
     ofEnableAlphaBlending();
-
 	clusterMap.selfPostDraw();
 
-    SVGMesh* t;
-    
-    shader.setUniform1f("alphaAmt", playhead);
+//
+//don't set uniforms if 
+//    shader.setUniform1f("alphaAmt", playhead);
     float margin = 60;
-
 
     if(displayMode == "BIO"){
         ////question
@@ -410,7 +410,7 @@ void CloudsSecondaryDisplayController::draw(){
             //cout << "playhead: "<<playhead<<endl;
 
 			shader.begin();
-            shader.setUniform1f("alphaAmt", playhead);
+			shader.setUniform1f("alphaAmt", playhead);
 			bioLayout.draw();
 			shader.end();
 
@@ -454,9 +454,9 @@ void CloudsSecondaryDisplayController::draw(){
             if(color)
                 ofSetColor(lightBlue);
 
-                ////location
-                if(color)
-                    ofSetColor(darkBlue);
+			////location
+			if(color)
+				ofSetColor(darkBlue);
 
             string loc = ofToUpper(currentSpeaker.location2);
             //float left
@@ -526,7 +526,8 @@ void CloudsSecondaryDisplayController::draw(){
     }
 
 	displayTarget.end();
-
+
+
 	ofRectangle screenRect(0,0,ofGetWidth(), ofGetHeight());
 	ofRectangle targetRect(0,0,displayTarget.getWidth(),displayTarget.getHeight());
 	targetRect.scaleTo(screenRect);

diff --git a/CloudsLibrary/src/VisualSystemsLibrary/CloudsRGBDCamera.cpp b/CloudsLibrary/src/VisualSystemsLibrary/CloudsRGBDCamera.cpp
@@ -24,6 +24,9 @@ CloudsRGBDCamera::CloudsRGBDCamera(){
 	damp = .1;
 	driftNoisePosition = 0;
 
+	canvasWidth = ofGetWidth();
+	canvasHeight = ofGetHeight();
+
 	maxDriftAngle = 0;
 //	driftNoiseDensity = 0;
 //	driftNoiseSpeed = ;

diff --git a/CloudsLibrary/src/VisualSystemsLibrary/CloudsVisualSystem.cpp b/CloudsLibrary/src/VisualSystemsLibrary/CloudsVisualSystem.cpp
@@ -3095,6 +3095,7 @@ void CloudsVisualSystem::selfPostDraw(){
                                                        CloudsVisualSystem::getSharedRenderTarget().getWidth(),
                                                       -CloudsVisualSystem::getSharedRenderTarget().getHeight());
 
+	//TODO REPLACE WITH REAL CURSOR SYSTEM
     if(bDrawCursor){
         ofPushMatrix();
         ofPushStyle();
@@ -3120,9 +3121,8 @@ void CloudsVisualSystem::selfPostDraw(){
         }
         ofPopStyle();
         ofPopMatrix();
-
     }
-
+	///END TODO
 
 #endif
 

diff --git a/VSClusterMap/ClusterMap.xcodeproj/project.pbxproj b/VSClusterMap/ClusterMap.xcodeproj/project.pbxproj
@@ -207,6 +207,8 @@
 		E72446E316573AD000D70E01 /* ofxEasingQuint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E72446AD16573AD000D70E01 /* ofxEasingQuint.cpp */; };
 		E72446E416573AD000D70E01 /* ofxEasingSine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E72446AF16573AD000D70E01 /* ofxEasingSine.cpp */; };
 		E72446E516573AD000D70E01 /* ofxTween.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E72446B116573AD000D70E01 /* ofxTween.cpp */; };
+		E7302BA1187BABC40079C5B8 /* ofxSystemTextbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = E7302BA0187BABC40079C5B8 /* ofxSystemTextbox.mm */; };
+		E7302BA2187BABC40079C5B8 /* ofxSystemTextbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = E7302BA0187BABC40079C5B8 /* ofxSystemTextbox.mm */; };
 		E761F4D81622CA3D00029E43 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E761F4D71622CA3D00029E43 /* Accelerate.framework */; };
 		E7B3C77B17EE291600581ACD /* CloudsClip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E7B3C75F17EE291500581ACD /* CloudsClip.cpp */; };
 		E7B3C77D17EE291600581ACD /* CloudsDichotomy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E7B3C76317EE291500581ACD /* CloudsDichotomy.cpp */; };
@@ -548,6 +550,8 @@
 		E72446B016573AD000D70E01 /* ofxEasingSine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxEasingSine.h; sourceTree = "<group>"; };
 		E72446B116573AD000D70E01 /* ofxTween.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxTween.cpp; sourceTree = "<group>"; };
 		E72446B216573AD000D70E01 /* ofxTween.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxTween.h; sourceTree = "<group>"; };
+		E7302B9F187BABC40079C5B8 /* ofxSystemTextbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxSystemTextbox.h; sourceTree = "<group>"; };
+		E7302BA0187BABC40079C5B8 /* ofxSystemTextbox.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ofxSystemTextbox.mm; sourceTree = "<group>"; };
 		E761F4D71622CA3D00029E43 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = /System/Library/Frameworks/Accelerate.framework; sourceTree = "<absolute>"; };
 		E7B3C75F17EE291500581ACD /* CloudsClip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CloudsClip.cpp; sourceTree = "<group>"; };
 		E7B3C76017EE291500581ACD /* CloudsClip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CloudsClip.h; sourceTree = "<group>"; };
@@ -906,6 +910,8 @@
 		E704D00A17B3BB3600F77528 /* VisualSystemsLibrary */ = {
 			isa = PBXGroup;
 			children = (
+				E7302B9F187BABC40079C5B8 /* ofxSystemTextbox.h */,
+				E7302BA0187BABC40079C5B8 /* ofxSystemTextbox.mm */,
 				E704D01217B3BB3600F77528 /* ofxLight.h */,
 				E704D00D17B3BB3600F77528 /* CloudsRGBDCamera.h */,
 				E704D00C17B3BB3600F77528 /* CloudsRGBDCamera.cpp */,
@@ -1668,6 +1674,7 @@
 				185CE9B6184A5FC800F43977 /* ofxFTGLSimpleLayout.cpp in Sources */,
 				E7D483701860C5D000BE9BF8 /* CloudsInput.cpp in Sources */,
 				E7D483721860C5D000BE9BF8 /* CloudsInputMouse.cpp in Sources */,
+				E7302BA1187BABC40079C5B8 /* ofxSystemTextbox.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1766,6 +1773,7 @@
 				E700BA8F18762768003A8167 /* CloudsInput.cpp in Sources */,
 				E700BA9018762768003A8167 /* CloudsInputMouse.cpp in Sources */,
 				E700BC2A18762C18003A8167 /* ofxOculusRift.cpp in Sources */,
+				E7302BA2187BABC40079C5B8 /* ofxSystemTextbox.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/VSCode/Code.xcodeproj/project.pbxproj b/VSCode/Code.xcodeproj/project.pbxproj
@@ -94,6 +94,8 @@
 		E4C2424810CC5A17004149E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424510CC5A17004149E2 /* Cocoa.framework */; };
 		E4C2424910CC5A17004149E2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E4C2424610CC5A17004149E2 /* IOKit.framework */; };
 		E4EB6799138ADC1D00A09F29 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; };
+		E7302B9B187BA7EE0079C5B8 /* ofxSystemTextbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = E7302B9A187BA7EE0079C5B8 /* ofxSystemTextbox.mm */; };
+		E7302B9C187BA7EE0079C5B8 /* ofxSystemTextbox.mm in Sources */ = {isa = PBXBuildFile; fileRef = E7302B9A187BA7EE0079C5B8 /* ofxSystemTextbox.mm */; };
 		E73801FA183C871B0018AB96 /* ofxOculusRift.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E7380142183C871A0018AB96 /* ofxOculusRift.cpp */; };
 		E738FF7A183C86F50018AB96 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1D0A3A1BDC003C02F2 /* main.cpp */; };
 		E738FF7B183C86F50018AB96 /* testApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */; };
@@ -525,6 +527,8 @@
 		E4C2424610CC5A17004149E2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
 		E4EB691F138AFCF100A09F29 /* CoreOF.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = CoreOF.xcconfig; path = ../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig; sourceTree = SOURCE_ROOT; };
 		E4EB6923138AFD0F00A09F29 /* Project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Project.xcconfig; sourceTree = "<group>"; };
+		E7302B99187BA7EE0079C5B8 /* ofxSystemTextbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxSystemTextbox.h; path = VisualSystemsLibrary/ofxSystemTextbox.h; sourceTree = "<group>"; };
+		E7302B9A187BA7EE0079C5B8 /* ofxSystemTextbox.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ofxSystemTextbox.mm; path = VisualSystemsLibrary/ofxSystemTextbox.mm; sourceTree = "<group>"; };
 		E7380142183C871A0018AB96 /* ofxOculusRift.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxOculusRift.cpp; sourceTree = "<group>"; };
 		E7380143183C871A0018AB96 /* ofxOculusRift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxOculusRift.h; sourceTree = "<group>"; };
 		E738FFE1183C86F50018AB96 /* CodeOculus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CodeOculus.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1492,6 +1496,8 @@
 		E7DD71F117DBC08D00AFB2DD /* src */ = {
 			isa = PBXGroup;
 			children = (
+				E7302B99187BA7EE0079C5B8 /* ofxSystemTextbox.h */,
+				E7302B9A187BA7EE0079C5B8 /* ofxSystemTextbox.mm */,
 				E7DD71F217DBC08D00AFB2DD /* CloudsGlobal.h */,
 				E7E442C4185EB9DB00CD1953 /* Input */,
 				E7DD846117DBC0A500AFB2DD /* VisualSystemsLibrary */,
@@ -1739,6 +1745,7 @@
 				E75BC31F186CF5F500582E19 /* Panel.cpp in Sources */,
 				E7C289B0187768AC00A0C07F /* PanelTenPrint.cpp in Sources */,
 				E7C289B318777E8600A0C07F /* PanelConsole.cpp in Sources */,
+				E7302B9B187BA7EE0079C5B8 /* ofxSystemTextbox.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1832,6 +1839,7 @@
 				E75BC31C186CF5DD00582E19 /* PanelGraph.cpp in Sources */,
 				E75BC320186CF5F500582E19 /* Panel.cpp in Sources */,
 				E7C289B418777E8600A0C07F /* PanelConsole.cpp in Sources */,
+				E7302B9C187BA7EE0079C5B8 /* ofxSystemTextbox.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};