# HG changeset patch # User tzara # Date 1347092719 0 # Node ID 7f0485e0d0ffc3ddfbb2383366ead5b733eaba57 # Parent 49c94f63b8b0a5b35090c275274a6cb412c98d8d updates via ljubljana diff -r 49c94f63b8b0 -r 7f0485e0d0ff nodescore.js --- a/nodescore.js Tue Sep 04 07:25:49 2012 +0000 +++ b/nodescore.js Sat Sep 08 08:25:19 2012 +0000 @@ -7,31 +7,27 @@ //////////////////////////////////////////// */ - var sio = require('socket.io') , http = require('http') , fs = require('fs') -, $ = require('jQuery') , static = require('node-static'); +// run webserver serving static html +//////////////////////////////////////////// +var clientFiles = new static.Server('./www'); +var httpServer = http.createServer( + function(request, response) { + request.addListener('end', function () { + clientFiles.serve(request, response); + process.setMaxListeners(0); + }); + }); + +httpServer.listen(8889); + var pinging=0 - console.log("ping set to 0") -// run webserver serving static html -//////////////////////////////////////////// - -var clientFiles = new static.Server('./www'); - -var httpServer = http.createServer(function(request, response) { - request.addListener('end', function () { - clientFiles.serve(request, response); - process.setMaxListeners(0); - }); -}); - -httpServer.listen(8889); - //////////////////////////////////////////// // connect to websockets //////////////////////////////////////////// @@ -121,10 +117,11 @@ } socket.on('startChr', function () { startChr();}); + // if not already started start the chronometer function startChr() { if (chronstate !== 1) { chronstate = 1; chronometer();} - } // if not already started start the chronometer - + } + socket.on('stopChr', function () { stopChr();} ); function stopChr() { chronstate = 0; } // stop the chronometer @@ -153,18 +150,22 @@ srcsqr[2] = [03,00,17,16,35,34]; srcsqr[3] = [01,02,19,18,33,32]; - var seqA = { metrobeat:0, voice:1, name: "A", counter: 0, mm: 120, beatsinbar: 4, durations: srcsqr[0], units: [1,2,3,1,2,4]}; + var seqA = { metrobeat:0, voice:1, name: "A", counter: 0, mm: 60, beatsinbar: 4, durations: srcsqr[0], units: [1,2,3,1,2,4]}; var seqB = { metrobeat:0, voice:2, name: "B", counter: 0, mm: 120, beatsinbar: 4, durations: srcsqr[1], units: [3,2,1,1,2,3]}; - var seqC = { metrobeat:0, voice:3, name: "C", counter: 0, mm: 120, beatsinbar: 4, durations: srcsqr[2], units: [4,5,6,5,4,2]}; - var seqD = { metrobeat:0, voice:4, name: "D", counter: 0, mm: 120, beatsinbar: 4, durations: srcsqr[3], units: [2,3,4,2,3,1]}; + var seqC = { metrobeat:0, voice:3, name: "C", counter: 0, mm: 90, beatsinbar: 4, durations: srcsqr[2], units: [4,5,6,5,4,2]}; + var seqD = { metrobeat:0, voice:4, name: "D", counter: 0, mm: 105, beatsinbar: 4, durations: srcsqr[3], units: [2,3,4,2,3,1]}; var countdowntick = function(seq){ - var tempoms = 60000/seq.mm - var timemultiplier=tempoms - var outcount = 12; var incount=12; + // var tempoms = Math.floor(60000/seq.mm) + var tempoms = Math.floor(60000/seq.mm) + console.log(tempoms) + var timemultiplier=1 + var outcount = 4; var incount=4; var time = ((seq.durations[seq.counter]+1) *timemultiplier) + 30000 + (outcount*tempoms); - var ztime = time; var totaltime = time/tempoms + var time = Math.floor(time) + var ztime = time; + var totaltime = Math.floor(time/tempoms) var unit = seq.units[seq.counter]; // initiate first page here @@ -172,15 +173,15 @@ socket.emit("pageFlipfromserver", seq.voice, unit, time, seq.mm,seq.counter); function sequenCer() { - + // console.log(ztime) if (ztime >= 0 ){ // basic unit is still the second/1000ms - change this to tempoms? no i dont think so // count in and count out //////////////////////////////////////////// - var counter = ztime/tempoms - // + var counter = Math.floor(ztime/tempoms) + //console.log(counter) if (counter >= 0 ){ socket.broadcast.emit('counterText', seq.voice, seq.counter, counter); socket.emit('counterText', seq.voice, seq.counter, counter); @@ -218,7 +219,8 @@ } // flip the page - if (ztime == 0){ + if (counter == 0){ + seq.counter = (seq.counter + 1) % seq.durations.length socket.broadcast.emit("pageFlipfromserver", seq.voice, unit, time, seq.mm,seq.counter); //delete tockTock; @@ -248,7 +250,10 @@ if (sequencerState == 0) { console.log("sequencer starting...") startChr(); - step(seqA); step(seqB); step(seqC); step(seqD); + +////////////////////////////////////////////////////////////////// + + step(seqA);step(seqB); step(seqC); step(seqD); ztime =-1; } else console.log("sequencer already started...") @@ -292,23 +297,17 @@ */ -// periodically broadcast a ping - +// periodically broadcast a ping function serverTime(freq) { - - if (pinging==0){ - st = setInterval(function() { - var pinging=1; - var d = new Date(); var n = d.getTime(); - socket.emit("timeFromServer", n); - //socket.broadcast.emit("timeFromServer", n); - }, 1000); } - else console.log("already pinging") + if (pinging==0){ st = setInterval(function() { + var pinging=1; + var d = new Date(); var n = d.getTime(); + socket.emit("timeFromServer", n); + }, 1000); } else console.log("already pinging") } - // receive the pong calculate the latency and // return the response to the client - + socket.on("clientTimeResponse", function(x) { var d = new Date(); var n = d.getTime(); var latency = (n-x)/2; diff -r 49c94f63b8b0 -r 7f0485e0d0ff rasterize.js --- a/rasterize.js Tue Sep 04 07:25:49 2012 +0000 +++ b/rasterize.js Sat Sep 08 08:25:19 2012 +0000 @@ -4,7 +4,7 @@ top = system.args[3]; -page.clipRect = { top: top, left: 0, width: 1000, height: 450 } +page.clipRect = { top: top, left: 0, width: 1000, height: 330 } if (system.args.length < 3 || system.args.length > 5) { console.log('Usage: rasterize.js URL filename [paperwidth*paperheight|paperformat] [zoom]'); @@ -15,7 +15,7 @@ output = system.args[2]; - page.viewportSize = { width: 1000, height: 450 }; + page.viewportSize = { width: 1000, height: 330 }; if (system.args.length > 4 && system.args[2].substr(-4) === ".pdf") { size = system.args[4].split('*'); page.paperSize = size.length === 2 ? { width: size[0], height: size[1], margin: '0px' } diff -r 49c94f63b8b0 -r 7f0485e0d0ff ss2thumb.sh --- a/ss2thumb.sh Tue Sep 04 07:25:49 2012 +0000 +++ b/ss2thumb.sh Sat Sep 08 08:25:19 2012 +0000 @@ -20,7 +20,7 @@ fi ANCHORS=`grep '

