getting the visuals going in the flow

CLOUDS-Interactive-Documentary · May 3, 2015 · f70e3d7 · f70e3d7
1 parent ee3249b
commit f70e3d7
Show file tree

Hide file tree

Showing 22 changed files with 320 additions and 135 deletions.
diff --git a/CLOUDS/CLOUDS.xcodeproj/project.pbxproj b/CLOUDS/CLOUDS.xcodeproj/project.pbxproj
@@ -647,6 +647,12 @@
 		038034CB1948167700AFD40C /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2E80745D1820B8AB00A003A0 /* CoreMedia.framework */; };
 		038034CC1948167700AFD40C /* libopencv_ocl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E755D24A1943EDC000AA81C1 /* libopencv_ocl.a */; };
 		038034CF1948167700AFD40C /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; };
+		0385CDB81AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0385CDB61AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp */; };
+		0385CDB91AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0385CDB61AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp */; };
+		0385CDBA1AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0385CDB61AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp */; };
+		0385CDBB1AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0385CDB61AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp */; };
+		0385CDBC1AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0385CDB61AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp */; };
+		0385CDBD1AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0385CDB61AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp */; };
 		03A0F4A81947A0850071CF4B /* Distance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E73DAB93189F3644006C9E4E /* Distance.cpp */; };
 		03A0F4A91947A0850071CF4B /* ParticleConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E7D8231A18BEBD6E00C1EB93 /* ParticleConnection.cpp */; };
 		03A0F4AA1947A0850071CF4B /* MovingBall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E755D6EA1943F56F00AA81C1 /* MovingBall.cpp */; };
