# HG changeset patch # User drewp@bigasterisk.com # Date 2010-06-22 04:32:19 # Node ID 11695f8ebbc056584dd68949e7447ce913d1debb # Parent 54341e5e8d8283682106648e7e4d0fa885e1872b cp Ignore-this: 42f78142e8d7abe121f4640cf16320e6 diff --git a/show/dance2010/curves/song1-song01 b/show/dance2010/curves/song1-song01 --- a/show/dance2010/curves/song1-song01 +++ b/show/dance2010/curves/song1-song01 @@ -1,9 +1,9 @@ 0.0 0.0 -34.3331910242 0 -39.6497668743 1 -76.7767635539 1.0 -79.0800664605 0.159574468085 +34.3331910242 0.0 +39.6497668743 1.0 +78.636460284 1 +79.5251220882 0.170212765957 89.5728908129 0.159574468085 92.541592337 1.0 -212.451008121 1 -215.126053859 0 +212.451008121 1.0 +215.126053859 0.0 diff --git a/show/dance2010/curves/song1-song01center b/show/dance2010/curves/song1-song01center --- a/show/dance2010/curves/song1-song01center +++ b/show/dance2010/curves/song1-song01center @@ -1,7 +1,7 @@ 0.0 0.0 29.0216166234 0.0 -74.8482251429 0 -76.7989132826 1 +74.8482251429 0.0 +76.7989132826 1.0 92.0297472466 1.0 94.3842346623 0.0 115.676990421 0.0 diff --git a/show/dance2010/curves/song1-song01dim b/show/dance2010/curves/song1-song01dim --- a/show/dance2010/curves/song1-song01dim +++ b/show/dance2010/curves/song1-song01dim @@ -1,6 +1,6 @@ 0.0 0.0 2.76396348794 0.0 5.9885875572 1.0 -39.0071192927 1 -44.4752829615 0 +39.0071192927 1.0 +44.4752829615 0.0 211.136099773 0.0 diff --git a/show/dance2010/curves/song7-bredc b/show/dance2010/curves/song7-bredc --- a/show/dance2010/curves/song7-bredc +++ b/show/dance2010/curves/song7-bredc @@ -1,5 +1,5 @@ 0.0 0.0 -248.576191929 0 +248.576191929 0.0 253.112919715 0.904255319149 265.189681446 0.936170212766 267.827478582 0.0 diff --git a/show/dance2010/curves/song7-chcolor b/show/dance2010/curves/song7-chcolor --- a/show/dance2010/curves/song7-chcolor +++ b/show/dance2010/curves/song7-chcolor @@ -2,14 +2,14 @@ 0.0 0.0 40.15647047 0.702127659574 51.5726667657 0.744680851064 66.4841169703 0.489361702128 -69.3623717317 0 +69.3623717317 0.0 143.407657246 0.0 143.735548095 1.0 -196.415377066 1 +196.415377066 1.0 235.130372105 0.946808510638 249.209194477 0.117021276596 251.309507701 0.851063829787 255.393664591 0.81914893617 264.822446895 0.829787234043 -267.737258629 0 +267.737258629 0.0 344.968911565 0.0 diff --git a/show/dance2010/curves/song7-chscoop b/show/dance2010/curves/song7-chscoop --- a/show/dance2010/curves/song7-chscoop +++ b/show/dance2010/curves/song7-chscoop @@ -6,8 +6,8 @@ 241.997612458 0.0 247.66791519 0.0 247.920404793 1.0 250.552542494 0.989361702128 -252.960430448 0 -263.916508399 0 +252.960430448 0.0 +263.916508399 0.0 267.499590846 0.0 278.293138955 0.0 288.125910658 0.0 diff --git a/show/dance2010/curves/song7-down b/show/dance2010/curves/song7-down --- a/show/dance2010/curves/song7-down +++ b/show/dance2010/curves/song7-down @@ -1,18 +1,30 @@ 0.0 0.0 -55.7247796407 0 -56.0968630755 0.148936170213 -66.4137219501 0.13829787234 -71.5214127372 0 -101.941581871 0.0 +25.7720631375 0.0106382978723 +35.7041539147 0.212765957447 +40.4989563589 0.18085106383 +41.7547379514 0.18085106383 +48.1192673863 0.159574468085 +55.7247796407 0.0 +56.3251870014 0.372340425532 +66.642045876 0.361702127659 +71.6355747002 0.255319148936 +84.6796360232 0.244680851064 +102.055743834 0.223404255319 102.897759821 1.0 111.058060333 1.0 111.185017884 0.0 -121.614900484 0 +121.614900484 0.0 132.671745449 0.436170212766 144.026084001 0.606382978723 145.166476082 0.13829787234 170.136776925 0.148936170213 -174.301687136 0.127659574468 +174.480695176 0.13829787234 +180.281514871 0.265957446809 +183.145643509 0.723404255319 +188.873900786 0.36170212766 +244.00837707 0.351063829787 +246.514489628 0.329787234043 +247.409529828 0.13829787234 287.18809837 0.127659574468 -287.76548074 0 +287.76548074 0.0 344.968911565 0.0 diff --git a/show/dance2010/curves/song7-front b/show/dance2010/curves/song7-front new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song7-front @@ -0,0 +1,19 @@ +0 0 +110.110363236 0 +111.542427555 0.0851063829787 +123.893982308 0.0957446808511 +129.443231544 0 +144.300898854 0 +148.418083772 0.127659574468 +202.657519857 0.148936170213 +206.058672614 0 +223.780468563 0 +227.181621321 0.212765957447 +243.11333687 0.223404255319 +245.261433349 0 +260.835132819 0 +268.174462454 0 +269.785534813 0.234042553191 +287.036605916 0.234042553191 +287.619057316 0 +344.968911565 0 diff --git a/show/dance2010/curves/song7-full b/show/dance2010/curves/song7-full --- a/show/dance2010/curves/song7-full +++ b/show/dance2010/curves/song7-full @@ -1,8 +1,8 @@ 0.0 0.0 -298.363066996 0 +298.363066996 0.0 302.762052634 0.106382978723 315.607482721 0.117021276596 -321.200881701 0 +321.200881701 0.0 332.429282623 0.0 335.046371851 0.792553191489 341.580089829 0.755319148936 diff --git a/show/dance2010/readme b/show/dance2010/readme --- a/show/dance2010/readme +++ b/show/dance2010/readme @@ -56,7 +56,7 @@ for 2011: - gel sample pack - vidref adjustable crop to the stage aspect - vidref should have an 'in progress' row to prove that it's recording something new -- curvecalc still has a problem making empty-name subterms. that should never happen, even once +OK curvecalc still has a problem making empty-name subterms. that should never happen, even once - remote-run GUIs should say what machine they're on. Or, everyone should say what RDF server it's talking tox - scrub inside curvecalc, preview a video in it - bring curvecalc's logging inside the GUI window @@ -74,7 +74,7 @@ for 2011: - CC should support zoom-crushing towards the left as well - vidref's replay 'enabled' button should be completely sticky across sessions - audio process pipeline; RDF graph should track versions of songs (padded, normalized) -- vidref can loop like this if asco goes down: +OK vidref can loop like this if asco goes down: File "/home/drewp/projects/light9/light9/vidref/main.py", line 168, in updateLoop self.replayViews.update(position) File "/home/drewp/projects/light9/light9/vidref/replay.py", line 42, in update diff --git a/show/dance2010/subterms/song1.n3 b/show/dance2010/subterms/song1.n3 --- a/show/dance2010/subterms/song1.n3 +++ b/show/dance2010/subterms/song1.n3 @@ -1,20 +1,20 @@ - . - . . . + . + . + "house". + . + "house(t)". + . + "song01dim". + . + "song01dim(t)". + . + "song01center". + . + "song01center(t)". + . "song01". - . . "song01(t)". - "house". - . - . - "house(t)". - "song01center". - . - . - "song01center(t)". - "song01dim". - . - . - "song01dim(t)". + . diff --git a/show/dance2010/subterms/song7.n3 b/show/dance2010/subterms/song7.n3 --- a/show/dance2010/subterms/song7.n3 +++ b/show/dance2010/subterms/song7.n3 @@ -1,60 +1,65 @@ - . - "chcolorslow(t)*chase(t, names=colors, ontime=.8, offset=-.2, offval=.4)". - "chcolorslow". - . - . + . + "cyc(t)*min(1, 3*(music(t+.1)**2))". + "cyc". + . + . + "blue(t)". + "green". + . + . + "chcolor(t)*chase(t, names=colors, ontime=.3,offset=-.1)". + "chcolor". + . + . "full(t)". "full". - . - . + . + . + "chcolorslow(t)*chase(t, names=colors, ontime=.8, offset=-.2, offval=.4)". + "chcolorslow". + . + . + "bbluec(t)". + "bbluec". + . + . + "front(t)". + "front". + . + . + "blue(t)". + "blue". + . + . + "down(t)". + "down". + . + . + . + . . + . + . + . + . . - . . - . - . - . - . - . . . - . - "down(t)". - "down". - . - . + . + . + "chscoop2(t)*chase(t+.08, names=scoop*4, ontime=.15,offset=-.05,random=2)". + "chscoop2". + . + . + "song07bk(t)". + "song07bk". + . + . + "chscoop(t)*chase(t, names=scoop*4, ontime=.15,offset=-.05,random=1)". + "chscoop1". + . + . "bredc(t)". "bredc". - . - . - "chscoop2(t)*chase(t+.08, names=scoop*4, ontime=.15,offset=-.05,random=2)". - "chscoop2". - . - . - "cyc(t)*min(1, 3*(music(t+.1)**2))". - "cyc". - . - . - "chcolor(t)*chase(t, names=colors, ontime=.3,offset=-.1)". - "chcolor". - . - . - "blue(t)". - "green". - . - . - "bbluec(t)". - "bbluec". - . - . - "blue(t)". - "blue". - . - . - "song07bk(t)". - "song07bk". - . - . - "chscoop(t)*chase(t, names=scoop*4, ontime=.15,offset=-.05,random=1)". - "chscoop1". - . + .