NodeScore

- http://nodescore.kiben.net:8889 + http://nodescore.kiben.net
+ controls@nodescore + + + + + + + + + + + + + + + + +
+ +

magick square sequencer:

+
+
+

+

+

+

+

+

+
+



+
+

+

+

+

+

+

+
+



+
+

+

+

+

+

+

+
+



+
+

+

+

+

+

+

+
+ +



+ + + + + + + + + + + +
+
+
+
+
+

LOGIN:

+ +

Nickname already in use

+
+
+
+
Connecting to socket.io server
+
+
+
+
+
+
+ + +
+
+
+ +
+ +
+
+
+
+ +
+ next in: +
.
+
+ +
+
+
+ +
+
+
00:00:00.0
+
Latency: 0ms
+
+ +
+ +
+ +
+
+ + +
+ + +
+ +
+ + +
+ + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/css/chat-tablet.css --- a/www/m/css/chat-tablet.css Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/css/chat-tablet.css Sat Sep 08 08:25:19 2012 +0000 @@ -153,16 +153,16 @@ user-select: none; display: inline-block; text-decoration: none; - background: #43a1f7; - background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #43a1f7), color-stop(1, #377ad0)); - background: -webkit-linear-gradient(top, #43a1f7 0%, #377ad0 100%); - background: -moz-linear-gradient(top, #43a1f7 0%, #377ad0 100%); - background: linear-gradient(top, #43a1f7 0%, #377ad0 100%); + background: white; + !background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #43a1f7), color-stop(1, #377ad0)); + !background: -webkit-linear-gradient(top, #43a1f7 0%, #377ad0 100%); + !background: -moz-linear-gradient(top, #43a1f7 0%, #377ad0 100%); + !background: linear-gradient(top, #43a1f7 0%, #377ad0 100%); border: 1px solid #2e70c4; -webkit-border-radius: 16px; -moz-border-radius: 16px; border-radius: 16px; - color: #fff; + color: black; font-family: "lucida grande", sans-serif; font-size: 11px; font-weight: normal; @@ -173,11 +173,11 @@ } button:hover, button.hover { - background: darker; - background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #43a1f7), color-stop(1, #2e70c4)); - background: -webkit-linear-gradient(top, #43a1f7 0%, #2e70c4 100%); - background: -moz-linear-gradient(top, #43a1f7 0%, #2e70c4 100%); - background: linear-gradient(top, #43a1f7 0%, #2e70c4 100%); + background: white; + !background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #43a1f7), color-stop(1, #2e70c4)); + !background: -webkit-linear-gradient(top, #43a1f7 0%, #2e70c4 100%); + !background: -moz-linear-gradient(top, #43a1f7 0%, #2e70c4 100%); + !background: linear-gradient(top, #43a1f7 0%, #2e70c4 100%); border: 1px solid #2e70c4; cursor: pointer; text-shadow: 0 -1px 1px #2c6bbb; diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/css/nodescore-tablet.css --- a/www/m/css/nodescore-tablet.css Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/css/nodescore-tablet.css Sat Sep 08 08:25:19 2012 +0000 @@ -3,7 +3,7 @@ color: white; font: 12px Helvetica, Arial; padding:0px; - margin-top:0px; + margin-top:2px; margin-left:0px; height:100%; } @@ -39,18 +39,18 @@ .outermaster{ margin-top:4px; height: 470px; - width: 1024px; + width: 1022px; border-radius: 15px; - background-color:black; - border: 1px solid gray; + !2Bbackground-color:black; + !border: 1px solid gray; position: relative; !padding: 5px 5px 5px 5px ; - color: white; - opacity:0.8; + !color: white; + !opacity:0.8; !top: 10% +filter: invert(100%); - margin-left: 0px; - padding:0px; + !2Bmargin-left: 0px; + !padding:0px; } #live{ @@ -78,7 +78,7 @@ position: absolute; border: 0px solid red; border-radius:15px; -top: 338px; +top: 335px; !padding: 5px 5px 5px 5px; height: 135px; width: 100%; @@ -101,7 +101,7 @@ height: 120px; width: 30%; margin: 0px; - margin-left:15px; + margin-left:6%; border: 1px solid gray; padding: 5px 5px 5px 5px ; background: black; @@ -112,7 +112,7 @@ #preview{ border-radius: 15px; height: 120px; - width: 400px; + width: 30%; margin: 0px; border: 1px solid gray; !position: absolute; @@ -122,7 +122,9 @@ color: black; overflow:hidden; float:right; + font-size:1em; } +#preview img{margin-top:15px;} #timeinfo{ border-radius: 15px; @@ -137,12 +139,14 @@ #remainingtime{ !display:table-cell; vertical-align:middle; +padding:0; +margin:0; font-size:1.4em; color:white; position:relative; -left:30px; -top:40px; -width: 120px; +left:40px; +top:90px; +width:120px; float:left; background-color:transparent; } @@ -176,11 +180,13 @@ } .svgmusic { + padding:0px; + border: 1px solid gray; display:block; border-radius: 15px; margin: 0px; width: 100%; -height: 450px; + height: 330px; } .magicsquare { @@ -208,27 +214,24 @@ #datetime{ -! display:table-cell; vertical-align:middle; - width:80px; - float:clear; - !margin-top: 30px; - !margin-right: 30px; - !float:left; + display:table-cell; vertical-align:middle; + width:90px; !padding: 1px 1px 1px 1px; - font-size:1em; color: white; - !position: absolute; - !bottom: 10px; - !left: 25%; - !float: left; - !background-color: transparent; + font-size:0.9em; color: white; + text-align:center; + position: relative; + bottom: 25px; + right: 4px; + float: left; + background-color: transparent; !opacity: 0.7; } #current{ float:right; position: relative; - right: 5%; - bottom:-5px; + right: 70%; + bottom:50px; font-size:1.7em; font-weight: bold; color: white; @@ -241,15 +244,15 @@ #client_latency{ background:transparent; width:135px; - font-size:1.2em; + font-size:1em; color: white; z-index: 1; padding: 3px 3px 3px 3px; - opacity: 0.6; + opacity: 0.8; float:left; position:relative; - left: 100px; - bottom: 10px; + left: 90px; + bottom: 72px; } @@ -257,9 +260,9 @@ float:right; border-radius: 5px; position: relative; - right: 40px; + right: 20px; top:-25px; - width: 50px; + width: 60px; height: 30px; color: black; text-align: center; @@ -269,7 +272,7 @@ border: 1px solid white; } -#metronome0 { position: absolute; width: 50px; height: 30px; border-radius: 5px; float:left; } +#metronome0 { position: absolute; width: 60px; height: 30px; border-radius: 5px; float:left; } #metronome1 { width: 50px; height: 40px; border-radius: 30px; float:left; } #metronome2 { width: 50px; height: 40px; border-radius: 30px; float:left; } #metronome3 { width: 50px; height: 40px; border-radius: 30px; float:left; } @@ -293,15 +296,15 @@ border-radius: 15px; !border: 2px solid gray ; float:right; - background-color: black; + background-color: transparent; color: white; - font-size: 2.8em; + font-size: 3.7em; text-align: center; - opacity:0.7; + opacity:0.8; position: relative; - left: 20px; - bottom:10px; - width: 200px; + left: 10px; + bottom:64px; + width: 210px; !height: 40px; z-position: 2; } @@ -312,18 +315,19 @@ float:left; width:120px; position:relative; - top:5px; - left:5px; + top:-5px; + left:20px; } #count { width:40px; font-size: 5em; font-weight:bolder; + font-align:center; margin:0; padding:0; position:relative; - left:15px; + left:35px; top: -10px; background:transparent; float:left; @@ -331,11 +335,12 @@ } #totalcountdown { - font-size: 1.3em; - color:red; + font-size: 1.7em; + font-weight:bolder; + color:orange; position:relative; - left: 10px; - !top: 0px; + left: 0px; + bottom: -3px; !text-align:center font-weight:bolder; !width:100%; diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/ctrl.html --- a/www/m/ctrl.html Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/ctrl.html Sat Sep 08 08:25:19 2012 +0000 @@ -64,7 +64,6 @@
-
diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/js/nodescore-slides.js --- a/www/m/js/nodescore-slides.js Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/js/nodescore-slides.js Sat Sep 08 08:25:19 2012 +0000 @@ -119,7 +119,7 @@ var next=(((unit+1)%units)+units)%units //console.log("HOP TURN" + unit+ "next:" + next); $("#live").load("music.html #"+unit +" *"); - $("#preview").html("

