Client is now linked succesfully
This commit is contained in:
parent
a181737dbb
commit
10a8111565
4 changed files with 45 additions and 8 deletions
|
@ -52,7 +52,6 @@ class Player
|
||||||
if(this.dir!=0){
|
if(this.dir!=0){
|
||||||
this.visibleDir = newDirection;
|
this.visibleDir = newDirection;
|
||||||
}
|
}
|
||||||
Net.update(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
update(squares,circles)//update position
|
update(squares,circles)//update position
|
||||||
|
@ -189,6 +188,6 @@ class Circle
|
||||||
|
|
||||||
collide(point)
|
collide(point)
|
||||||
{
|
{
|
||||||
return ((point.x-this.x)**2+(point.y-this.y)**2<=r**2);
|
return ((point.x-this.x)**2+(point.y-this.y)**2<=this.r**2);
|
||||||
}
|
}
|
||||||
}
|
}
|
30
js/game.js
30
js/game.js
|
@ -3,21 +3,41 @@ let Net = new Network("ws://129.151.227.50:8080/", Renderer);
|
||||||
//let ClientKeyboard = new Keyboard()
|
//let ClientKeyboard = new Keyboard()
|
||||||
|
|
||||||
|
|
||||||
let playerId; //id of client player
|
let playerId = null; //id of client player
|
||||||
let players = [];
|
let players = [];
|
||||||
|
let player = null;
|
||||||
|
|
||||||
Inp = new Input("canvas");
|
Inp = new Input("canvas");
|
||||||
|
|
||||||
Net.connect(); //connect to server, create a player, and retrieve all players info
|
Net.connect(); //connect to server, create a player, and retrieve all players info
|
||||||
//ClientKeyboard.init();
|
//ClientKeyboard.init();
|
||||||
|
|
||||||
|
playerId=Net.playerId;
|
||||||
|
player=Net.clientPlayer;
|
||||||
|
players=Net.getPlayersToAdd();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function game() {
|
function game() {
|
||||||
for (var i = players.length - 1; i >= 0; i--) {
|
if(playerId==null)
|
||||||
players[i].update([],[]);
|
{
|
||||||
|
if (Net.playerId!=null)
|
||||||
|
{
|
||||||
|
playerId=Net.playerId;
|
||||||
|
player=Net.clientPlayer;
|
||||||
|
players=Net.getPlayersToAdd();
|
||||||
|
//Inp.player=player; //pour connecter les input au joueur client
|
||||||
|
console.log("Connected as id ",playerId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (var i = players.length - 1; i >= 0; i--) {
|
||||||
|
players[i].update([],[]);//squares, circles
|
||||||
|
}
|
||||||
|
//console.log(Inp.calculateAngle(500,500))
|
||||||
|
Renderer.ReloadAff();
|
||||||
}
|
}
|
||||||
//console.log(Inp.calculateAngle(500,500))
|
|
||||||
Renderer.ReloadAff();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setInterval(game);
|
setInterval(game);
|
|
@ -1,3 +1,17 @@
|
||||||
|
/////////////
|
||||||
|
/////////////
|
||||||
|
/////////////
|
||||||
|
// DEAD CLASS !!!
|
||||||
|
// DO NOT USE
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Keyboard{
|
class Keyboard{
|
||||||
constructor(){
|
constructor(){
|
||||||
this.keysDown = new Set()
|
this.keysDown = new Set()
|
||||||
|
|
|
@ -4,6 +4,7 @@ class Network{
|
||||||
this.connected = false;
|
this.connected = false;
|
||||||
|
|
||||||
this.playerId = null;
|
this.playerId = null;
|
||||||
|
this.clientPlayer=null;
|
||||||
this.playersToAdd = [];
|
this.playersToAdd = [];
|
||||||
this.playersToRemove = [];
|
this.playersToRemove = [];
|
||||||
this.playersToUpdate = [];
|
this.playersToUpdate = [];
|
||||||
|
@ -14,7 +15,10 @@ class Network{
|
||||||
case 'connect':
|
case 'connect':
|
||||||
this.playerId = data.data.playerId;
|
this.playerId = data.data.playerId;
|
||||||
for (var i = data.data.players.length - 1; i >= 0; i--) {
|
for (var i = data.data.players.length - 1; i >= 0; i--) {
|
||||||
this.playersToAdd.push(new Player(data.data.players[i].id, data.data.players[i].x, data.data.players[i].y, data.data.players[i].name, data.data.players[i].dir))
|
if(data.data.players[i].id==this.playerId)
|
||||||
|
this.clientPlayer=data.data.players[i];
|
||||||
|
else
|
||||||
|
this.playersToAdd.push(new Player(data.data.players[i].id, data.data.players[i].x, data.data.players[i].y, data.data.players[i].name, data.data.players[i].dir))
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'update':
|
case 'update':
|
||||||
|
|
Loading…
Reference in a new issue