@@ -4106,6 +4112,8 @@
 		033BCA411AAA562900BC1FEC /* CLOUDS.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = CLOUDS.icns; sourceTree = "<group>"; };
 		035F4F981A9DA6A0003726D9 /* libovr.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libovr.a; path = ../../../addons/ofxOculusDK2/libs/LibOVR/Lib/MacOS/Release/libovr.a; sourceTree = "<group>"; };
 		038034D31948167700AFD40C /* CLOUDS_SCREENING_Debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CLOUDS_SCREENING_Debug.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		0385CDB61AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CloudsVisualSystemVisuals.cpp; sourceTree = "<group>"; };
+		0385CDB71AF5B8D8000553F2 /* CloudsVisualSystemVisuals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CloudsVisualSystemVisuals.h; sourceTree = "<group>"; };
 		03A0F73D1947A0850071CF4B /* CLOUDS_KINECT_Debug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CLOUDS_KINECT_Debug.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		03E28DA11A9D767D005AA181 /* CloudsCalibrationNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CloudsCalibrationNode.cpp; sourceTree = "<group>"; };
 		03E28DA21A9D767D005AA181 /* CloudsCalibrationNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CloudsCalibrationNode.h; sourceTree = "<group>"; };
@@ -6216,6 +6224,23 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		0385CDB41AF5B8D8000553F2 /* Visuals */ = {
+			isa = PBXGroup;
+			children = (
+				0385CDB51AF5B8D8000553F2 /* vs_src */,
+			);
+			path = Visuals;
+			sourceTree = "<group>";
+		};
+		0385CDB51AF5B8D8000553F2 /* vs_src */ = {
+			isa = PBXGroup;
+			children = (
+				0385CDB61AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp */,
+				0385CDB71AF5B8D8000553F2 /* CloudsVisualSystemVisuals.h */,
+			);
+			path = vs_src;
+			sourceTree = "<group>";
+		};
 		03E28DA01A9D767D005AA181 /* Core */ = {
 			isa = PBXGroup;
 			children = (
@@ -8537,6 +8562,7 @@
 		E7D822B718BEBD6E00C1EB93 /* VisualSystems */ = {
 			isa = PBXGroup;
 			children = (
+				0385CDB41AF5B8D8000553F2 /* Visuals */,
 				E755D6F71943F6CC00AA81C1 /* Paradox */,
 				E7D822B818BEBD6E00C1EB93 /* 2DVideo */,
 				E7D822BC18BEBD6E00C1EB93 /* 3DModelLoader */,
@@ -11908,6 +11934,7 @@
 				038033A01948167700AFD40C /* CloudsVisualSystemBalloons.cpp in Sources */,
 				038033A11948167700AFD40C /* CloudsVisualSystemGPUParticles.cpp in Sources */,
 				038033A21948167700AFD40C /* LimbDarkeningPass.cpp in Sources */,
+				0385CDBB1AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp in Sources */,
 				038033A31948167700AFD40C /* b2Distance.cpp in Sources */,
 				038033A41948167700AFD40C /* Brush.cpp in Sources */,
 				038033A51948167700AFD40C /* ofxUISortableList.cpp in Sources */,
@@ -12503,6 +12530,7 @@
 				03A0F60A1947A0850071CF4B /* CloudsVisualSystemBalloons.cpp in Sources */,
 				03A0F60B1947A0850071CF4B /* CloudsVisualSystemGPUParticles.cpp in Sources */,
 				03A0F60C1947A0850071CF4B /* LimbDarkeningPass.cpp in Sources */,
+				0385CDBA1AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp in Sources */,
 				03A0F60D1947A0850071CF4B /* b2Distance.cpp in Sources */,
 				03A0F60E1947A0850071CF4B /* Brush.cpp in Sources */,
 				03A0F60F1947A0850071CF4B /* ofxUISortableList.cpp in Sources */,
@@ -12832,6 +12860,7 @@
 				642721D11AE81E5200A13289 /* b2Island.cpp in Sources */,
 				642721D21AE81E5200A13289 /* ofxUIImage.cpp in Sources */,
 				642721D31AE81E5200A13289 /* kiss_fftr.c in Sources */,
+				0385CDBC1AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp in Sources */,
 				642721D41AE81E5200A13289 /* CloudsVisualSystemScrape.cpp in Sources */,
 				642721D51AE81E5200A13289 /* Creature.cpp in Sources */,
 				642721D61AE81E5200A13289 /* b2World.cpp in Sources */,
@@ -13556,6 +13585,7 @@
 				642724F11AE81EAF00A13289 /* Camera.cpp in Sources */,
 				642724F21AE81EAF00A13289 /* CloudsVisualSystem2DVideo.cpp in Sources */,
 				642724F31AE81EAF00A13289 /* ofxUIBiLabelSlider.cpp in Sources */,
+				0385CDBD1AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp in Sources */,
 				642724F41AE81EAF00A13289 /* SegmentedPath.cpp in Sources */,
 				642724F51AE81EAF00A13289 /* CloudsVisualSystemThingsInTheDark.cpp in Sources */,
 				642724F61AE81EAF00A13289 /* StopAction.cpp in Sources */,
@@ -14305,6 +14335,7 @@
 				E755D6DD1943F50E00AA81C1 /* CloudsVisualSystemBalloons.cpp in Sources */,
 				E7D8259E18BEBD7000C1EB93 /* CloudsVisualSystemGPUParticles.cpp in Sources */,
 				E73DA8DA189F3622006C9E4E /* LimbDarkeningPass.cpp in Sources */,
+				0385CDB81AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp in Sources */,
 				E73DA6EA189F1CEA006C9E4E /* b2Distance.cpp in Sources */,
 				E7D825D518BEBD7000C1EB93 /* Brush.cpp in Sources */,
 				E755D60C1943F2AF00AA81C1 /* ofxUISortableList.cpp in Sources */,
@@ -14982,6 +15013,7 @@
 				E7DDC270194437EC00E61D75 /* CloudsVisualSystemRandomDigits2.cpp in Sources */,
 				E7DDC271194437EC00E61D75 /* PathPoint.cpp in Sources */,
 				E7DDC272194437EC00E61D75 /* CloudsVisualSystemColony.cpp in Sources */,
+				0385CDB91AF5B8D8000553F2 /* CloudsVisualSystemVisuals.cpp in Sources */,
 				E7DDC273194437EC00E61D75 /* ofxTLImageSequence.cpp in Sources */,
 				E7DDC274194437EC00E61D75 /* CloudsVisualSystemRulez.cpp in Sources */,
 				E7DDC275194437EC00E61D75 /* ofxUIRangeSlider.cpp in Sources */,

diff --git a/CloudsData/visualsystems/Visuals/Presets/VisualPicker_fast/Custom.xml b/CloudsData/visualsystems/Visuals/Presets/VisualPicker_fast/Custom.xml
@@ -2,26 +2,31 @@
     <Kind>40</Kind>
     <Name>Custom</Name>
     <IsMinified>0</IsMinified>
-    <XPosition>271.000000000</XPosition>
-    <YPosition>319.000000000</YPosition>
+    <XPosition>311.000000000</XPosition>
+    <YPosition>255.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>42</Kind>
-    <Name>ROWS</Name>
-    <Value>6</Value>
+    <Name>CELLS WIDE</Name>
+    <Value>5</Value>
 </Widget>
 <Widget>
     <Kind>42</Kind>
-    <Name>COLUMNS</Name>
-    <Value>6</Value>
+    <Name>CELLS TALL</Name>
+    <Value>5</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
     <Name>RADIUS</Name>
-    <Value>354.679779053</Value>
+    <Value>226.600982666</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
     <Name>ROW HEIGHT</Name>
-    <Value>500.000000000</Value>
+    <Value>263.546783447</Value>
+</Widget>
+<Widget>
+    <Kind>4</Kind>
+    <Name>IMAGE SCALE</Name>
+    <Value>0.137931034</Value>
 </Widget>
diff --git a/CloudsData/visualsystems/Visuals/Presets/VisualPicker_fast/Presets.xml b/CloudsData/visualsystems/Visuals/Presets/VisualPicker_fast/Presets.xml
@@ -1,12 +1,17 @@
 <Canvas>
     <Kind>40</Kind>
     <Name>Presets</Name>
-    <IsMinified>0</IsMinified>
-    <XPosition>620.000000000</XPosition>
-    <YPosition>177.000000000</YPosition>
+    <IsMinified>1</IsMinified>
+    <XPosition>1.000000000</XPosition>
+    <YPosition>210.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>2</Kind>
-    <Name>VisualPicker</Name>
-    <Value>1</Value>
+    <Name>VisualPicker_fast</Name>
+    <Value>0</Value>
+</Widget>
+<Widget>
+    <Kind>2</Kind>
+    <Name>VisualPicker_pretty</Name>
+    <Value>0</Value>
 </Widget>
diff --git a/CloudsData/visualsystems/Visuals/Presets/VisualPicker_fast/Settings.xml b/CloudsData/visualsystems/Visuals/Presets/VisualPicker_fast/Settings.xml
@@ -2,8 +2,8 @@
     <Kind>40</Kind>
     <Name>Settings</Name>
     <IsMinified>0</IsMinified>
-    <XPosition>839.000000000</XPosition>
-    <YPosition>185.000000000</YPosition>
+    <XPosition>639.000000000</XPosition>
+    <YPosition>180.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>2</Kind>

diff --git a/CloudsData/visualsystems/Visuals/Presets/VisualPicker_fast/SystemSettings.xml b/CloudsData/visualsystems/Visuals/Presets/VisualPicker_fast/SystemSettings.xml
@@ -2,8 +2,8 @@
     <Kind>40</Kind>
     <Name>SystemSettings</Name>
     <IsMinified>1</IsMinified>
-    <XPosition>317.000000000</XPosition>
-    <YPosition>149.000000000</YPosition>
+    <XPosition>1.000000000</XPosition>
+    <YPosition>43.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>2</Kind>

diff --git a/...Data/visualsystems/Visuals/Presets/VisualPicker_fast/Timeline/VisualPicker_fast_inout.xml b/...Data/visualsystems/Visuals/Presets/VisualPicker_fast/Timeline/VisualPicker_fast_inout.xml
@@ -0,0 +1,4 @@
+<inout>
+    <in>0.000000000</in>
+    <out>1.000000000</out>
+</inout>
diff --git a/...ata/visualsystems/Visuals/Presets/VisualPicker_fast/Timeline/VisualPicker_fast_zoomer.xml b/...ata/visualsystems/Visuals/Presets/VisualPicker_fast/Timeline/VisualPicker_fast_zoomer.xml
@@ -0,0 +1,4 @@
+<zoom>
+    <min>0.000000000</min>
+    <max>1.000000000</max>
+</zoom>
diff --git a/CloudsData/visualsystems/Visuals/Presets/VisualPicker_fast/ofEasyCamSettings b/CloudsData/visualsystems/Visuals/Presets/VisualPicker_fast/ofEasyCamSettings
@@ -1,9 +1,9 @@
 --------------ofCamera parameters--------------
 transformMatrix
--0.974576, -0.147036, 0.169065,        0
--0.117167, 0.977606, 0.174814,        0
--0.190983,  0.15056, -0.969979,        0
--826.184,  355.721, -3891.69,        1
+0.172561, 0.010862, -0.984939,        0
+0.0962631, -0.995338, 0.00588861,        0
+-0.980284, -0.0958295, -0.172803,        0
+-201.502, -391.427, -31.8484,        1
 fov
 60
 near

diff --git a/CloudsData/visualsystems/Visuals/Presets/VisualPicker_pretty/Custom.xml b/CloudsData/visualsystems/Visuals/Presets/VisualPicker_pretty/Custom.xml
@@ -1,27 +1,42 @@
 <Canvas>
     <Kind>40</Kind>
     <Name>Custom</Name>
-    <IsMinified>0</IsMinified>
-    <XPosition>271.000000000</XPosition>
-    <YPosition>319.000000000</YPosition>
+    <IsMinified>1</IsMinified>
+    <XPosition>877.000000000</XPosition>
+    <YPosition>97.000000000</YPosition>
 </Canvas>
+<Widget>
+    <Kind>2</Kind>
+    <Name>FREE CAM</Name>
+    <Value>0</Value>
+</Widget>
 <Widget>
     <Kind>42</Kind>
-    <Name>ROWS</Name>
-    <Value>6</Value>
+    <Name>CELLS WIDE</Name>
+    <Value>5</Value>
 </Widget>
 <Widget>
     <Kind>42</Kind>
-    <Name>COLUMNS</Name>
-    <Value>6</Value>
+    <Name>CELLS TALL</Name>
+    <Value>5</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
     <Name>RADIUS</Name>
-    <Value>354.679779053</Value>
+    <Value>211.822662354</Value>
 </Widget>
 <Widget>
     <Kind>4</Kind>
     <Name>ROW HEIGHT</Name>
-    <Value>500.000000000</Value>
+    <Value>179.802947998</Value>
+</Widget>
+<Widget>
+    <Kind>4</Kind>
+    <Name>IMAGE SCALE</Name>
+    <Value>0.137931034</Value>
+</Widget>
+<Widget>
+    <Kind>4</Kind>
+    <Name>CAMERA BACKUP DIST</Name>
+    <Value>396.551727295</Value>
 </Widget>
diff --git a/CloudsData/visualsystems/Visuals/Presets/VisualPicker_pretty/Presets.xml b/CloudsData/visualsystems/Visuals/Presets/VisualPicker_pretty/Presets.xml
@@ -1,12 +1,17 @@
 <Canvas>
     <Kind>40</Kind>
     <Name>Presets</Name>
-    <IsMinified>0</IsMinified>
-    <XPosition>620.000000000</XPosition>
-    <YPosition>177.000000000</YPosition>
+    <IsMinified>1</IsMinified>
+    <XPosition>617.000000000</XPosition>
+    <YPosition>221.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>2</Kind>
-    <Name>VisualPicker</Name>
-    <Value>1</Value>
+    <Name>VisualPicker_fast</Name>
+    <Value>0</Value>
+</Widget>
+<Widget>
+    <Kind>2</Kind>
+    <Name>VisualPicker_pretty</Name>
+    <Value>0</Value>
 </Widget>
diff --git a/CloudsData/visualsystems/Visuals/Presets/VisualPicker_pretty/Settings.xml b/CloudsData/visualsystems/Visuals/Presets/VisualPicker_pretty/Settings.xml
@@ -2,8 +2,8 @@
     <Kind>40</Kind>
     <Name>Settings</Name>
     <IsMinified>0</IsMinified>
-    <XPosition>839.000000000</XPosition>
-    <YPosition>185.000000000</YPosition>
+    <XPosition>408.000000000</XPosition>
+    <YPosition>96.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>2</Kind>

diff --git a/CloudsData/visualsystems/Visuals/Presets/VisualPicker_pretty/SystemSettings.xml b/CloudsData/visualsystems/Visuals/Presets/VisualPicker_pretty/SystemSettings.xml
@@ -2,8 +2,8 @@
     <Kind>40</Kind>
     <Name>SystemSettings</Name>
     <IsMinified>1</IsMinified>
-    <XPosition>317.000000000</XPosition>
-    <YPosition>149.000000000</YPosition>
+    <XPosition>466.000000000</XPosition>
+    <YPosition>370.000000000</YPosition>
 </Canvas>
 <Widget>
     <Kind>2</Kind>

diff --git a/.../visualsystems/Visuals/Presets/VisualPicker_pretty/Timeline/VisualPicker_pretty_inout.xml b/.../visualsystems/Visuals/Presets/VisualPicker_pretty/Timeline/VisualPicker_pretty_inout.xml
@@ -0,0 +1,4 @@
+<inout>
+    <in>0.000000000</in>
+    <out>1.000000000</out>
+</inout>
diff --git a/...visualsystems/Visuals/Presets/VisualPicker_pretty/Timeline/VisualPicker_pretty_zoomer.xml b/...visualsystems/Visuals/Presets/VisualPicker_pretty/Timeline/VisualPicker_pretty_zoomer.xml
@@ -0,0 +1,4 @@
+<zoom>
+    <min>0.000000000</min>
+    <max>1.000000000</max>
+</zoom>
diff --git a/CloudsData/visualsystems/Visuals/Presets/VisualPicker_pretty/ofEasyCamSettings b/CloudsData/visualsystems/Visuals/Presets/VisualPicker_pretty/ofEasyCamSettings
@@ -1,9 +1,9 @@
 --------------ofCamera parameters--------------
 transformMatrix
--0.974576, -0.147036, 0.169065,        0
--0.117167, 0.977606, 0.174814,        0
--0.190983,  0.15056, -0.969979,        0
--826.184,  355.721, -3891.69,        1
+0.0796453, 0.0311649, -0.996336,        0
+-0.0227816, -0.999193, -0.0330754,        0
+-0.996564, 0.0253324, -0.0788712,        0
+-248.755, -363.864,  -23.584,        1
 fov
 60
 near