Skip to content

Commit

Permalink
Merge branch 'master' of github.com:obviousjim/CLOUDS into feature-64
Browse files Browse the repository at this point in the history 
Conflicts:
	CloudsData/pajek/CloudsCluster_unpositions.net
	CloudsData/sound/mix.txt
  • Loading branch information
@obviousjim
obviousjim committed Jun 9, 2014
2 parents e3cae20 + 671ae79 commit 265af30
Show file tree
Hide file tree
Showing 125 changed files with 8,291 additions and 573 deletions.
3,823 changes: 3,566 additions & 257 deletions CloudsData/links/clouds_link_db.xml
View file

Large diffs are not rendered by default.

294 changes: 271 additions & 23 deletions CloudsData/links/visualsystems_keywords_db.xml
View file

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion CloudsData/sound/mix.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
0 0.2
1 0.4
10 0.1
100 0.25
Expand Down Expand Up @@ -28,6 +27,18 @@
1319 0.85
1322 0.5
1324 0.4
1325 1
1326 0.2
1327 0.6
1328 0.95
1328_Holden 0.2
1329 1.1
1329_Holden 0.25
1330 0.25
1331 0.2
1332 0.35
1333 0.35
1334 1
135 0.25
14 0.3
15 0.6
Expand Down
2 changes: 2 additions & 0 deletions CloudsData/sound/questions.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
audiovisualization:What does music look like?
beginnings:How does this story begin?
big data:What is powerful about Big Data?
clouds:How does this story end?
data:What is data?
emergence:How does complexity emerge from simple rules?
sketching:How do you sketch with code?
Expand Down
50 changes: 49 additions & 1 deletion CloudsData/sound/soundpresets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5302,7 +5302,7 @@
<pattr name = "energy" value = "1" />
<pattr name = "disabled" value = "0" />
<pattr name = "explicit_topics" value = "" />
<pattr name = "start_question" value = "&quot;programming:What does it feel like to program?&quot;" />
<pattr name = "start_question" value = "&quot;beginnings:How does this story begin?&quot;" />
<pattr name = "amp1" value = "0.076923" />
<pattr name = "amp2" value = "1." />
<pattr name = "amp3" value = "1." />
Expand Down Expand Up @@ -7537,5 +7537,53 @@
<pattr name = "arg_b4" value = "none" />
<pattr name = "arg_b5" value = "none" />
</slot>
<slot number = "1334">
<pattr name = "d1" value = "0 10" />
<pattr name = "d2" value = "0 10" />
<pattr name = "d3" value = "0 10" />
<pattr name = "d4" value = "0 10" />
<pattr name = "d5" value = "5 10" />
<pattr name = "d6" value = "0 10" />
<pattr name = "d7" value = "6 10" />
<pattr name = "d8" value = "0 10" />
<pattr name = "harmony" value = "0" />
<pattr name = "rhythm" value = "0" />
<pattr name = "tempo" value = "120" />
<pattr name = "pname" value = "Minimal Techno 1" />
<pattr name = "orch1" value = "granular_swish" />
<pattr name = "orch2" value = "off" />
<pattr name = "orch3" value = "off" />
<pattr name = "orch4" value = "off" />
<pattr name = "orch5" value = "off" />
<pattr name = "energy" value = "0" />
<pattr name = "disabled" value = "0" />
<pattr name = "explicit_topics" value = "" />
<pattr name = "start_question" value = "&quot;audiovisualization:What does music look like?&quot;" />
<pattr name = "amp1" value = "1." />
<pattr name = "amp2" value = "1." />
<pattr name = "amp3" value = "1." />
<pattr name = "amp4" value = "1." />
<pattr name = "amp5" value = "1." />
<pattr name = "rev1" value = "0.5" />
<pattr name = "rev2" value = "0.5" />
<pattr name = "rev3" value = "0.5" />
<pattr name = "rev4" value = "0.5" />
<pattr name = "rev5" value = "0.5" />
<pattr name = "env1" value = "e_CONSTANT" />
<pattr name = "env2" value = "e_CONSTANT" />
<pattr name = "env3" value = "e_CONSTANT" />
<pattr name = "env4" value = "e_CONSTANT" />
<pattr name = "env5" value = "e_CONSTANT" />
<pattr name = "arg_a2" value = "none" />
<pattr name = "arg_a3" value = "none" />
<pattr name = "arg_a4" value = "none" />
<pattr name = "arg_a5" value = "none" />
<pattr name = "arg_a1" value = "bucket" />
<pattr name = "arg_b1" value = "none" />
<pattr name = "arg_b2" value = "none" />
<pattr name = "arg_b3" value = "none" />
<pattr name = "arg_b4" value = "none" />
<pattr name = "arg_b5" value = "none" />
</slot>
</pattrstorage>

