From c256f8a729bb0db95b1c3dee1b1b1f0a47565318 Mon Sep 17 00:00:00 2001 From: Logsol Date: Sat, 5 Jan 2013 06:16:42 +0100 Subject: [PATCH] refactoring --- app/Game/Client/GameController.js | 47 ++++++++---------- app/Game/Client/Networker.js | 80 +++++++------------------------ app/Game/Server/Channel.js | 35 +++++--------- app/Game/Server/GameController.js | 5 +- app/Game/Server/PipeToLobby.js | 2 +- app/Game/Server/User.js | 27 ++++++----- app/Lobby/Coordinator.js | 2 +- app/Lobby/User.js | 49 +++++++------------ 8 files changed, 87 insertions(+), 160 deletions(-) diff --git a/app/Game/Client/GameController.js b/app/Game/Client/GameController.js index bc8202b..29bffbf 100755 --- a/app/Game/Client/GameController.js +++ b/app/Game/Client/GameController.js @@ -50,37 +50,30 @@ function (Parent, PhysicsEngine, ViewController, KeyboardController, Notificatio GameController.prototype.userJoined = function (user) { var player = Parent.prototype.userJoined.call(this, user); - player.spawn(50, 50); + //player.spawn(50, 50); return player; } -/* - GameController.prototype.userLeft = function (user) { - Parent.prototype.userLeft.call(user); + + GameController.prototype.onWorldUpdate = function (updateData) { + + var body = this.physicsEngine.world.GetBodyList(); + do { + var bodyName = body.GetUserData(); + if(bodyName && updateData[bodyName]) { + var update = updateData[bodyName]; + body.SetAwake(true); + body.SetPosition(update.p); + body.SetAngle(update.a); + body.SetLinearVelocity(update.lv); + body.SetAngularVelocity(update.av); + } + } while (body = body.GetNext()); + } -*/ - GameController.prototype.processGameCommand = function (command, options) { + + GameController.prototype.onPlayerSpawn = function(user) { - if (command == "worldUpdate") { - - var body = this.physicsEngine.world.GetBodyList(); - do { - var userData = body.GetUserData(); - if(userData && options[userData]) { - var update = options[userData]; - - //console.log('position difference:', (body.GetPosition().y - update.p.y) * 30, body.GetLinearVelocity().y); - - body.SetAwake(true); - body.SetPosition(update.p); - body.SetAngle(update.a); - body.SetLinearVelocity(update.lv); - body.SetAngularVelocity(update.av); - } - } while (body = body.GetNext()); - - } - - } + }; return GameController; }); diff --git a/app/Game/Client/Networker.js b/app/Game/Client/Networker.js index 4549b2d..b744ff6 100755 --- a/app/Game/Client/Networker.js +++ b/app/Game/Client/Networker.js @@ -10,32 +10,29 @@ function (ProtocolHelper, GameController, User, NotificationCenter) { function Networker (socketLink) { this.socketLink = socketLink; this.gameController = null; + this.users = {}; this.init(); } Networker.prototype.init = function () { + this.socketLink.on('connect', this.onConnect.bind(this)); + this.socketLink.on('disconnect', this.onDisconnect.bind(this)); + var self = this; - - this.socketLink.on('connect', function () { - self.onConnect(); - }); - this.socketLink.on('message', function (message) { - self.onMessage(message); - }); - - this.socketLink.on('disconnect', function () { - self.onDisconnect(); + ProtocolHelper.applyCommand(message, self); }); NotificationCenter.on("sendGameCommand", this.sendGameCommand, this); } + // Socket callbacks + Networker.prototype.onConnect = function () { console.log('connected.') - this.join('dungeon'); + this.sendCommand('join', 'dungeon'); } Networker.prototype.onDisconnect = function () { @@ -45,30 +42,24 @@ function (ProtocolHelper, GameController, User, NotificationCenter) { document.body.style.backgroundColor = '#aaaaaa'; } - Networker.prototype.join = function (channelName) { - this.sendCommand('join', channelName); - } - - Networker.prototype.onJoinSuccess = function (options) { this.gameController = new GameController(); this.gameController.loadLevel("default.json"); - var user = new User(options.userId); this.gameController.meJoined(user); - console.log("Joined ", options); + console.log("Joined Success", options); - // -> replace with decent command - if (options.others && options.others.length > 0) { + if (options.others) { for(var i = 0; i < options.others.length; i++) { - var user = {id: options.others[i]}; - this.gameController.userJoined(user); + this.users[userId] = new User(options.others[i]); } } } + // Sending commands + Networker.prototype.sendCommand = function (command, options) { var message = ProtocolHelper.encodeCommand(command, options); this.socketLink.send(message); @@ -79,53 +70,18 @@ function (ProtocolHelper, GameController, User, NotificationCenter) { this.sendCommand('gameCommand', message); } - Networker.prototype.onMessage = function (message) { - var self = this; - - ProtocolHelper.runCommands(message, function (command, options) { - self.processControlCommand(command, options); - }); - - } + // Commands from server Networker.prototype.onUserJoined = function (userId) { - // -> replace with game command - var user = {id: userId}; - this.gameController.userJoined(user); - console.log("User " + userId + " joined"); + this.users[userId] = new User(userId); } Networker.prototype.onUserLeft = function (userId) { - // -> replace with game command - var user = {id: userId}; - this.gameController.userLeft(user); - console.log("User " + userId + " left"); + delete this.users[userId]; } - Networker.prototype.processControlCommand = function (command, options) { - - switch(command) { - case 'joinSuccess': - this.onJoinSuccess(options); - break; - - case 'gameCommand': - for(var gameCommand in options) { - this.gameController.processGameCommand(gameCommand, options[gameCommand]); - } - break; - - case 'userJoined': - this.onUserJoined(options); - break; - - case 'userLeft': - this.onUserLeft(options); - break; - - default: - break; - } + Networker.prototype.onGameCommand = function(message) { + ProtocolHelper.applyCommand(message, this.gameController); } return Networker; diff --git a/app/Game/Server/Channel.js b/app/Game/Server/Channel.js index d6e3db4..5679ff5 100755 --- a/app/Game/Server/Channel.js +++ b/app/Game/Server/Channel.js @@ -18,23 +18,13 @@ this.gameController = new GameController(this); this.gameController.loadLevel("default.json"); - - - var self = this; - NotificationCenter.on("processGameCommandFromUser", function (topic, args) { - self.processGameCommandFromUser.apply(self, args); - }); - - - NotificationCenter.on('channel/message', function (message) { - ProtocolHelper.runCommands(message.data, function (command, options) { - self[command].call(self, options); - }); + NotificationCenter.on('channel/controlCommand', function (message) { + ProtocolHelper.applyCommand(message.data, self); }); NotificationCenter.on('sendControlCommandToAllUsers', this.sendControlCommandToAllUsers, this); - NotificationCenter.on('channel/users/all/except', this.sendControlCommandToAllUsersExcept, this); + NotificationCenter.on('sendControlCommandToAllUsersExcept', this.sendControlCommandToAllUsersExcept, this); console.checkpoint('channel ' + name + ' created'); } @@ -43,7 +33,10 @@ return true; } - Channel.prototype.addUser = function (userId) { + + // Channel command callbacks + + Channel.prototype.onAddUser = function (userId) { var user = new User(userId, this); var others = Object.keys(this.users); @@ -52,15 +45,15 @@ NotificationCenter.trigger('user/joined', user); } - - Channel.prototype.releaseUser = function (userId) { + Channel.prototype.onReleaseUser = function (userId) { var user = this.users[userId]; - //this.gameController.userIdLeft(user.id); - this.sendControlCommandToAllUsersExcept("userLeft", user.id, user); delete this.users[user.id]; } + + // Sending commands + Channel.prototype.sendControlCommandToAllUsers = function (command, options) { for(var id in this.users) { this.users[id].sendControlCommand(command, options); @@ -74,11 +67,7 @@ } } } -/* - Channel.prototype.processGameCommandFromUser = function (command, options, user) { - this.gameController.progressGameCommandFromUser(command, options, user); - } - */ + return Channel; }); \ No newline at end of file diff --git a/app/Game/Server/GameController.js b/app/Game/Server/GameController.js index eaa2c2f..2fbdffd 100755 --- a/app/Game/Server/GameController.js +++ b/app/Game/Server/GameController.js @@ -2,7 +2,7 @@ define([ "Game/Core/GameController", "Game/Core/Physics/Engine", "Game/Config/Settings", - "Game/Core/Control/InputController", + "Game/Server/Control/InputController", "Lib/Utilities/RequestAnimFrame", "Game/Core/NotificationCenter" ], @@ -68,9 +68,6 @@ function (Parent, PhysicsEngine, Settings, InputController, requestAnimFrame, No do { var userData = body.GetUserData(); - - - if(userData && body.IsAwake()) { update[userData] = { p: body.GetPosition(), diff --git a/app/Game/Server/PipeToLobby.js b/app/Game/Server/PipeToLobby.js index 0cb22cf..9cb7eed 100755 --- a/app/Game/Server/PipeToLobby.js +++ b/app/Game/Server/PipeToLobby.js @@ -45,7 +45,7 @@ function (NotificationCenter, Channel) { }; PipeToLobby.prototype.onMessage = function (message) { - NotificationCenter.trigger(message.recipient + '/message', message); + NotificationCenter.trigger(message.recipient + '/controlCommand', message); } return PipeToLobby; diff --git a/app/Game/Server/User.js b/app/Game/Server/User.js index 436088d..a7e060c 100644 --- a/app/Game/Server/User.js +++ b/app/Game/Server/User.js @@ -23,15 +23,27 @@ function(Parent, NotificationCenter, ProtocolHelper) { self.sendControlCommand("joinSuccess", options); }); - NotificationCenter.on('user/' + this.id + "/message", function(message) { // FIXME: right now only game commands? - ProtocolHelper.runCommands(message.data, function (command, options) { - self.gameCommand(command, options); - }); + NotificationCenter.on('user/' + this.id + "/controlCommand", function(message) { // FIXME: right now only game commands? + ProtocolHelper.applyCommand(message.data, self); }); } User.prototype = Object.create(Parent.prototype); + User.prototype.setPlayer = function(player) { + this.player = player; + }; + + + // User command callbacks + + User.prototype.onGameCommand = function(command) { + this.player.inputController.applyCommand(command); + }; + + + // Sending commands + User.prototype.sendControlCommand = function(command, options) { var recipient = "user/" + this.id; var data = ProtocolHelper.encodeCommand(command, options); @@ -44,13 +56,6 @@ function(Parent, NotificationCenter, ProtocolHelper) { this.sendControlCommand("gameCommand", data); }; - User.prototype.gameCommand = function(command, options) { - this.player.inputController[command].call(this.player.inputController); - }; - - User.prototype.setPlayer = function(player) { - this.player = player; - }; return User; diff --git a/app/Lobby/Coordinator.js b/app/Lobby/Coordinator.js index 1d49c37..f717a3b 100755 --- a/app/Lobby/Coordinator.js +++ b/app/Lobby/Coordinator.js @@ -85,7 +85,7 @@ function (User, Channel, PipeToChannel, NotificationCenter) { channelPipe.send('channel', { releaseUser: user.id }); }, this); - NotificationCenter.on('user/gameCommand', function (userId, data) { + NotificationCenter.on('user/controlCommand', function (userId, data) { channelPipe.sendToUser(userId, data); }, this); diff --git a/app/Lobby/User.js b/app/Lobby/User.js index bc510b0..b9583bb 100755 --- a/app/Lobby/User.js +++ b/app/Lobby/User.js @@ -13,16 +13,10 @@ function (Parent, ProtocolHelper, NotificationCenter) { this.channelProcess = null; this.socketLink = socketLink; - var self = this; + socketLink.on('message', this.onMessage.bind(this)); + socketLink.on('disconnect', this.onDisconnect.bind(this)); - socketLink.on('message', function (message) { - self.onMessage(message); - }); - socketLink.on('disconnect', function () { - self.onDisconnect(); - }); - - NotificationCenter.on("user/" + this.socketLink.id + "/message", this.onChannelMessage, this); + NotificationCenter.on("user/" + this.socketLink.id + "/message", this.socketLink.send, this.socketLink); } User.prototype = Object.create(Parent.prototype); @@ -31,39 +25,32 @@ function (Parent, ProtocolHelper, NotificationCenter) { this.channelProcess = channelProcess; } + + // Socket callbacks + User.prototype.onMessage = function (message) { - var self = this; - ProtocolHelper.runCommands(message, function (command, options) { - self.processControlCommand(command, options); - }); + ProtocolHelper.applyCommand(message, this); } User.prototype.onDisconnect = function () { this.coordinator.removeUser(this); } - User.prototype.processControlCommand = function (command, options) { - switch(command) { - case 'join': - this.coordinator.assignUserToChannel(this, options); - break; + // User command callbacks - case 'leave': - this.coordinator.assignUserToLobby(this); - break; + User.prototype.onJoin = function(options) { + this.coordinator.assignUserToChannel(this, options); + }; - case 'gameCommand': - NotificationCenter.trigger("user/gameCommand", this.id, options); - break; + User.prototype.onLeave = function(options) { + this.coordinator.assignUserToLobby(this); + }; - default: - break; - } - } - - User.prototype.onChannelMessage = function(message) { - this.socketLink.send(message); + User.prototype.onGameCommand = function(options) { + // repacking for transport via pipe + var message = ProtocolHelper.encodeCommand("gameCommand", options); + NotificationCenter.trigger("user/controlCommand", this.id, message); }; return User;