Initial synchronization fixes
This commit is contained in:
parent
7e6bfdbd98
commit
ba5f3df01b
|
@ -1,8 +1,8 @@
|
||||||
export class physicsObject{
|
export class physicsObject{
|
||||||
name : string
|
name : string
|
||||||
//array of floats [3]
|
//array of floats [3]
|
||||||
position : number[] = []
|
position : number[] = [0,0,0]
|
||||||
rotation : number[] = []
|
rotation : number[] = [0,0,0]
|
||||||
velocity : number[] = []
|
velocity : number[] = [0,0,0]
|
||||||
angularVelocity : number[] = []
|
angularVelocity : number[] = [0,0,0]
|
||||||
}
|
}
|
|
@ -11,16 +11,16 @@ export function registerLobbyCallbacks(socket){
|
||||||
let buff = Buffer.from(data, 'base64');
|
let buff = Buffer.from(data, 'base64');
|
||||||
let data1 : playerData = JSON.parse(buff.toString('utf-8'));
|
let data1 : playerData = JSON.parse(buff.toString('utf-8'));
|
||||||
|
|
||||||
if(socket.user.playerData == null){
|
let pd = new playerData()
|
||||||
let pd = new playerData()
|
pd.socketId = socket.id
|
||||||
socket.user.playerData = pd
|
pd.userName = socket.user.login
|
||||||
}
|
pd.characterId = data1.characterId;
|
||||||
|
pd.inventory = data1.inventory;
|
||||||
socket.user.playerData.characterId = data1.characterId;
|
socket.user.playerData = pd
|
||||||
socket.user.playerData.socketId = socket.id
|
|
||||||
|
|
||||||
game.lobbyState.players.push(socket.user.playerData)
|
game.lobbyState.players.push(socket.user.playerData)
|
||||||
game.socketIO.emit("lobby/playerJoin", JSON.stringify(socket.user.playerData))
|
game.socketIO.emit("lobby/playerJoin", JSON.stringify(game.lobbyState))
|
||||||
|
socket.emit('lobby/messages', JSON.stringify(game.messages))
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.on('lobby/playerUpdate', (data) => {
|
socket.on('lobby/playerUpdate', (data) => {
|
||||||
|
@ -32,12 +32,10 @@ export function registerLobbyCallbacks(socket){
|
||||||
|
|
||||||
let idx = game.lobbyState.players.findIndex((pl) => pl.socketId == socket.id)
|
let idx = game.lobbyState.players.findIndex((pl) => pl.socketId == socket.id)
|
||||||
if(idx == -1){
|
if(idx == -1){
|
||||||
socket.player = data1
|
console.log("Error! Player not spawned!")
|
||||||
game.lobbyState.players.push(data1)
|
|
||||||
socket.emit('lobby/messages', JSON.stringify(game.messages))
|
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
game.lobbyState.players[idx] = data1
|
game.lobbyState.players[idx].rigidbody = data1.rigidbody
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue