diff nodescore.js @ 83:74367de56cbf

added svg prefiew and better UI layout

--- a/nodescore.js	Sun Jul 20 14:33:53 2014 +0100
+++ b/nodescore.js	Wed Jul 23 15:56:20 2014 +0100
@@ -157,7 +157,15 @@
     }
 
     // if not already started start the chronometer and sequencer    
-    function startChr(socket) { chronCtrl(1,100); step(seqA);step(seqB); step(seqC); step(seqD); }
+    function startChr(socket) { 
+	chronCtrl(1,100); 
+	// these seq[A-D] arrays come from scoreB.js and then become the seq variable
+	step(seqA);
+	step(seqB); 
+	step(seqC); 
+	step(seqD); 
+    }
+
     // stop the chronometer   
     function stopChr() { console.log("stop chron"); chronCtrl(0); }  
     
@@ -177,23 +185,25 @@
     requirejs(['scoreB'],function(scoreB) {});
     
     var sequencerState=0;
-    var numberoftransects=3
-    var order=8
+    var numberoftransects=3;
+    var order=8;
     var countdowntick=function(seq){
 	var unit=seq.units[seq.transect%numberoftransects][seq.counter];
 	var unitlast=seq.units[seq.transect%numberoftransects][seq.counter-1];
 	var voice=seq.voice;
-	var tempoms = Math.floor(60000/seq.mm)	
-	var timemultiplier=1000
+	var tempoms = Math.floor(60000/seq.mm);	
+	var timemultiplier=1000;
 	var outcount=4; var incount=4;
 	var dur=srcsqr[Math.floor(unit/order)][unit%order] + 4
 	var time = dur;
 	var ztime=time; 
 	var totaltime=time
+
 	initPage=function(seq){
 	    // initiate first page here
-	    socket.emit("pageIni", voice, unit, time, seq.mm,seq.counter,seq.nextunit );
-	    socket.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,seq.nextunit );
+	    var nextunit=seq.units[seq.transect%numberoftransects][seq.counter+1];
+	    socket.emit("pageIni", voice, unit, time, seq.mm,seq.counter,nextunit );
+	    socket.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit );
 	}
 
 	function sequenCer() {
@@ -205,7 +215,8 @@
 		    seq.counter = (seq.counter + 1) % (order)	    				
 		    //increment the transect
 		    if ( seq.counter==0 ){ seq.transect += 1 }
-		    socket.broadcast.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,seq.nextunit);
+		    var nextunit=seq.units[seq.transect%numberoftransects][seq.counter+1];
+		    socket.broadcast.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit);
 		    clearInterval(pulse)
 		    step(seq);     
 		}
@@ -254,9 +265,9 @@
 	    
 	    // decrement the time 
 	    ztime -= 1
-
-// this shows undefined counter output - bug related	    
-//	    console.log(counter)
+	    
+	    // this shows undefined counter output - bug related	    
+	    //	    console.log(counter)
 	}
 	
 	var pulse = setInterval(sequenCer, tempoms);