Code cleanup & refactor

This commit is contained in:
Jeremiah Billmann
2013-06-27 18:29:39 -04:00
parent 6d142f5e56
commit fb7ed01407
+30 -36
View File
@@ -205,6 +205,31 @@ window.GarageServerIO = (function (window, socketio) {
}, interval);
},
getPlayerId = function () {
return stateController.playerId;
},
setPlayerState = function (state) {
socket.emit('state', state);
},
removePlayer = function (id) {
playerController.removePlayer(id);
if (options.onPlayerRemove) {
options.onPlayerRemove(id);
}
},
addPlayerInput = function (clientInput) {
inputController.addInput(clientInput);
if (options.clientSidePrediction && options.onUpdatePlayerPhysics) {
stateController.state = options.onUpdatePlayerPhysics(stateController.state, [{ input: clientInput }]);
}
socket.emit('input', { input: clientInput, seq: inputController.getSequence() });
},
updateState = function (data) {
stateController.setTime(data.time, pingDelay);
stateController.frameTime = new Date().getTime();
@@ -225,12 +250,10 @@ window.GarageServerIO = (function (window, socketio) {
if (socket.socket.sessionid === playerState.id) {
stateController.state = playerState.state;
inputController.removeUpToSequence(playerState.seq);
if (options.clientSidePrediction) {
inputController.removeUpToSequence(playerState.seq);
if (inputController.any()) {
stateController.state = options.onUpdatePlayerPhysics(stateController.state, inputController.getInputs());
}
if (options.clientSidePrediction && inputController.any()) {
stateController.state = options.onUpdatePlayerPhysics(stateController.state, inputController.getInputs());
}
} else {
playerController.forEach(function (player) {
@@ -241,8 +264,8 @@ window.GarageServerIO = (function (window, socketio) {
return;
});
if (!playerFound) {
var player = playerController.addPlayer(playerState.id);
player.addUpate(playerState.state, playerState.seq, data.time);
var newPlayer = playerController.addPlayer(playerState.id);
newPlayer.addUpate(playerState.state, playerState.seq, data.time);
}
}
@@ -256,27 +279,6 @@ window.GarageServerIO = (function (window, socketio) {
},
removePlayer = function (id) {
playerController.removePlayer(id);
if (options.onPlayerRemove) {
options.onPlayerRemove(id);
}
},
addPlayerInput = function (clientInput) {
inputController.addInput(clientInput);
if (options.clientSidePrediction && options.onUpdatePlayerPhysics) {
stateController.state = options.onUpdatePlayerPhysics(stateController.state, [{ input: clientInput }]);
}
sendPlayerInput(clientInput);
},
sendPlayerInput = function (clientInput) {
socket.emit('input', { input: clientInput, seq: inputController.getSequence() });
},
getPlayerStates = function (stateCallback) {
playerController.forEach(function (player) {
if (player.anyUpdates()) {
@@ -296,14 +298,6 @@ window.GarageServerIO = (function (window, socketio) {
}
});
stateCallback(stateController.state);
},
getPlayerId = function () {
return stateController.playerId;
},
setPlayerState = function (state) {
socket.emit('state', state);
};
return {