diff --git a/show/dance2012/curves/song15-center b/show/dance2012/curves/song15-center --- a/show/dance2012/curves/song15-center +++ b/show/dance2012/curves/song15-center @@ -38,11 +38,11 @@ 158.949226928 0.0 161.509653296 0.0 161.693856631 0.4645717899924588 168.669007948 0.4649122807017544 -181.293546154 0.2220884722048934 181.293546154 0.0 +181.655556135 0 183.996746946 0.0 -184.137375889 0.163909728497713 -186.834717142 0.11230862368904082 +184.474419664 0 +186.522639572 0 186.912844332 0 192.705418648 0 200.130680618 0.70485347985348 diff --git a/show/dance2012/curves/song17-patio b/show/dance2012/curves/song17-patio --- a/show/dance2012/curves/song17-patio +++ b/show/dance2012/curves/song17-patio @@ -1,5 +1,5 @@ 0.0 0 -132.931284031 0 +130.339570178 0 139.046664045 0.483695652173913 162.198091938 0.483695652173913 166.193650794 0 diff --git a/show/dance2012/readme b/show/dance2012/readme --- a/show/dance2012/readme +++ b/show/dance2012/readme @@ -30,6 +30,14 @@ song14 light up the 4 pools at the very song15 @34sec jump brighter +---- + +song13 pools in wrong order + + + +---- + strike the gels configuration diff --git a/show/dance2012/subs/curtain b/show/dance2012/subs/curtain new file mode 100644 --- /dev/null +++ b/show/dance2012/subs/curtain @@ -0,0 +1,44 @@ +_:_2b346645-b16f-40c6-8393-e0a11764c672 . +_:_2b346645-b16f-40c6-8393-e0a11764c672 "1"^^ . +_:_5864c18e-7580-45ae-a661-e410e7795f17 . +_:_5864c18e-7580-45ae-a661-e410e7795f17 "1"^^ . +_:_bdfb9e11-b95c-4f18-949d-42c5c8b27802 . +_:_bdfb9e11-b95c-4f18-949d-42c5c8b27802 "1"^^ . +_:_a8cb3d36-bcf8-4828-979a-172cdb2df30b . +_:_a8cb3d36-bcf8-4828-979a-172cdb2df30b "1"^^ . +_:_3bfbaf46-86c5-4ebf-84d4-158a63fc803a . +_:_3bfbaf46-86c5-4ebf-84d4-158a63fc803a "0.575"^^ . +_:_cb8d96ca-65f0-4c1f-aadf-166b811cdd8f . +_:_cb8d96ca-65f0-4c1f-aadf-166b811cdd8f "1"^^ . +_:_ef8b8458-de3a-43b0-bd67-96ee2a7b51ba . +_:_ef8b8458-de3a-43b0-bd67-96ee2a7b51ba "1"^^ . +_:_9ad6c8c0-6487-4bb0-9f3b-d51b8a30ed26 . +_:_9ad6c8c0-6487-4bb0-9f3b-d51b8a30ed26 "1"^^ . + "curtain" . + _:_2b346645-b16f-40c6-8393-e0a11764c672 . + _:_5864c18e-7580-45ae-a661-e410e7795f17 . + _:_bdfb9e11-b95c-4f18-949d-42c5c8b27802 . + _:_a8cb3d36-bcf8-4828-979a-172cdb2df30b . + _:_3bfbaf46-86c5-4ebf-84d4-158a63fc803a . + _:_cb8d96ca-65f0-4c1f-aadf-166b811cdd8f . + _:_ef8b8458-de3a-43b0-bd67-96ee2a7b51ba . + _:_9ad6c8c0-6487-4bb0-9f3b-d51b8a30ed26 . + _:_778111b9-1834-4c58-b26b-6d6331e37d14 . + _:_24b829c1-4e22-4e0e-ac59-81b86238d0e2 . + _:_748db452-b9d1-436f-b5ae-987c91c951ae . + _:_642e20ae-6a96-4a08-b20e-eea197b5fbfa . + _:_d56777b8-c8f7-46e3-9f4e-6ba65e585601 . + _:_1f556c3f-5324-4239-890d-c1b1a0059fc7 . +_:_778111b9-1834-4c58-b26b-6d6331e37d14 . +_:_778111b9-1834-4c58-b26b-6d6331e37d14 "1"^^ . +_:_24b829c1-4e22-4e0e-ac59-81b86238d0e2 . +_:_24b829c1-4e22-4e0e-ac59-81b86238d0e2 "0.385"^^ . +_:_748db452-b9d1-436f-b5ae-987c91c951ae . +_:_748db452-b9d1-436f-b5ae-987c91c951ae "0.395"^^ . +_:_642e20ae-6a96-4a08-b20e-eea197b5fbfa . +_:_642e20ae-6a96-4a08-b20e-eea197b5fbfa "1"^^ . +_:_d56777b8-c8f7-46e3-9f4e-6ba65e585601 . +_:_d56777b8-c8f7-46e3-9f4e-6ba65e585601 "1"^^ . +_:_1f556c3f-5324-4239-890d-c1b1a0059fc7 . +_:_1f556c3f-5324-4239-890d-c1b1a0059fc7 "0.45"^^ . + 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,46 +1,46 @@ - . - "song15start" . - "song15start(t)" . - . - . - "center" . - "center(t)" . - . - . - "backctr" . - "backctr(t)" . - . - . - "timewarp" . - "getsub('green')*(0 < timewarp(t) < 25) + getsub('orange') * .5 * (.25 < timewarp(t) < .5) + getsub('blue') * (.5 < timewarp(t) < .75) + getsub('red') * (.75 < timewarp(t) < 1) " . + . + "front" . + . + "front(t)" . . - . - "stroberate" . - "chan('strobespeed')*.97" . - . - . - "full" . - "full(t)" . - . - . - "strobe" . - "strobe(t)*chan(\"strobebright\")" . - . + "timewarp" . + . + "getsub('green')*(0 < timewarp(t) < 25) + getsub('orange') * .5 * (.25 < timewarp(t) < .5) + getsub('blue') * (.5 < timewarp(t) < .75) + getsub('red') * (.75 < timewarp(t) < 1) " . + . + . . + . . + . . - . - . . . - . - . - . - "chasecolors" . - "chase(t, names=colors, ontime=.3) * chasecolors(t)" . + . + "song15start" . + . + "song15start(t)" . . - . - "front" . - "front(t)" . - . + "chasecolors" . + . + "chase(t, names=colors, ontime=.3) * chasecolors(t)" . + . + "center" . + . + "center(t)" . + . + "stroberate" . + . + "chan('strobespeed')*.97" . + . + "backctr" . + . + "backctr(t)" . + . + "full" . + . + "full(t)" . + . + "strobe" . + . + "strobe(t)*chan(\"strobebright\")" . diff --git a/show/dance2012/subterms/song17.n3 b/show/dance2012/subterms/song17.n3 --- a/show/dance2012/subterms/song17.n3 +++ b/show/dance2012/subterms/song17.n3 @@ -1,21 +1,21 @@ - . - "cyc(t)" . - "cyc" . - . . + . . . - . + . + "cyc" . + . + "cyc(t)" . . - "song17(t)" . "song17" . . + "song17(t)" . . - "patio(t)" . "patio" . . + "patio(t)" . . - "full(t)" . "full" . . + "full(t)" .