diff --git a/show/dance2012/config.n3 b/show/dance2012/config.n3 --- a/show/dance2012/config.n3 +++ b/show/dance2012/config.n3 @@ -61,8 +61,9 @@ 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 . -sub:patio :group group:live; :order 7 . +sub:full :group group:live; :order 6 . +sub:curtain :group group:live; :order 7 . +sub:patio :group group:live; :order 8 . :color "#81b5b1"; :xgroup group:back; :order 0 . :color "#3e6dca"; :xgroup group:back; :order 1 . diff --git a/show/dance2012/curves/song15-center b/show/dance2012/curves/song15-center new file mode 100644 --- /dev/null +++ b/show/dance2012/curves/song15-center @@ -0,0 +1,4 @@ +0 0 +192.705418648 0 +195.027531851 0.6952380952380953 +203.993401361 0 diff --git a/show/dance2012/curves/song15-chasecolors b/show/dance2012/curves/song15-chasecolors new file mode 100644 --- /dev/null +++ b/show/dance2012/curves/song15-chasecolors @@ -0,0 +1,6 @@ +0 0 +17.0988621023 0 +29.0283007784 1 +191.106468038 1 +193.768338922 0 +203.993401361 0 diff --git a/show/dance2012/curves/song15-front b/show/dance2012/curves/song15-front --- a/show/dance2012/curves/song15-front +++ b/show/dance2012/curves/song15-front @@ -1,5 +1,5 @@ -0 0 +0.0 0 5.69305928702 0 -6.19305928702 1 -200.282020439 1 +26.0091824211 0 +178.212558888 0 203.993401361 0 diff --git a/show/dance2012/curves/song15-song15start b/show/dance2012/curves/song15-song15start new file mode 100644 --- /dev/null +++ b/show/dance2012/curves/song15-song15start @@ -0,0 +1,5 @@ +0 0 +4.39210594798 0 +4.43757225614 1 +196.636914177 1 +203.993401361 0 diff --git a/show/dance2012/curves/song15-strobe b/show/dance2012/curves/song15-strobe new file mode 100644 --- /dev/null +++ b/show/dance2012/curves/song15-strobe @@ -0,0 +1,6 @@ +0 0 +96.5173757642 0 +96.7459278815 1 +120.58138162 1 +120.875160116 0 +203.993401361 0 diff --git a/show/dance2012/curves/song16-front b/show/dance2012/curves/song16-front --- a/show/dance2012/curves/song16-front +++ b/show/dance2012/curves/song16-front @@ -1,4 +1,2 @@ -0 0 -665.622004 0 -666.122004 1 +0.0 0 800.271133787 0 diff --git a/show/dance2012/curves/song16.markers b/show/dance2012/curves/song16.markers --- a/show/dance2012/curves/song16.markers +++ b/show/dance2012/curves/song16.markers @@ -0,0 +1,58 @@ +25.281817 'w' +46.60893 'w' +67.684011 'w' +77.034425 'q' +97.929058 'q' +103.734091 'w' +113.199987 'q' +157.000109 'q' +185.420985 'w' +201.328008 'w' +247.266557 'w' +293.773871 'q' +295.370316 'w' +296.718847 'w' +305.917173 'w' +311.391206 'w' +315.282547 'w' +323.215934 'w' +337.366571 'w' +360.84919 'w' +379.145415 'w' +379.710748 'q' +396.335681 'w' +400.550816 'w' +405.03343 'q' +429.000274 'w' +443.562009 'w' +461.544155 'w' +466.813823 'w' +472.441463 'w' +473.112332 'q' +488.428995 'w' +491.131118 'w' +494.852188 'w' +498.507213 'w' +529.913342 'w' +531.487164 'w' +562.837952 'q' +569.583612 'q' +575.790063 'w' +580.26001 'w' +606.443197 'w' +610.888704 'q' +611.557579 'q' +615.766523 'w' +616.526938 'q' +635.286149 'w' +636.86588 'w' +637.633944 'w' +644.970047 'w' +676.24942 'q' +686.297193 'w' +695.697728 'w' +743.692832 'w' +746.985708 'q' +753.756486 'w' +768.198663 'w' +790.559138 'w' diff --git a/show/dance2012/curves/song17-cyc b/show/dance2012/curves/song17-cyc new file mode 100644 --- /dev/null +++ b/show/dance2012/curves/song17-cyc @@ -0,0 +1,14 @@ +0 0 +3.50757352032 0 +7.75293777771 1 +18.7899254309 1 +50.4304320472 1 +57.5576451417 0 +88.4962292563 0.0 +96.5413410068 1 +107.124172571 1 +112.199612199 0 +134.283173984 0.0 +138.980655342 1 +161.982115783 1 +166.193650794 0 diff --git a/show/dance2012/curves/song17-full b/show/dance2012/curves/song17-full new file mode 100644 --- /dev/null +++ b/show/dance2012/curves/song17-full @@ -0,0 +1,6 @@ +0 0 +138.170744763 0.0 +150.369123471 0.6621621621621622 +155.026664442 1 +162.306080015 1 +166.193650794 0 diff --git a/show/dance2012/curves/song17-patio b/show/dance2012/curves/song17-patio new file mode 100644 --- /dev/null +++ b/show/dance2012/curves/song17-patio @@ -0,0 +1,5 @@ +0 0 +132.931284031 0 +139.046664045 0.483695652173913 +162.198091938 0.483695652173913 +166.193650794 0 diff --git a/show/dance2012/curves/song17-song17 b/show/dance2012/curves/song17-song17 new file mode 100644 --- /dev/null +++ b/show/dance2012/curves/song17-song17 @@ -0,0 +1,9 @@ +0 0 +3.23760332734 0 +7.84737179583 1 +53.5080922471 1.0 +58.6915199521 0.8097826086956522 +89.2521457966 0.8097826086956522 +95.2994781192 1.0 +154.42295038 1 +166.193650794 0 diff --git a/show/dance2012/curves/song17.markers b/show/dance2012/curves/song17.markers new file mode 100644 diff --git a/show/dance2012/readme b/show/dance2012/readme --- a/show/dance2012/readme +++ b/show/dance2012/readme @@ -29,6 +29,8 @@ song10 add blacklight with other colors song14 light up the 4 pools at the very start +song15 @34sec jump brighter + strike the gels configuration @@ -63,3 +65,7 @@ during music playback CC's expanders are pointless; they should just be frames +when music's not playing, maybe the time cursor should float with the +mouse and apply 1..5/marker keys at mouse. But it needs to be clear +during playback that this is not what's happening. + diff --git a/show/dance2012/subs/house-side b/show/dance2012/subs/house-side deleted file mode 100644 --- a/show/dance2012/subs/house-side +++ /dev/null @@ -1,4 +0,0 @@ -_:wXdfflUK50 "1"^^. -_:wXdfflUK50 . - "house-side". - _:wXdfflUK50. diff --git a/show/dance2012/subs/song15start b/show/dance2012/subs/song15start new file mode 100644 --- /dev/null +++ b/show/dance2012/subs/song15start @@ -0,0 +1,41 @@ +_:_a702a79f-e3b6-4748-aad1-e8572f4fc15d . +_:_a702a79f-e3b6-4748-aad1-e8572f4fc15d "0.0882"^^ . +_:_447ffe17-ed2e-402d-9c18-d4c33fbf8474 . +_:_447ffe17-ed2e-402d-9c18-d4c33fbf8474 "0.12"^^ . +_:_2c71d0f0-1935-47bb-8a33-14b98f5688c6 . +_:_2c71d0f0-1935-47bb-8a33-14b98f5688c6 "0.12"^^ . +_:_09e5b4ba-df48-4971-8132-82e5c925af73 . +_:_09e5b4ba-df48-4971-8132-82e5c925af73 "1.0"^^ . +_:_02cafacd-94b8-4d2b-859b-1346e4787191 . +_:_02cafacd-94b8-4d2b-859b-1346e4787191 "0.12"^^ . +_:_6827acfc-d33a-43d5-94df-32657fd761a1 . +_:_6827acfc-d33a-43d5-94df-32657fd761a1 "1.0"^^ . +_:_20ea7d3c-a5ab-411a-9dd1-fc9d816dd39f . +_:_20ea7d3c-a5ab-411a-9dd1-fc9d816dd39f "1.0"^^ . +_:_4de7d154-9a18-4761-9929-dcbe615d000b . +_:_4de7d154-9a18-4761-9929-dcbe615d000b "0.12"^^ . +_:_13ea2428-6563-4a71-90e5-72e7f032f0e5 . +_:_13ea2428-6563-4a71-90e5-72e7f032f0e5 "1.0"^^ . +_:_203c6c3f-57b6-4abb-b2ef-bc202a3d311b . +_:_203c6c3f-57b6-4abb-b2ef-bc202a3d311b "0.0792"^^ . +_:_bc316822-7c08-4e75-bbd1-7350ee21f92f . +_:_bc316822-7c08-4e75-bbd1-7350ee21f92f "1.0"^^ . +_:_d9ca07bb-4f4d-4a21-8f86-03585feef8ac . +_:_d9ca07bb-4f4d-4a21-8f86-03585feef8ac "0.12"^^ . +_:_f88a77bc-f8ad-482b-b0d0-fe67713bac49 . +_:_f88a77bc-f8ad-482b-b0d0-fe67713bac49 "0.12"^^ . + "song15start" . + _:_a702a79f-e3b6-4748-aad1-e8572f4fc15d . + _:_2c71d0f0-1935-47bb-8a33-14b98f5688c6 . + _:_09e5b4ba-df48-4971-8132-82e5c925af73 . + _:_02cafacd-94b8-4d2b-859b-1346e4787191 . + _:_6827acfc-d33a-43d5-94df-32657fd761a1 . + _:_20ea7d3c-a5ab-411a-9dd1-fc9d816dd39f . + _:_4de7d154-9a18-4761-9929-dcbe615d000b . + _:_13ea2428-6563-4a71-90e5-72e7f032f0e5 . + _:_203c6c3f-57b6-4abb-b2ef-bc202a3d311b . + _:_bc316822-7c08-4e75-bbd1-7350ee21f92f . + _:_447ffe17-ed2e-402d-9c18-d4c33fbf8474 . + _:_f88a77bc-f8ad-482b-b0d0-fe67713bac49 . + _:_d9ca07bb-4f4d-4a21-8f86-03585feef8ac . + diff --git a/show/dance2012/subs/song17 b/show/dance2012/subs/song17 new file mode 100644 --- /dev/null +++ b/show/dance2012/subs/song17 @@ -0,0 +1,77 @@ +_:_208f4355-a637-43ea-b288-4198bb3c2b6f "0.57"^^ . +_:_208f4355-a637-43ea-b288-4198bb3c2b6f . +_:_acb70e2c-7fa2-49d4-b023-6eec2b73420b "0.57"^^ . +_:_acb70e2c-7fa2-49d4-b023-6eec2b73420b . +_:_d722f4d5-a9f3-4bb8-9aba-7efcec617ea5 "0.71"^^ . +_:_d722f4d5-a9f3-4bb8-9aba-7efcec617ea5 . +_:_e4620235-c764-42c2-bdf7-64cda0ed0f9f "1.0"^^ . +_:_e4620235-c764-42c2-bdf7-64cda0ed0f9f . +_:_1d2ae77c-1723-4740-bbb5-139f22ec1905 "1.0"^^ . +_:_1d2ae77c-1723-4740-bbb5-139f22ec1905 . +_:_c4d0485f-c3d0-4a41-9451-1619389e9747 "1.0"^^ . +_:_c4d0485f-c3d0-4a41-9451-1619389e9747 . +_:_12f848cc-2e47-435b-aacf-b1443eea1e58 "1.0"^^ . +_:_12f848cc-2e47-435b-aacf-b1443eea1e58 . +_:_589f7f64-404f-4d84-8c3d-34dacca1cb95 "1.0"^^ . +_:_589f7f64-404f-4d84-8c3d-34dacca1cb95 . +_:_299d2f5a-bee9-417d-943e-e0a42838991d "1.0"^^ . +_:_299d2f5a-bee9-417d-943e-e0a42838991d . +_:_db717eea-320d-4e63-82e6-264b12b161ab "1.0"^^ . +_:_db717eea-320d-4e63-82e6-264b12b161ab . +_:_909a393b-8a10-4ace-8132-2bab9807e031 "1.0"^^ . +_:_909a393b-8a10-4ace-8132-2bab9807e031 . +_:_fa99345b-4210-4e8a-81fe-932472f2d1a6 "1.0"^^ . +_:_fa99345b-4210-4e8a-81fe-932472f2d1a6 . +_:_95a17a34-239d-4ac9-b887-b5d627522ae6 "1.0"^^ . +_:_95a17a34-239d-4ac9-b887-b5d627522ae6 . +_:_91a1e9e2-32a5-4b47-a6f2-6450b723fa9b "1.0"^^ . +_:_91a1e9e2-32a5-4b47-a6f2-6450b723fa9b . +_:_97d62d2d-2ce9-4e35-9f97-e0770060d475 "1.0"^^ . +_:_97d62d2d-2ce9-4e35-9f97-e0770060d475 . +_:_87428c62-d371-470a-a402-abbd847f9902 "1.0"^^ . +_:_87428c62-d371-470a-a402-abbd847f9902 . +_:_f70621ce-7fcd-484b-b282-01676551627c "1.0"^^ . +_:_f70621ce-7fcd-484b-b282-01676551627c . +_:_8062fd03-7509-4e3f-be73-9ee25725fac9 "1.0"^^ . +_:_8062fd03-7509-4e3f-be73-9ee25725fac9 . +_:_0e7cb9c1-be5d-4bc9-a025-fa8ba25b0834 "1.0"^^ . +_:_0e7cb9c1-be5d-4bc9-a025-fa8ba25b0834 . +_:_9fd9b50f-3f26-4107-872e-8222986cc7d8 "1.0"^^ . +_:_9fd9b50f-3f26-4107-872e-8222986cc7d8 . + "song17" . + _:_208f4355-a637-43ea-b288-4198bb3c2b6f . + _:_acb70e2c-7fa2-49d4-b023-6eec2b73420b . + _:_d722f4d5-a9f3-4bb8-9aba-7efcec617ea5 . + _:_e4620235-c764-42c2-bdf7-64cda0ed0f9f . + _:_1d2ae77c-1723-4740-bbb5-139f22ec1905 . + _:_c4d0485f-c3d0-4a41-9451-1619389e9747 . + _:_12f848cc-2e47-435b-aacf-b1443eea1e58 . + _:_589f7f64-404f-4d84-8c3d-34dacca1cb95 . + _:_299d2f5a-bee9-417d-943e-e0a42838991d . + _:_db717eea-320d-4e63-82e6-264b12b161ab . + _:_909a393b-8a10-4ace-8132-2bab9807e031 . + _:_fa99345b-4210-4e8a-81fe-932472f2d1a6 . + _:_95a17a34-239d-4ac9-b887-b5d627522ae6 . + _:_91a1e9e2-32a5-4b47-a6f2-6450b723fa9b . + _:_97d62d2d-2ce9-4e35-9f97-e0770060d475 . + _:_87428c62-d371-470a-a402-abbd847f9902 . + _:_f70621ce-7fcd-484b-b282-01676551627c . + _:_8062fd03-7509-4e3f-be73-9ee25725fac9 . + _:_0e7cb9c1-be5d-4bc9-a025-fa8ba25b0834 . + _:_9fd9b50f-3f26-4107-872e-8222986cc7d8 . + _:_42296220-7f3a-4149-9802-e420159160c7 . + _:_b15d1f9d-1b0c-4fe5-b2a7-debe1201322d . + _:_eeafe047-2142-44d0-801b-41012e51747c . + _:_28772fa4-2711-4949-ac43-06d2a20f6c2f . + _:_9c5ec356-d594-45bd-a267-6d3a8cfaf3ec . +_:_42296220-7f3a-4149-9802-e420159160c7 "1.0"^^ . +_:_42296220-7f3a-4149-9802-e420159160c7 . +_:_b15d1f9d-1b0c-4fe5-b2a7-debe1201322d "1.0"^^ . +_:_b15d1f9d-1b0c-4fe5-b2a7-debe1201322d . +_:_eeafe047-2142-44d0-801b-41012e51747c "0.68"^^ . +_:_eeafe047-2142-44d0-801b-41012e51747c . +_:_28772fa4-2711-4949-ac43-06d2a20f6c2f "0.57"^^ . +_:_28772fa4-2711-4949-ac43-06d2a20f6c2f . +_:_9c5ec356-d594-45bd-a267-6d3a8cfaf3ec "0.57"^^ . +_:_9c5ec356-d594-45bd-a267-6d3a8cfaf3ec . + diff --git a/show/dance2012/subterms/song15.n3 b/show/dance2012/subterms/song15.n3 --- a/show/dance2012/subterms/song15.n3 +++ b/show/dance2012/subterms/song15.n3 @@ -1,6 +1,26 @@ . + . + . + . + . + . + "strobe" . + "strobe(t)*chan(\"strobebright\")*(nsin(t*3)>.9)" . + . + . + "chasecolors" . + "chase(t, names=colors, ontime=.3) * chasecolors(t)" . + . + . + "front" . "front(t)" . . - "front" . - . + . + "song15start" . + "song15start(t)" . + . + . + "center" . + "center(t)" . + . diff --git a/show/dance2012/subterms/song16.n3 b/show/dance2012/subterms/song16.n3 --- a/show/dance2012/subterms/song16.n3 +++ b/show/dance2012/subterms/song16.n3 @@ -1,6 +1,6 @@ - . + . "front" . "front(t)" . . - . + . diff --git a/show/dance2012/subterms/song17.n3 b/show/dance2012/subterms/song17.n3 new file mode 100644 --- /dev/null +++ b/show/dance2012/subterms/song17.n3 @@ -0,0 +1,21 @@ + . + . + . + . + . + . + "cyc(t)" . + "cyc" . + . + . + "patio(t)" . + "patio" . + . + . + "full(t)" . + "full" . + . + . + "song17(t)" . + "song17" . +