comparison nodescore.js @ 87:e9cbc93e1d10

make sure images are always loaded - client late join bug closed
author Rob Canning <rob@foo.net>
date Tue, 29 Jul 2014 00:21:50 +0100
parents 74367de56cbf
children f214909fb108
comparison
equal deleted inserted replaced
86:f0d3ee8dacd6 87:e9cbc93e1d10
197 var dur=srcsqr[Math.floor(unit/order)][unit%order] + 4 197 var dur=srcsqr[Math.floor(unit/order)][unit%order] + 4
198 var time = dur; 198 var time = dur;
199 var ztime=time; 199 var ztime=time;
200 var totaltime=time 200 var totaltime=time
201 201
202
202 initPage=function(seq){ 203 initPage=function(seq){
203 // initiate first page here 204 // initiate first page here
204 var nextunit=seq.units[seq.transect%numberoftransects][seq.counter+1]; 205 var nextunit=seq.units[seq.transect%numberoftransects][seq.counter+1];
205 socket.emit("pageIni", voice, unit, time, seq.mm,seq.counter,nextunit ); 206 socket.emit("pageIni", voice, unit, time, seq.mm,seq.counter,nextunit );
206 socket.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit ); 207 //socket.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit );
207 } 208 }
208 209
209 function sequenCer() { 210 function sequenCer() {
210 if (ztime >= 0 ){ 211 if (ztime >= 0 ){
211 var counter = ztime 212 var counter = ztime
214 //increment the row position 215 //increment the row position
215 seq.counter = (seq.counter + 1) % (order) 216 seq.counter = (seq.counter + 1) % (order)
216 //increment the transect 217 //increment the transect
217 if ( seq.counter==0 ){ seq.transect += 1 } 218 if ( seq.counter==0 ){ seq.transect += 1 }
218 var nextunit=seq.units[seq.transect%numberoftransects][seq.counter+1]; 219 var nextunit=seq.units[seq.transect%numberoftransects][seq.counter+1];
219 socket.broadcast.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit); 220 //socket.broadcast.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit);
220 clearInterval(pulse) 221 clearInterval(pulse)
221 step(seq); 222 step(seq);
222 } 223 }
223 224
224 if (counter >= 0 ){ 225 if (counter >= 0 ){
252 "","playing.. ", "green","transparent",unit); 253 "","playing.. ", "green","transparent",unit);
253 socket.emit('countinFromServer', 254 socket.emit('countinFromServer',
254 voice, "+", 255 voice, "+",
255 "","playing.. ", "green","transparent",unit); 256 "","playing.. ", "green","transparent",unit);
256 } 257 }
257 } 258 }
258
259 // on each beat do: 259 // on each beat do:
260 // push out the pulse to metronome 260 // push out the pulse to metronome
261 seq.metrobeat = (seq.metrobeat+1)%seq.beatsinbar ; 261 seq.metrobeat = (seq.metrobeat+1)%seq.beatsinbar ;
262 socket.broadcast.emit('metroPulse', tempoms, voice,seq.metrobeat); 262 socket.broadcast.emit('metroPulse', tempoms, voice,seq.metrobeat);
263 socket.emit('metroPulse', tempoms, voice, seq.metrobeat); 263 socket.emit('metroPulse', tempoms, voice, seq.metrobeat);
264 console.log("sdfasfdasdfasdfasf");
265 //socket.emit("pageFlipfromserver", voice, unit, time, seq.mm,seq.counter,nextunit);
266 var nextunit=seq.units[seq.transect%numberoftransects][seq.counter+1];
267 socket.broadcast.emit("pageIni", voice, unit, time, seq.mm,seq.counter,nextunit );
264 } 268 }
265
266 // decrement the time 269 // decrement the time
267 ztime -= 1 270 ztime -= 1
268
269 // this shows undefined counter output - bug related 271 // this shows undefined counter output - bug related
270 // console.log(counter) 272 // console.log(counter)
271 } 273 }
272 274
273 var pulse = setInterval(sequenCer, tempoms); 275 var pulse = setInterval(sequenCer, tempoms);