n e x t :

") + $("#preview").html("

n e x t :

") } //////////////////////////////////////////////// diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/music.html --- a/www/m/music.html Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/music.html Sat Sep 08 08:25:19 2012 +0000 @@ -2,8 +2,8 @@ diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/score.html --- a/www/m/score.html Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/score.html Sat Sep 08 08:25:19 2012 +0000 @@ -1,50 +1,29 @@ + score@nodescore - - - + + - - - + - + +
- +
-
-
- -

static notation demo + + + n o d e s c o r e

-
-
-
- +
@@ -67,53 +46,57 @@
- -
-

...

-

...

-
...
+ +
+ +
+
+
+
+ +
+ next in: +
.
+
+ +
+
+
+ +
+
+
00:00:00.0
+
Latency: 0ms
+
+ +
+ +
+ +
+
+ + +
+ + +
+
-
-
- -
- -
-
-
-
-
-
- -
GROUP: 1
-
Latency: 0ms
-
-
00:00:00.0
- -
- -
- - - - - + +
diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/slides.html --- a/www/m/slides.html Tue Sep 04 07:25:49 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +0,0 @@ - - - - - score@nodescore - - - - - - - - - - - - - - - - - -
- -
- -
-
-
-
-
-

LOGIN:

- -

Nickname already in use

