From 231d95749864950cbc182017c3299982895e6a91 Mon Sep 17 00:00:00 2001 From: logsol Date: Sat, 21 Jul 2012 23:38:59 +0200 Subject: [PATCH 1/8] altered define paths --- app/Game/Server/User.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 app/Game/Server/User.js diff --git a/app/Game/Server/User.js b/app/Game/Server/User.js old mode 100644 new mode 100755 index f30c9d9..7c8818c --- a/app/Game/Server/User.js +++ b/app/Game/Server/User.js @@ -1,4 +1,4 @@ -define(["Protocol/Helper"], function(ProtocolHelper) { +define(["Game/Core/Protocol/Helper"], function(ProtocolHelper) { function User(socketLink, coordinator) { From 704c78367b89a9862422b4751299e701e9d4d374 Mon Sep 17 00:00:00 2001 From: logsol Date: Sat, 21 Jul 2012 23:41:41 +0200 Subject: [PATCH 2/8] altered define paths --- app/Game/Server/GameController.js | 38 ++++++++++++++++++------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/app/Game/Server/GameController.js b/app/Game/Server/GameController.js index 7da278c..c5427fa 100755 --- a/app/Game/Server/GameController.js +++ b/app/Game/Server/GameController.js @@ -1,4 +1,4 @@ -var requires = [ +define([ "Chuck/Physics/Engine", "Chuck/Settings", "Chuck/Player", @@ -6,24 +6,24 @@ var requires = [ "Chuck/Loader/Level", "Chuck/Control/InputController", "RequestAnimationFrame" -]; +], -define(requires, function(PhysicsEngine, Settings, Player, Box2D, Level, InputController, requestAnimFrame){ +function(PhysicsEngine, Settings, Player, Box2D, Level, InputController, requestAnimFrame){ - function ServerProcessor (serverGame) { - this.serverGame = serverGame; + function GameController (channel) { + this.channel = channel; this.players = {}; this.init(); } - ServerProcessor.prototype.init = function() { + GameController.prototype.init = function() { this.physicsEngine = this.factory.new(PhysicsEngine); this.update(); this.updateWorld(); } - ServerProcessor.prototype.loadLevel = function(path) { + GameController.prototype.loadLevel = function(path) { if (this.level) { this.level.unload(); } @@ -32,11 +32,11 @@ define(requires, function(PhysicsEngine, Settings, Player, Box2D, Level, InputCo this.level.loadLevelInToEngine(); } - ServerProcessor.prototype.getPhysicsEngine = function() { + GameController.prototype.getPhysicsEngine = function() { return this.physicsEngine; } - ServerProcessor.prototype.update = function() { + GameController.prototype.update = function() { requestAnimFrame(this.update.bind(this)); @@ -46,11 +46,13 @@ define(requires, function(PhysicsEngine, Settings, Player, Box2D, Level, InputCo } } - ServerProcessor.prototype.destruct = function() { + GameController.prototype.destruct = function() { } - ServerProcessor.prototype.createPlayerWithId = function(id) { + GameController.prototype.createPlayerForUser = function(user) { + var id = user.id; + var player = new Player(this.physicsEngine, id, null); this.players[id] = { player: player, @@ -61,20 +63,24 @@ define(requires, function(PhysicsEngine, Settings, Player, Box2D, Level, InputCo this.physicsEngine.setCollisionDetector(player); } - ServerProcessor.prototype.progressGameCommandFromId = function(command, options, id) { + GameController.prototype.progressGameCommandFromId = function(command, options, id) { var inputController = this.players[id].inputController; if (typeof inputController[command] == 'function') { inputController[command](options); } } - ServerProcessor.prototype.userIdLeft = function(id) { + GameController.prototype.userIdLeft = function(id) { var player = this.players[id].player; player.destroy(); delete this.players[id]; } - ServerProcessor.prototype.updateWorld = function() { + GameController.prototype.updateClientsWorld = function(update_world) { + this.channel.sendCommandToAllUsers('gameCommand', {worldUpdate: update_world}); + } + + GameController.prototype.updateWorld = function() { var update = {}; var isUpdateNeeded = false; @@ -102,5 +108,5 @@ define(requires, function(PhysicsEngine, Settings, Player, Box2D, Level, InputCo setTimeout(this.updateWorld.bind(this), Settings.WORLD_UPDATE_BROADCAST_INTERVAL); } - return ServerProcessor; -}); + return GameController; +}); \ No newline at end of file From e70366398fb58d1f16c47810a84c7e538dd97412 Mon Sep 17 00:00:00 2001 From: logsol Date: Sun, 22 Jul 2012 00:14:38 +0200 Subject: [PATCH 3/8] altered define paths --- app/Lobby/Coordinator.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) mode change 100644 => 100755 app/Lobby/Coordinator.js diff --git a/app/Lobby/Coordinator.js b/app/Lobby/Coordinator.js old mode 100644 new mode 100755 index 3a71f80..ab0ff8b --- a/app/Lobby/Coordinator.js +++ b/app/Lobby/Coordinator.js @@ -1,4 +1,9 @@ -define(["Server/User", "Server/Channel", "Server/Factory"], function(User, Channel, Factory) { +define([ + "Game/Server/User", + "Game/Server/Channel" +], + +function(User, Channel) { function Coordinator() { this.channels = {}; @@ -30,8 +35,7 @@ define(["Server/User", "Server/Channel", "Server/Factory"], function(User, Chann var channel = this.channels[channelName]; if(!channel) { - var factory = new Factory(); - channel = factory.new(Channel, channelName); + channel = new Channel(channelName); this.channels[channelName] = channel; } From f31f68409edfded830faf43780016c82fa6924e3 Mon Sep 17 00:00:00 2001 From: logsol Date: Sun, 22 Jul 2012 00:25:16 +0200 Subject: [PATCH 4/8] altered define paths --- app/Bootstrap/HttpServer.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) mode change 100644 => 100755 app/Bootstrap/HttpServer.js diff --git a/app/Bootstrap/HttpServer.js b/app/Bootstrap/HttpServer.js old mode 100644 new mode 100755 index 20b24ef..f6bb85d --- a/app/Bootstrap/HttpServer.js +++ b/app/Bootstrap/HttpServer.js @@ -1,4 +1,9 @@ -define(['http', 'node-static'], function(http, nodeStatic) { +define([ + 'http', + 'node-static' +], + +function(http, nodeStatic) { function HttpServer(options) { options.port = options.port || 1234; From 10950c4f5a249600f465f527168eee550be062da Mon Sep 17 00:00:00 2001 From: logsol Date: Sun, 22 Jul 2012 00:26:29 +0200 Subject: [PATCH 5/8] altered define paths --- app/Bootstrap/Socket.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 app/Bootstrap/Socket.js diff --git a/app/Bootstrap/Socket.js b/app/Bootstrap/Socket.js old mode 100644 new mode 100755 index 36e117b..e4f7c3e --- a/app/Bootstrap/Socket.js +++ b/app/Bootstrap/Socket.js @@ -1,4 +1,8 @@ -define(['socket.io'], function(io) { +define([ + 'socket.io' +], + +function(io) { function Socket(server, options, coordinator) { options.logLevel = typeof options.logLevel != 'undefined' From 2f430b15e0b38b4a634a2bb80dabb02c71dcc074 Mon Sep 17 00:00:00 2001 From: logsol Date: Sun, 22 Jul 2012 00:41:43 +0200 Subject: [PATCH 6/8] added serverside bootstrapping --- app/Bootstrap/server.js | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) mode change 100644 => 100755 app/Bootstrap/server.js diff --git a/app/Bootstrap/server.js b/app/Bootstrap/server.js old mode 100644 new mode 100755 index df57cf0..91ee84f --- a/app/Bootstrap/server.js +++ b/app/Bootstrap/server.js @@ -1,36 +1,16 @@ -var requirejs = require('requirejs'); - -var inspector = {}; - -requirejs.config({ - nodeRequire: require, - baseUrl: 'lib' -}); - -var requirements = [ +define([ "Server/HttpServer", "Server/Socket", "Server/Coordinator" -]; +], -var port = process.argv[2] - || process.env.PORT - || process.env.npm_package_config_port; +function(HttpServer, Socket, Coordinator) { -requirejs(requirements, function(HttpServer, Socket, Coordinator) { - - var options = { - port: port, - rootDirectory: './', - caching: false, - logLevel: process.argv[3] - }; + function Server(options) { + this.coordinator = new Coordinator(); + this.httpServer = new HttpServer(options); + this.socket = new Socket(httpServer.getServer(), options, coordinator); + } - var coordinator = new Coordinator(); - var httpServer = new HttpServer(options); - var socket = new Socket(httpServer.getServer(), options, coordinator); - - inspector.coordinator = coordinator; -}); - -exports = module.exports = inspector; + return Server; +}); \ No newline at end of file From aa95c38cc2a44fcbe76e6952356aa95ea8c96285 Mon Sep 17 00:00:00 2001 From: logsol Date: Sun, 22 Jul 2012 00:42:38 +0200 Subject: [PATCH 7/8] added serverside bootstrapping --- app.js | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100755 app.js diff --git a/app.js b/app.js new file mode 100755 index 0000000..c49b7d4 --- /dev/null +++ b/app.js @@ -0,0 +1,26 @@ +var requirejs = require('requirejs'); + +var inspector = {}; + +requirejs.config({ + nodeRequire: require, + baseUrl: 'lib' +}); + +var port = process.argv[2] + || process.env.PORT + || process.env.npm_package_config_port; + +var options = { + port: port, + rootDirectory: './', + caching: false, + logLevel: process.argv[3] || 0 +}; + +requirejs(["Bootstrap/Server"], function(Server) { + var server = new Server(options); + inspector.server = server; +}); + +exports = module.exports = inspector; \ No newline at end of file From a2460ed385d941a02f4fbf86b8dc54e1c0c9d935 Mon Sep 17 00:00:00 2001 From: logsol Date: Sun, 22 Jul 2012 00:44:39 +0200 Subject: [PATCH 8/8] renamed server bootstrap --- app/Bootstrap/{server.js => Server.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/Bootstrap/{server.js => Server.js} (100%) diff --git a/app/Bootstrap/server.js b/app/Bootstrap/Server.js similarity index 100% rename from app/Bootstrap/server.js rename to app/Bootstrap/Server.js