# HG changeset patch # User drewp@bigasterisk.com # Date 2014-06-16 00:45:58 # Node ID 7eb423e6001119fbf103e952a44b5d8dc5f166f5 # Parent 30793e93e4eb92710bfeff5b5a1b577e7d9584bc checkpoint show data Ignore-this: 20364078759d11074f633b52cc6c48f5 diff --git a/show/dance2014/curves/song16.markers b/show/dance2014/curves/song16.markers --- a/show/dance2014/curves/song16.markers +++ b/show/dance2014/curves/song16.markers @@ -1,1 +1,3 @@ 45.812669589 'q' +540.613561008 'q' +592.893577008 'q' diff --git a/show/dance2014/song16.n3 b/show/dance2014/song16.n3 --- a/show/dance2014/song16.n3 +++ b/show/dance2014/song16.n3 @@ -12,6 +12,8 @@ , , , + , + , , , , @@ -29,6 +31,8 @@ , , , + , + , , , , @@ -66,6 +70,12 @@ a ns1:Curve ; rdfs:label "edge" . + a ns1:Curve ; + rdfs:label "red" . + + a ns1:Curve ; + rdfs:label "full" . + a ns1:Curve ; rdfs:label "yellow pulse" . @@ -142,7 +152,19 @@ a ns1:Effect ; rdfs:label "edge" ; ns1:code "env = ", - "out = * env * curve(, t+.1) * 3" . + "mid = * env * (1-curve(, t+.1)) * 1", + "ed = * env * curve(, t+.1) * 3", + "out = [mid, ed]" . + + a ns1:Effect ; + rdfs:label "red" ; + ns1:code "env = ", + "out = * env" . + + a ns1:Effect ; + rdfs:label "full" ; + ns1:code "env = ", + "out = * env" . a ns1:Effect ; rdfs:label "yellow pulse" ; diff --git a/show/dance2014/song16/curve-10.n3 b/show/dance2014/song16/curve-10.n3 --- a/show/dance2014/song16/curve-10.n3 +++ b/show/dance2014/song16/curve-10.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 64.83 0 65.17 1 92.25 1 94.25 0 133.2 0" . + ns1:points "0 0 64.83 0 65.17 1 94.02 1 96.91 0 133.2 0 651.5 0 652.1 1 663.9 1 665.5 0" . diff --git a/show/dance2014/song16/curve-12.n3 b/show/dance2014/song16/curve-12.n3 --- a/show/dance2014/song16/curve-12.n3 +++ b/show/dance2014/song16/curve-12.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 132.8 0 133 1 162.5 1 164.5 0" . + ns1:points "0 0 132.8 0 133 1 162.5 1 162.9 0.1742 163.2 0 539.4 0 540.2 1 606.1 1 606.9 0 627.1 0 627.6 1 664 1 665.3 0" . diff --git a/show/dance2014/song16/curve-13.n3 b/show/dance2014/song16/curve-13.n3 --- a/show/dance2014/song16/curve-13.n3 +++ b/show/dance2014/song16/curve-13.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 161.9 0 163.9 1 183.9 1 185.9 0" . + ns1:points "0 0 161.9 0 163 0.1542 164.8 0.1339 170 0.1995 170.6 0.5698 173.2 0.5691 183.9 1 188.4 0.2286 201 0.1169 206.7 0 383.2 0 414.1 0.6756 504.3 0.6916 506.9 0.3566 529 0.08538 565 0.08538 591.3 0.8195 605.8 0.8195 606.3 0 619.1 0 630.6 0.6223 651.5 0.6436 677.7 0.5585 683.5 1 689.2 1 691.8 0" . diff --git a/show/dance2014/song16/curve-16.n3 b/show/dance2014/song16/curve-16.n3 --- a/show/dance2014/song16/curve-16.n3 +++ b/show/dance2014/song16/curve-16.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 269.5 0 271.5 1 374.8 1 376.8 0" . + ns1:points "0 0 269.5 0 271.5 0.5053 377.5 0.5053 379.5 0" . diff --git a/show/dance2014/song16/curve-17.n3 b/show/dance2014/song16/curve-17.n3 new file mode 100644 --- /dev/null +++ b/show/dance2014/song16/curve-17.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 373.4 0 385.2 1 503.3 1 508.7 0" . + diff --git a/show/dance2014/song16/curve-18.n3 b/show/dance2014/song16/curve-18.n3 new file mode 100644 --- /dev/null +++ b/show/dance2014/song16/curve-18.n3 @@ -0,0 +1,8 @@ +@prefix ns1: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + ns1:points "0 0 514.2 0 525.7 0.117 601.4 0.106 605.7 0 680.2 0 683.6 1 689.2 1 691.6 0" . + diff --git a/show/dance2014/song16/curve-3.n3 b/show/dance2014/song16/curve-3.n3 --- a/show/dance2014/song16/curve-3.n3 +++ b/show/dance2014/song16/curve-3.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 384.5 0 386.5 1 505.7 1 507.7 0" . + ns1:points "0 0 384.5 0 386.5 0.4521 505.7 0.4521 507.7 0" . diff --git a/show/dance2014/song16/curve-4.n3 b/show/dance2014/song16/curve-4.n3 --- a/show/dance2014/song16/curve-4.n3 +++ b/show/dance2014/song16/curve-4.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 44.28 0 45.58 1 66.19 1 68.28 0 110.5 0 644.5 0 646.5 1 666.5 1 668.5 0" . + ns1:points "0 0 44.28 0 45.58 1 66.19 1 68.28 0 110.5 0 644.5 0 646.5 1 649.1 1 653.4 1 655.4 0 666.4 0 667.8 1 681.2 1 683 0" . diff --git a/show/dance2014/song16/curve-5.n3 b/show/dance2014/song16/curve-5.n3 --- a/show/dance2014/song16/curve-5.n3 +++ b/show/dance2014/song16/curve-5.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 97.14 0 97.64 0 98.92 0.9894 118.2 0.7411 119.4 0 129.5 0 135.3 0.8883 174.3 0.9734 177.9 1 206.5 1 208.5 0 281.2 0 289.1 0.3138 312.9 0.3138 317.6 0" . + ns1:points "0 0 94.22 0 94.96 0 96.85 0.9894 118.1 1 119.4 0 129.5 0 135.3 0.8883 174.3 0.9734 177.9 1 206.5 1 208.5 0 281.2 0 289.1 0.3138 312.9 0.3138 317.6 0 515.7 0 527.5 1 603.1 1 606.1 0" . diff --git a/show/dance2014/song16/curve-6.n3 b/show/dance2014/song16/curve-6.n3 --- a/show/dance2014/song16/curve-6.n3 +++ b/show/dance2014/song16/curve-6.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 97.61 0 101 0.8421 118.6 0.8168 119.4 0 687.2 0 689.2 1 693 1 695 0" . + ns1:points "0 0 97.61 0 101 0.8421 118.6 0.8168 119.4 0" . diff --git a/show/dance2014/song16/curve-7.n3 b/show/dance2014/song16/curve-7.n3 --- a/show/dance2014/song16/curve-7.n3 +++ b/show/dance2014/song16/curve-7.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 118.5 0 118.5 1 133.1 1 133.2 0" . + ns1:points "0 0 118.5 0 118.5 1 133.1 1 133.2 0 605.9 0 606.1 1 627.9 1 628.2 0 657.7 0" . diff --git a/show/dance2014/song16/curve-8.n3 b/show/dance2014/song16/curve-8.n3 --- a/show/dance2014/song16/curve-8.n3 +++ b/show/dance2014/song16/curve-8.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0" . + ns1:points "0 0 218.3 0 222.3 0.6011 264.3 0.6171 269.1 0 378.8 0 392.9 0.6464 477 0.8139 504.5 0.8139 507.8 0" . diff --git a/show/dance2014/song16/curve-9.n3 b/show/dance2014/song16/curve-9.n3 --- a/show/dance2014/song16/curve-9.n3 +++ b/show/dance2014/song16/curve-9.n3 @@ -4,5 +4,5 @@ @prefix xml: . @prefix xsd: . - ns1:points "0 0 81.04 0" . + ns1:points "0 0 81.04 0 478.6 0" .