-
-
-
-
Connecting to socket.io server
-
-
-
-
-
-
- - -
-
-
- -
- -
-
-
-
- -
- next in: -
.
-
- -
-
-
- -
- -
00:00:00.0
-
Latency: 0ms
-
- -
- -
- -
-
- - -
- - -
- -
- - -
- - - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/12_7_1.svg --- a/www/m/svg/12_7_1.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/12_7_1.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,62 +1,34 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - + - - - - - - -8va - - - - - + + + + + - - - - - -12 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/13_6_2.svg --- a/www/m/svg/13_6_2.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/13_6_2.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,66 +1,35 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - + + + + - - - - -8va - - - - - - - - - + + - - -13 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/14_1_1.svg --- a/www/m/svg/14_1_1.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/14_1_1.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,48 +1,28 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - + + - - - - - -14 - + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/15_0_2.svg --- a/www/m/svg/15_0_2.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/15_0_2.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,46 +1,27 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - -15 - + + + + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/16_2_2.svg --- a/www/m/svg/16_2_2.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/16_2_2.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,34 +1,29 @@ - + - + - - - - - - - - - - + + + + + + - - - + - - - - + + + + - - - -16 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/17_3_1.svg --- a/www/m/svg/17_3_1.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/17_3_1.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,29 +1,27 @@ - + - + - - - - - - - - - - - - + + + + + + + + + + + - - - - -17 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/18_4_2.svg --- a/www/m/svg/18_4_2.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/18_4_2.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,48 +1,30 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - + + - - - + + + - - - -18 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/19_5_1.svg --- a/www/m/svg/19_5_1.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/19_5_1.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,48 +1,29 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - + + + - - - + + - - - -19 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/20_5_0.svg --- a/www/m/svg/20_5_0.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/20_5_0.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,54 +1,31 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - -8vb - - - - - - + + - - - - - -20 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/21_4_3.svg --- a/www/m/svg/21_4_3.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/21_4_3.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,60 +1,36 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + + - - - -21 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/22_3_0.svg --- a/www/m/svg/22_3_0.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/22_3_0.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,61 +1,33 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - + + - - + - - - -8va - - - - - - + + - - - - - - -22 - + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/23_2_3.svg --- a/www/m/svg/23_2_3.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/23_2_3.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,50 +1,29 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - -8vb - - - - - - + + - - - - -23 - + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/24_0_3.svg --- a/www/m/svg/24_0_3.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/24_0_3.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,55 +1,29 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - -8va - - - - - - + + - + - - - - -24 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/25_1_0.svg --- a/www/m/svg/25_1_0.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/25_1_0.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,58 +1,29 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - + - - + + - - - - - -25 - + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/26_6_3.svg --- a/www/m/svg/26_6_3.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/26_6_3.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,27 +1,25 @@ - + - + - - - - - - - + + + + + + + - - - - - - - - -26 - + + + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/27_7_0.svg --- a/www/m/svg/27_7_0.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/27_7_0.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,34 +1,28 @@ - + - + - - - - - - - - - - + + + + + + + - - - - - - - + + + + + - - -27 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/28_7_7.svg --- a/www/m/svg/28_7_7.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/28_7_7.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,32 +1,29 @@ - + - + - - - - - - - - - - + + + + + + + + + + + - - - + + - - - - - -28 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/29_6_4.svg --- a/www/m/svg/29_6_4.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/29_6_4.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,51 +1,32 @@ - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - -8vb - - - - - - - + + - + - - - - -29 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/30_1_7.svg --- a/www/m/svg/30_1_7.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/30_1_7.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,38 +1,27 @@ - + - + - - - - - - - - + + + + + + - - - - - -8va - - - - - - + + + + + - - - -30 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/31_0_4.svg --- a/www/m/svg/31_0_4.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/31_0_4.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,33 +1,31 @@ - + - + - - - - - - + + + + + - - - - - + + + + - - + - - + - - - -31 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/32_2_4.svg --- a/www/m/svg/32_2_4.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/32_2_4.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,48 +1,32 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - + + - - - + + - - - -32 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/33_3_7.svg --- a/www/m/svg/33_3_7.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/33_3_7.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,37 +1,28 @@ - + - + - - - - - - - - - - - - - -8vb - - - - - - + + + + + + + + + + - - + + + - - -33 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/34_4_4.svg --- a/www/m/svg/34_4_4.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/34_4_4.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,44 +1,30 @@ - + - + - - - - - - - - - - - - + + + + + + + - + - - - -8va - - - - - - + + - - + + - - - -34 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/35_5_7.svg --- a/www/m/svg/35_5_7.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/35_5_7.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,39 +1,30 @@ - + - + - - - - - - - - - - - + + + + + - - - + + - - - - - + + + + - - + - - -35 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/36_5_6.svg --- a/www/m/svg/36_5_6.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/36_5_6.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,50 +1,29 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - + + - - -36 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/37_4_5.svg --- a/www/m/svg/37_4_5.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/37_4_5.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,31 +1,29 @@ - + - + - - - - - - - + + + + + + - - + - - - - - + + + + - - - -37 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/38_3_6.svg --- a/www/m/svg/38_3_6.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/38_3_6.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,32 +1,30 @@ - + - + - - - - - - - - + + + + + + + - - - - - - + + + + + - - + - - -38 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/39_2_5.svg --- a/www/m/svg/39_2_5.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/39_2_5.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,47 +1,30 @@ - + - + - - - - - - - - - - - - - - - - - - - + + + + + - - - + + - - - + - - - + + + - - - -39 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/40_0_5.svg --- a/www/m/svg/40_0_5.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/40_0_5.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,45 +1,28 @@ - + - + - - - - - - - - - - - - - - - - - - - - - -8vb - - - - - + + + + + + + + + + + + + - - - - - -40 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/41_1_6.svg --- a/www/m/svg/41_1_6.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/41_1_6.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,49 +1,30 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + - - + - - - - + + + - - -41 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/42_6_5.svg --- a/www/m/svg/42_6_5.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/42_6_5.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,50 +1,27 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - + - - - - - - -42 - + + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/43_7_6.svg --- a/www/m/svg/43_7_6.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/43_7_6.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,49 +1,31 @@ - + - + - - - - - - - - - - - - - - + + + + + - - + + - + - - - - -8va - - - - - - + - - + + - - -43 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/44_7_5.svg --- a/www/m/svg/44_7_5.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/44_7_5.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,42 +1,30 @@ - + - + - - - - - - - - - - - - - - + + + + + - - - + + - - + - - + - - - - - -44 - + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/45_6_6.svg --- a/www/m/svg/45_6_6.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/45_6_6.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,38 +1,28 @@ - + - + - - - - - - - - - - - - - + + + + + + - - - - - - - - - - -45 - + + + + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/46_1_5.svg --- a/www/m/svg/46_1_5.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/46_1_5.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,65 +1,31 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - + + + + - - - -46 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/47_0_6.svg --- a/www/m/svg/47_0_6.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/47_0_6.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,42 +1,31 @@ - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - + + - - - - - -47 - + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/48_2_6.svg --- a/www/m/svg/48_2_6.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/48_2_6.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,40 +1,27 @@ - + - + - - - - - - - - - - + + + + + + - + - - - -8va - - - - - - + + + - - - - -48 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/49_3_5.svg --- a/www/m/svg/49_3_5.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/49_3_5.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,41 +1,28 @@ - + - + - - - - - - - - - - + + + + + + + - - - - -8va - - - - - - - - + + + + + - - - -49 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/50_4_6.svg --- a/www/m/svg/50_4_6.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/50_4_6.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,52 +1,30 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - -8vb - - - - - - + + + - - - - -50 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/51_5_5.svg --- a/www/m/svg/51_5_5.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/51_5_5.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,51 +1,31 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - -8vb - - - - - - + - - + + - - - -51 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/52_5_4.svg --- a/www/m/svg/52_5_4.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/52_5_4.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,29 +1,27 @@ - + - + - - - - - - - - - - - - + + + + + + + + + + + - - - - -52 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/53_4_7.svg --- a/www/m/svg/53_4_7.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/53_4_7.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,46 +1,30 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + - - - + + - - - - - -53 - + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/54_3_4.svg --- a/www/m/svg/54_3_4.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/54_3_4.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,44 +1,28 @@ - + - + - - - - - - - - - - - - - - - - - - - + + + + + + - - - - + + - - - - - - -54 - + + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/55_2_7.svg --- a/www/m/svg/55_2_7.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/55_2_7.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,34 +1,30 @@ - + - + - - - - - - - - - - - - + + + + + + + + + - - - + + - - - - - -55 - + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/56_0_7.svg --- a/www/m/svg/56_0_7.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/56_0_7.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,51 +1,30 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - + - - - - + + + - - + - - -56 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/57_1_4.svg --- a/www/m/svg/57_1_4.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/57_1_4.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,34 +1,26 @@ - + - + - - - - - - - + + + + + + + + - - - - - - -8vb - - - - - - - - -57 - + + + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/58_6_7.svg --- a/www/m/svg/58_6_7.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/58_6_7.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,44 +1,29 @@ - + - + - - - - - - - - - - - + + + + + + - - - - - - -8va - - - - - - + + - - - - -58 - + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/59_7_4.svg --- a/www/m/svg/59_7_4.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/59_7_4.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,53 +1,27 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - -59 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/60_7_3.svg --- a/www/m/svg/60_7_3.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/60_7_3.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,50 +1,34 @@ - + - + - - - - - - - - - - - - - - - + + + + + + + + + + - - - + + + + + - - - -8vb - - - - - - - - - - - - -60 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/61_6_0.svg --- a/www/m/svg/61_6_0.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/61_6_0.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,65 +1,28 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + - - - - - - -61 - + + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/62_1_3.svg --- a/www/m/svg/62_1_3.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/62_1_3.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,31 +1,29 @@ - + - + - - - - - - - + + + + + + - - - - + + + - - - - + + + - - -62 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/63_0_0.svg --- a/www/m/svg/63_0_0.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/63_0_0.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,52 +1,32 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - -8vb - - - - - - + + + + + + + + + + + + + - - + + + + - - -63 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/64_2_0.svg --- a/www/m/svg/64_2_0.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/64_2_0.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,45 +1,26 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - + + + + + + - - -64 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/65_3_3.svg --- a/www/m/svg/65_3_3.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/65_3_3.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,67 +1,31 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - + + + - - + - - -65 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/66_4_0.svg --- a/www/m/svg/66_4_0.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/66_4_0.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,27 +1,25 @@ - + - + - - - - - - - - + + + + + + + - - - - - - - -66 - + + + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/67_5_3.svg --- a/www/m/svg/67_5_3.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/67_5_3.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,67 +1,35 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - + - - - - -8va - - - - - - + + - - - + + - - -67 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/68_5_2.svg --- a/www/m/svg/68_5_2.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/68_5_2.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,38 +1,27 @@ - + - + - - - - - - - - - - - - - - + + + + + + - - + - - - - + + + - - - -68 - + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/69_4_1.svg --- a/www/m/svg/69_4_1.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/69_4_1.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,55 +1,32 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - -8vb - - - - - - + + - - - + + - - -69 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/70_3_2.svg --- a/www/m/svg/70_3_2.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/70_3_2.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,38 +1,29 @@ - + - + - - - - - - - - - - + + + + + + + + + + - - - -8vb - - - - - - - - + + + + - - - -70 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/71_2_1.svg --- a/www/m/svg/71_2_1.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/71_2_1.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,59 +1,30 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - -8va - - - - - + + + - - + + + - - - - -71 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/72_0_1.svg --- a/www/m/svg/72_0_1.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/72_0_1.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,60 +1,29 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - + - - + + - - - - - -72 - + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/73_1_2.svg --- a/www/m/svg/73_1_2.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/73_1_2.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,58 +1,30 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + - - - -8va - - - - - - - - + + + + + - - - -73 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/74_6_1.svg --- a/www/m/svg/74_6_1.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/74_6_1.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,36 +1,28 @@ - + - + - - - - - - - - - - - - + + + + + + + - - - - - - - + + + + + - - -74 - diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/75_7_2.svg --- a/www/m/svg/75_7_2.svg Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/75_7_2.svg Sat Sep 08 08:25:19 2012 +0000 @@ -1,30 +1,28 @@ - + - + - - - - - - - - - + + + + + + + + - - - + + - - - - - -75 - + + + diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/svg/svg-stylesheet.css --- a/www/m/svg/svg-stylesheet.css Tue Sep 04 07:25:49 2012 +0000 +++ b/www/m/svg/svg-stylesheet.css Sat Sep 08 08:25:19 2012 +0000 @@ -1,6 +1,6 @@ -svg { background-color: black; width:1000px; height:450px; display:block;} +svg { background-color: black; width:1000px; height:330px; display:block;} line { stroke: white; } -text { fill: white;} +text { fill: white;} path { stroke: white; fill: white; } rect { fill: white; } circle { stroke: white; } diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/thumbs/1.png Binary file www/m/thumbs/1.png has changed diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/thumbs/2.png Binary file www/m/thumbs/2.png has changed diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/thumbs/3.png Binary file www/m/thumbs/3.png has changed diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/thumbs/4.png Binary file www/m/thumbs/4.png has changed diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/thumbs/5.png Binary file www/m/thumbs/5.png has changed diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/m/thumbs/6.png Binary file www/m/thumbs/6.png has changed diff -r 49c94f63b8b0 -r 7f0485e0d0ff www/p/index.html --- a/www/p/index.html Tue Sep 04 07:25:49 2012 +0000 +++ b/www/p/index.html Sat Sep 08 08:25:19 2012 +0000 @@ -1,12 +1,12 @@ - + nodescore - + @@ -15,7 +15,7 @@ - + @@ -32,299 +32,277 @@ -
+
+ + +
+ + +
+
+ +

