diff --git a/traque.js b/traque.js index ee692c6..d31676b 100644 --- a/traque.js +++ b/traque.js @@ -59,6 +59,7 @@ io.sockets.on('connection', function(socket){ equipes.push(socket); socket.shown = true; socket.color = 0; + socket.position = [0,0]; socket.on('geoLoc', function(d){ socket.position = d.position; if(socket.shown) @@ -71,11 +72,11 @@ io.sockets.on('connection', function(socket){ socket.shown = false; else{ if(!socket.shown) - for(i in equipes) + for(i in equipes) equipes[i].emit('moving', {"id": socket.id, "position": socket.position}); socket.shown = true; } - for(i in equipes) + for(i in equipes) equipes[i].emit('changeColor', {"id": socket.id, "color": d.color}); }); socket.on('setName', function(d){ @@ -83,7 +84,15 @@ io.sockets.on('connection', function(socket){ for(i in equipes) equipes[i].emit('setName', {"id": socket.id, "name": d.name}); }); + socket.emit('yourId', {"id": socket.id}); + for(i in equipes){ + if(!equipes[i].shown) + continue; + socket.emit('setName', {"id": i, "name": equipes[i].name}); + socket.emit('changeColor', {"id": i, "color": equipes[i].color}); + socket.emit('moving', {"id": i, "position": equipes[i].position}); + } }); console.log("Launch server");