diff --git a/show/dance2008/config.n3 b/show/dance2008/config.n3 --- a/show/dance2008/config.n3 +++ b/show/dance2008/config.n3 @@ -48,14 +48,14 @@ sub:orange :group group:strip; :order 1 sub:green :group group:strip; :order 2 . sub:blue :group group:strip; :order 3. -group:live is :group of -sub:front, -sub:patios, -sub:sharlyn, -sub:scoop, -sub:cyc, -sub:house -. +sub:sharlyn :group group:live; :order 1 . +sub:cyc :group group:live; :order 2 . +sub:house :group group:live; :order 3 . +sub:scoop :group group:live; :order 4 . +sub:front :group group:live; :order 5 . +sub:curtain :group group:live; :order 6 . + + group:song is :group of sub:song1, sub:song2, sub:song3, sub:song4, diff --git a/show/dance2008/curves/song11-song11 b/show/dance2008/curves/song11-song11 --- a/show/dance2008/curves/song11-song11 +++ b/show/dance2008/curves/song11-song11 @@ -13,6 +13,6 @@ 286.806018335 0.473684210526 288.930465912 0.0 289.525055225 0.0 291.912606785 1.0 -300.362071781 1 +300.362071781 1.0 302.165512257 0.0 304.367687075 0.0 diff --git a/show/dance2008/curves/song14-blacklight b/show/dance2008/curves/song14-blacklight --- a/show/dance2008/curves/song14-blacklight +++ b/show/dance2008/curves/song14-blacklight @@ -1,6 +1,6 @@ -4.0 0.0 -89.9912647466 0 -90.3624112644 1 -146.725675691 1 -146.832377547 0 +89.9912647466 0.0 +90.3624112644 1.0 +146.725675691 1.0 +146.832377547 0.0 278.807823129 0.0 diff --git a/show/dance2008/curves/song14-bow b/show/dance2008/curves/song14-bow --- a/show/dance2008/curves/song14-bow +++ b/show/dance2008/curves/song14-bow @@ -1,6 +1,6 @@ --4 0 -181.131050122 0 -181.341179138 1 -182.215002756 1 -182.24548464 0 -278.807823129 0 +-4.0 0.0 +181.131050122 0.0 +181.341179138 1.0 +182.215002756 1.0 +182.24548464 0.0 +278.807823129 0.0 diff --git a/show/dance2008/curves/song14-hair b/show/dance2008/curves/song14-hair --- a/show/dance2008/curves/song14-hair +++ b/show/dance2008/curves/song14-hair @@ -1,6 +1,6 @@ --4 0 -182.486526266 0 -183.188998901 1 -261.846640136 1 -262.100321145 0 -278.807823129 0 +-4.0 0.0 +182.486526266 0.0 +183.188998901 1.0 +261.846640136 1.0 +262.100321145 0.0 +278.807823129 0.0 diff --git a/show/dance2008/curves/song14-song14 b/show/dance2008/curves/song14-song14 --- a/show/dance2008/curves/song14-song14 +++ b/show/dance2008/curves/song14-song14 @@ -1,15 +1,15 @@ -4.0 0.0 --0.453704090356 0 -0.825883574424 1 +-0.453704090356 0.0 +0.825883574424 1.0 90.1098489646 1.0 92.6823560179 0.0 98.4688314876 0.0847457627119 114.162047574 0.28813559322 140.908489304 0.28813559322 -145.775061022 1 -177.80183158 1 +145.775061022 1.0 +177.80183158 1.0 180.84918553 0.881355932203 -181.187280882 1 +181.187280882 1.0 274.060769738 1.0 276.925853561 0.0 278.807823129 0.0 diff --git a/show/dance2008/curves/song15-song15first b/show/dance2008/curves/song15-song15first --- a/show/dance2008/curves/song15-song15first +++ b/show/dance2008/curves/song15-song15first @@ -1,7 +1,7 @@ -4.0 0.0 -0.932596465934 0.0 3.37406609955 1.0 -124.727594487 1 +124.727594487 1.0 127.986622031 0.66265060241 -130.750144869 0 +130.750144869 0.0 250.977256236 0.0 diff --git a/show/dance2008/curves/song3-cyc b/show/dance2008/curves/song3-cyc --- a/show/dance2008/curves/song3-cyc +++ b/show/dance2008/curves/song3-cyc @@ -1,9 +1,9 @@ -4.0 0.0 169.034762978 0.0 -179.364869738 0 +179.364869738 0.0 198.734634795 0.258064516129 202.925108837 0.622983870968 -203.010914412 0 +203.010914412 0.0 231.015592135 0.0 240.358730932 0.0 376.923151927 0.0 diff --git a/show/dance2008/curves/song3-front b/show/dance2008/curves/song3-front --- a/show/dance2008/curves/song3-front +++ b/show/dance2008/curves/song3-front @@ -1,7 +1,9 @@ -4.0 0.0 239.729401803 0.0 243.490292049 0.30303030303 -311.469843568 0.258064516129 +294.799974501 0.21875 +294.988519606 0 +311.540547982 0 314.191097089 0.870967741935 355.607809335 0.790811339198 356.674606336 0.41642228739 diff --git a/show/dance2008/curves/song3-song3 b/show/dance2008/curves/song3-song3 --- a/show/dance2008/curves/song3-song3 +++ b/show/dance2008/curves/song3-song3 @@ -11,7 +11,7 @@ 97.8316451662 1.0 104.702847533 0.487804878049 110.651634564 0.519054878049 110.687084551 0.0 -133.654250897 0 +133.654250897 0.0 133.721931859 0.78125 168.649145036 0.75 168.976693197 0.0 diff --git a/show/dance2008/curves/song3-song3black b/show/dance2008/curves/song3-song3black --- a/show/dance2008/curves/song3-song3black +++ b/show/dance2008/curves/song3-song3black @@ -1,7 +1,7 @@ -4.0 0.0 -295.06356503 0 -295.113976257 1 -311.302531332 0.967741935484 -312.69236861 0 +295.06356503 0.0 +295.113976257 1.0 +314.339264297 1 +314.575143048 0 349.620603339 0.0 376.923151927 0.0 diff --git a/show/dance2008/curves/song3-song3end b/show/dance2008/curves/song3-song3end --- a/show/dance2008/curves/song3-song3end +++ b/show/dance2008/curves/song3-song3end @@ -3,9 +3,9 @@ 204.939082715 0.03125 239.984904162 0.0 243.50371544 0.818181818182 295.426570243 0.870967741935 -296.320228779 0 -311.756291307 0 +296.320228779 0.0 +311.756291307 0.0 313.373649455 0.774193548387 372.269917649 0.848484848485 -374.584054192 0 +374.584054192 0.0 376.923151927 0.0 diff --git a/show/dance2008/curves/song3-song3green b/show/dance2008/curves/song3-song3green --- a/show/dance2008/curves/song3-song3green +++ b/show/dance2008/curves/song3-song3green @@ -1,8 +1,8 @@ -4.0 0.0 -203.035300887 0 +203.035300887 0.0 203.854948359 1.0 -296.146230228 1 -296.335160604 0 +296.146230228 1.0 +296.335160604 0.0 349.109804176 0.0 373.437720193 0.0 376.923151927 0.0 diff --git a/show/dance2008/curves/song3-superstar b/show/dance2008/curves/song3-superstar --- a/show/dance2008/curves/song3-superstar +++ b/show/dance2008/curves/song3-superstar @@ -4,7 +4,7 @@ 110.684946617 1.0 133.581571512 1.0 134.286730793 0.46875 168.416072866 0.375 -168.771561409 0 +168.771561409 0.0 182.824540621 0.0 203.065131268 0.0 205.144136245 0.0 diff --git a/show/dance2008/curves/song6-song6 b/show/dance2008/curves/song6-song6 --- a/show/dance2008/curves/song6-song6 +++ b/show/dance2008/curves/song6-song6 @@ -1,6 +1,6 @@ -4.0 0.0 --1.41799244168 0 -0.785168107437 1 +-1.41799244168 0.0 +0.785168107437 1.0 165.261365016 1.0 166.554829426 0.0 170.238480726 0.0 diff --git a/show/dance2008/readme b/show/dance2008/readme --- a/show/dance2008/readme +++ b/show/dance2008/readme @@ -133,4 +133,11 @@ anywhere. let me hide a music curve if i ascoltami should learn to adjust volumes unnamed subterm is serious. i think only the last one created gets -saved, or something \ No newline at end of file +saved, or something + +KC smaller font on labels should allow bigger sliders + +curvecalc_all_subterms needs redo + +touched dmx cable; ~/dmxcrash in dmesg; process went to 'D' status; rebooted + diff --git a/show/dance2008/subs/curtain b/show/dance2008/subs/curtain new file mode 100644 --- /dev/null +++ b/show/dance2008/subs/curtain @@ -0,0 +1,61 @@ +_:GzkxiDOw77 "0.275"^^. +_:GzkxiDOw77 . +_:GzkxiDOw68 "0.52"^^. +_:GzkxiDOw68 . +_:GzkxiDOw69 "0.755"^^. +_:GzkxiDOw69 . +_:GzkxiDOw63 "0.43"^^. +_:GzkxiDOw63 . +_:GzkxiDOw75 "0.58"^^. +_:GzkxiDOw75 . +_:GzkxiDOw62 "0.385"^^. +_:GzkxiDOw62 . +_:GzkxiDOw58 "1"^^. +_:GzkxiDOw58 . +_:GzkxiDOw74 "0.295"^^. +_:GzkxiDOw74 . +_:GzkxiDOw60 "0.3"^^. +_:GzkxiDOw60 . +_:GzkxiDOw59 "0.265"^^. +_:GzkxiDOw59 . +_:GzkxiDOw70 "0.845"^^. +_:GzkxiDOw70 . +_:GzkxiDOw76 "0.63"^^. +_:GzkxiDOw76 . +_:GzkxiDOw72 "1"^^. +_:GzkxiDOw72 . +_:GzkxiDOw71 "0.51"^^. +_:GzkxiDOw71 . +_:GzkxiDOw73 "0.435"^^. +_:GzkxiDOw73 . +_:GzkxiDOw65 "0.66"^^. +_:GzkxiDOw65 . +_:GzkxiDOw66 "0.605"^^. +_:GzkxiDOw66 . +_:GzkxiDOw67 "0.48"^^. +_:GzkxiDOw67 . +_:GzkxiDOw61 "0.38"^^. +_:GzkxiDOw61 . +_:GzkxiDOw64 "0.335"^^. +_:GzkxiDOw64 . + "curtain". + _:GzkxiDOw68. + _:GzkxiDOw69. + _:GzkxiDOw63. + _:GzkxiDOw75. + _:GzkxiDOw62. + _:GzkxiDOw58. + _:GzkxiDOw74. + _:GzkxiDOw60. + _:GzkxiDOw59. + _:GzkxiDOw70. + _:GzkxiDOw76. + _:GzkxiDOw72. + _:GzkxiDOw71. + _:GzkxiDOw73. + _:GzkxiDOw65. + _:GzkxiDOw66. + _:GzkxiDOw67. + _:GzkxiDOw61. + _:GzkxiDOw64. + _:GzkxiDOw77. diff --git a/show/dance2008/subterms/song11.n3 b/show/dance2008/subterms/song11.n3 --- a/show/dance2008/subterms/song11.n3 +++ b/show/dance2008/subterms/song11.n3 @@ -1,32 +1,32 @@ - . - . - . - . - . - . - . - . - . - "song11dim(t)". - . - . - "smooth_music(t-.1)*midsong(t)". - . + "smooth_music(t+.1)*cyc(t)". . - "smooth_music(t+.1)*cyc(t)". . - . - "chase(t, names=rb, ontime=.2, offset=.1, offval=.2)*song11(t)*bef(289)". - . - . - "center(t)". - . + "song11(t)". . - "song11(t)". . - . + "center(t)". + . + . + "chase(t, names=rb, ontime=.2, offset=.1, offval=.2)*song11(t)*bef(289)". + . + . "smooth_music(t)*midsong(t)". + . . + . + . + . + . + . + . + . + . + "strobe(t)>.5". . - "strobe(t)>.5". . + "smooth_music(t-.1)*midsong(t)". + . + . + "song11dim(t)". + . + . diff --git a/show/dance2008/subterms/song14.n3 b/show/dance2008/subterms/song14.n3 --- a/show/dance2008/subterms/song14.n3 +++ b/show/dance2008/subterms/song14.n3 @@ -1,16 +1,16 @@ - . - . + "song14(t)". + . + . + "chase(t,names=rb,ontime=.5)*hair(t)". + . + . . . - . - . - "chase(t,names=rb,ontime=.5)*hair(t)". - . - . + . + . + "bow(t)". + . + . "blacklight(t)>0". - . - . - "song14(t)". - . - . - "bow(t)". + . + . diff --git a/show/dance2008/subterms/song15.n3 b/show/dance2008/subterms/song15.n3 --- a/show/dance2008/subterms/song15.n3 +++ b/show/dance2008/subterms/song15.n3 @@ -1,20 +1,20 @@ - . . - . - . . - . + . + . + . + . + . + "song15sec(t)". . + . "song15first(t)". - . . + . "song15sec(t)*.5". - . - . - "song15sec(t)". + . + . + "song15(t)". + . . - . "bow(t)". - . - . - "song15(t)". diff --git a/show/dance2008/subterms/song3.n3 b/show/dance2008/subterms/song3.n3 --- a/show/dance2008/subterms/song3.n3 +++ b/show/dance2008/subterms/song3.n3 @@ -1,40 +1,40 @@ - . - . - "strobe(t)". - . - . - "cyc(t)". + . + . + . + . . + . + . . - . - . . . - . - . - . - . + "song3(t)". + . + . + "song3green(t)". . . - "song3green(t)". - . - . - "song3(t)". + "superstar(t)". + . + . + "strobe(t)". + . + . + "front(t)". + . + . + "blacklight(t)". + . + . + "song3end(t)". + . + . + "cyc(t)". + . + . + "song3black(t)". . . - "song3black(t)". + "(t)". . . - "(t)". - . - . - "blacklight(t)". - . - . - "superstar(t)". - . - . - "song3end(t)". - . - . - "front(t)". diff --git a/show/dance2008/subterms/song6.n3 b/show/dance2008/subterms/song6.n3 --- a/show/dance2008/subterms/song6.n3 +++ b/show/dance2008/subterms/song6.n3 @@ -1,4 +1,4 @@ . + . + "song6(t)". . - "song6(t)". - .