REALTIME WEB TECHNOLOGIES IN THE NETWORKED PERFORMANCE ENVIRONMENT

+

+ + - http://rob.kiben.net rob@kiben.net - +

+
+ +
+

NODESCORE

+

+ NodeScore is a web based framework to facilitate networked ensemble performance. +

+
    +
  • Scores assembled in HTML5
    • +
  • Musicians displays controled remotely
    • +
  • Not all-in-one solution - Modular Approach
    • +
  • Runs alongside other streams: media, OSC automation etc.
    • +
- -
- - -
-
-

ICMC 2012

-

REALTIME WEB TECHNOLOGIES IN THE NETWORKED PERFORMANCE ENVIRONMENT

-

- - - http://rob.kiben.net rob@kiben.net - -

-
- -
-

NODESCORE

-

-NodeScore is a web based framework to facilitate networked telematic ensemble performance. -

- - -
- - -
-
-

Vertical Slides

-

- Slides can be nested inside of other slides, - try pressing down. -

- - Down arrow - -
-
-

Basement Level 1

-

Press down or up to navigate.

-
-
-

Basement Level 2

-

Cornify

- - Unicorn - -
-
-

Basement Level 3

-

That's it, time to go back up.

- - Up arrow - -
-
+ +
-
-

Holistic Overview