12 changes: 11 additions & 1 deletion CloudsData/visualsystems/RGBDVideo/Presets/ITP_4/BgSettings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Name>BgSettings</Name>
<IsMinified>0</IsMinified>
<XPosition>1.000000000</XPosition>
<YPosition>144.000000000</YPosition>
<YPosition>319.000000000</YPosition>
</Canvas>
<Widget>
<Kind>2</Kind>
Expand All @@ -15,6 +15,16 @@
<Name>BAR GRAD</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>WASH GRAD</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>EXPONENT</Name>
<Value>1.000000000</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>HUE</Name>
Expand Down
30 changes: 30 additions & 0 deletions CloudsData/visualsystems/RGBDVideo/Presets/ITP_4/CamSettings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,36 @@
<Name>ROT-Z</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>InteractiveCamera</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>damping</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>minX</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>maxX</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>minY</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>maxY</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>2</Kind>
<Name>2D</Name>
Expand Down
38 changes: 38 additions & 0 deletions CloudsData/visualsystems/RGBDVideo/Presets/ITP_4/Dust.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<Canvas>
<Kind>42</Kind>
<Name>Dust</Name>
<IsMinified>0</IsMinified>
<XPosition>637.000061035</XPosition>
<YPosition>404.000000000</YPosition>
</Canvas>
<Widget>
<Kind>2</Kind>
<Name>ENABLE</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Dust Alpha</Name>
<Value>1.000000000</Value>
</Widget>
<Widget>
<Kind>44</Kind>
<Name>Dust Count</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Dust Spread</Name>
<Value>100.000000000</Value>
</Widget>
<Widget>
<Kind>6</Kind>
<Name>Dust Point Size</Name>
<HighValue>3.000000000</HighValue>
<LowValue>1.000000000</LowValue>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Dust Size Weight</Name>
<Value>0.200000003</Value>
</Widget>
17 changes: 1 addition & 16 deletions CloudsData/visualsystems/RGBDVideo/Presets/ITP_4/LightSettings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Name>LightSettings</Name>
<IsMinified>0</IsMinified>
<XPosition>1.000000000</XPosition>
<YPosition>431.000000000</YPosition>
<YPosition>662.000000000</YPosition>
</Canvas>
<Widget>
<Kind>2</Kind>
Expand All @@ -15,21 +15,6 @@
<Name>SMOOTH</Name>
<Value>1</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>R</Name>
<Value>0.500000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>G</Name>
<Value>0.500000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>B</Name>
<Value>0.500000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>H</Name>
Expand Down
108 changes: 9 additions & 99 deletions CloudsData/visualsystems/RGBDVideo/Presets/ITP_4/MATERIAL 1Settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,108 +2,13 @@
<Kind>42</Kind>
<Name>MATERIAL 1Settings</Name>
<IsMinified>0</IsMinified>
<XPosition>425.000061035</XPosition>
<YPosition>1.000000000</YPosition>
<XPosition>213.000045776</XPosition>
<YPosition>518.000000000</YPosition>
</Canvas>
<Widget>
<Kind>25</Kind>
<Name>AR</Name>
<Value>0.800000012</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>AG</Name>
<Value>0.800000012</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>AB</Name>
<Value>0.800000012</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>AR</Name>
<Value>0.800000012</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>AG</Name>
<Value>0.800000012</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>AB</Name>
<Value>0.800000012</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>ER</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>EG</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>EB</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>SR</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>SG</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>SB</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>SHINY</Name>
<Value>0.200000003</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>AH</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>AS</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>AV</Name>
<Value>0.800000012</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>DH</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>DS</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>DV</Name>
<Value>0.800000012</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>EV</Name>
<Value>0.000000000</Value>
<Name>EH</Name>
<Value>1.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
Expand All @@ -130,3 +35,8 @@
<Name>SV</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>25</Kind>
<Name>SHINY</Name>
<Value>0.200000003</Value>
</Widget>
27 changes: 27 additions & 0 deletions CloudsData/visualsystems/RGBDVideo/Presets/ITP_4/Msh.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<Canvas>
<Kind>42</Kind>
<Name>Msh</Name>
<IsMinified>0</IsMinified>
<XPosition>637.000061035</XPosition>
<YPosition>116.000000000</YPosition>
</Canvas>
<Widget>
<Kind>2</Kind>
<Name>ENABLE</Name>
<Value>0</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Mesh Alpha</Name>
<Value>0.000000000</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Mesh X Simplify</Name>
<Value>2.000000000</Value>
</Widget>
<Widget>
<Kind>4</Kind>
<Name>Mesh Y Simplify</Name>
<Value>2.000000000</Value>
</Widget>
Loading

0 comments on commit 265af30

Please sign in to comment.