-

- Press ESC to enter the slide overview! -

-
-
-

Works in Mobile Safari

-

- Try it out! You can swipe through the slides pinch your way to the overview. -

-
+
+

NODESCORE

+

-

-

Marvelous Unordered List

-
    -
  • No order here
    • -
  • Or here
    • -
  • Or here
    • -
  • Or here
    • -
-
- -
-

Fantastic Ordered List

-
    -
  1. One is smaller than...
    2. -
  2. Two is smaller than...
    3. -
  3. Three!
    4. -
-
+

-
- ## Markdown support - - For those of you who like that sort of thing. Instructions and a bit more info available [here](https://github.com/hakimel/reveal.js#markdown). - 
<section data-markdown>
-  ## Markdown support
+		BreakDOM game screenshot
+		
+		BreakDOM game screenshot
+		  
+		
+
- For those of you who like that sort of thing. - Instructions and a bit more info available [here](https://github.com/hakimel/reveal.js#markdown). -</section> - -
-
-

Transition Styles

-

- You can select from different transitions, like:
- Cube - - Page - - Concave - - Linear -

-
+ +
+

Standards Complient

-
-

Themes

-

- Reveal.js comes with a few themes built in:
- Sky - - Beige - - Simple - - Default -

-

- - * Theme demos are loaded after the presentation which leads to flicker. In production you should load your theme in the <head> using a <link>. - -

-
+ BreakDOM game screenshot -
-
-

Global State

-

- Set data-state="something" on a slide and "something" - will be added as a class to the document element when the slide is open. This lets you - apply broader style changes, like switching the background. -

- - Down arrow - -
-
-

"blackout"

- - Down arrow - -
-
-

"soothe"

- - Up arrow - -
-
+
    +
  • HTML5
    • +
  • CSS3
    • +
  • (JAVASCRIPT)
    • +
  • WEBSOCKETS
    • +
+

+

+ Open Source - No Plugins
(Flash, Flex, Shockwave, Java) +

+
+ +
+

WEBSOCKETS

+ +

+ Server Push Technology
+

+ + BreakDOM game screenshot + +
    +
  • More efficient than AJAX/Comet Programming
    • +
  • Persistant bidirectional TCP socket
    • +
  • REQUEST/RESPONSE handshakes elimintated
    • +
+ -
-

Custom Events

-

- Additionally custom events can be triggered on a per slide basis by binding to the data-state name. -

- 
Reveal.addEventListener( 'customevent', function() {
-	console.log( '"customevent" has fired' );
-} );
-
-
-
-

Clever Quotes

-

- These guys come in two forms, inline: - The nice thing about standards is that there are so many to choose from and block: -

-
- For years there has been a theory that millions of monkeys typing at random on millions of typewriters would - reproduce the entire works of Shakespeare. The Internet has proven this theory to be untrue. -
-
- -
-

Pretty Code

- 

-function linkify( selector ) {
-  if( supports3DTransforms ) {
-    
-    var nodes = document.querySelectorAll( selector );
+		
+
- for( var i = 0, len = nodes.length; i < len; i++ ) { - var node = nodes[i]; - if( !node.className ) ) { - node.className += ' roll'; - } - }; - } -} - -

Courtesy of highlight.js.

-
- -
-

Intergalactic Interconnections

-

- You can link between slides internally, - like this. -

-
+
+

HTTP://SOCKET.IO

-
-

Fragmented Views

-

Hit the next arrow...

-

... to step through ...

-
    -
  1. any type
    2. -
  2. of view
    3. -
  3. fragments
    4. -
-
- -
-

Spectacular image!

- - BreakDOM game screenshot - -
- -
-

Export to PDF

-

Presentations can be exported to PDF, below is an example that's been uploaded to SlideShare.

- - -
- -
-

Stellar Links

- -
- -
-

THE END

-

BY Hakim El Hattab / hakim.se

-
-
+

Socket.IO simplifies the WebSocket API and unifies the APIs of its fallback transports.

+ + BreakDOM game screenshot + - - + + - -
- -
- - - +var clientFiles = new static.Server('./www'); +var httpServer = http.createServer( + function(request, response) { + request.addListener('end', function () { + clientFiles.serve(request, response); + process.setMaxListeners(0); + }); + }); httpServer.listen(8889); +var io = sio.listen(httpServer); +io.set('log level', 1); // reduce logging +io.sockets.on('connection', function (socket) { + + + +
+

Client Plumbing

+ + // load the sockets lib + 
<script src="/socket.io/socket.io.js"> </script>
+
+// connect to socket +

+var socket = io.connect();
+
+ +//send something down the pipe +

+function startChr() { socket.emit("startChr") }
+
+ +
+

CLIENT->SERVER->CLIENT

+Chronometer on server pushes -> client + 
// instruction from "director" client executed on server
+socket.on('startChr', function () { startChr();}); 
+function startChr() { if (chronstate !== 1) { 
+   chronstate = 1; chronometer();} }
+	    ---snip--- 
+	    setTimeout(function(){chronometer()}, 100);
+	    socket.broadcast.emit('chronFromServer', chron)
+	    socket.emit('chronFromServer', chron) 
+	    ---snip---
+// update chron value on the clients in line with server
+socket.on("chronFromServer", function(chron) {
+    $("div#client_chronometer").text(chron);
+});
+ +
+ +
+

NODESCORE: INFO PANEL

+ + screenshot + + +

+

+
+ +
+

NODESCORE: CHAT PANEL

+ + screenshot + + +

+

+
+ +
+

NODESCORE: NEXUS7 CSS

+ + screenshot + + +

+

+
+ + +
+

Future Work

+

the TODO list...

+
    +
  1. trials room->field->world
    2. +
  2. Animated SVG, WebGL, <audio>,<video>
    3. + +
  3. + stop coding start composing
    +
    4. + +
+
+ + + + + + +
+

links

+ This Presentation: http://nodescore.kiben.net/p/

+ + http://nodescore.kiben.net

+ + ICMC2012 Paper

+ Source Code on Gitorious

+ + rc-web@kiben.net

+ + View Rob Canning's profile on LinkedIn +

+ + +
+
+ + + + + +
+ +
+ + + + + +