diff --git a/app/Bootstrap/Channel.js b/app/Bootstrap/Channel.js index efe7ca1..801e57c 100755 --- a/app/Bootstrap/Channel.js +++ b/app/Bootstrap/Channel.js @@ -12,7 +12,7 @@ function (Channel, CoordinatorLink) { process.on('message', function (message) { - switch(message){ + switch(message) { case 'CREATE': channel = new Channel(coordinatorLink); break; diff --git a/app/Bootstrap/HttpServer.js b/app/Bootstrap/HttpServer.js index 1c30561..1cfc9a1 100755 --- a/app/Bootstrap/HttpServer.js +++ b/app/Bootstrap/HttpServer.js @@ -21,7 +21,7 @@ function (http, nodeStatic) { var fileServer = new nodeStatic.Server(options.rootDirectory, { cache: options.caching }); this.server = http.createServer( - function (req, res){ + function (req, res) { req.addListener('end', function () { switch(true) { case req.url == '/': @@ -37,13 +37,13 @@ function (http, nodeStatic) { break; case new RegExp(/^\/app/).test(req.url): - fileServer.serve(req, res, function (){ + fileServer.serve(req, res, function () { self.handleFileError(res) }); break; case new RegExp(/^\/static/).test(req.url): - fileServer.serve(req, res, function (){ + fileServer.serve(req, res, function () { self.handleFileError(res) }); break; @@ -58,11 +58,11 @@ function (http, nodeStatic) { this.server.listen(options.port); } - HttpServer.prototype.getServer = function (){ + HttpServer.prototype.getServer = function () { return this.server; } - HttpServer.prototype.handleFileError = function (res){ + HttpServer.prototype.handleFileError = function (res) { res.writeHead(404, {'Content-Type': 'text/html'}); res.end('

404 not ... found

'); } diff --git a/app/Bootstrap/Socket.js b/app/Bootstrap/Socket.js index 917312a..4150b05 100755 --- a/app/Bootstrap/Socket.js +++ b/app/Bootstrap/Socket.js @@ -15,19 +15,19 @@ function (io) { this.init(options); } - Socket.prototype.init = function (options){ + Socket.prototype.init = function (options) { var self = this; - this.socket.configure('development', function (){ + this.socket.configure('development', function () { this.set('log level', options.logLevel); }); - this.socket.on('connection', function (user){ + this.socket.on('connection', function (user) { self.onConnection(user); }); } - Socket.prototype.onConnection = function (socketLink){ + Socket.prototype.onConnection = function (socketLink) { this.coordinator.createUser(socketLink); } diff --git a/app/Game/Client/Control/Key.js b/app/Game/Client/Control/Key.js index e15b854..0c3f6bc 100755 --- a/app/Game/Client/Control/Key.js +++ b/app/Game/Client/Control/Key.js @@ -1,4 +1,4 @@ -define(function (){ +define(function () { function Key () { this._active = false; diff --git a/app/Game/Client/Control/KeyboardController.js b/app/Game/Client/Control/KeyboardController.js index 3273904..a6ba55a 100755 --- a/app/Game/Client/Control/KeyboardController.js +++ b/app/Game/Client/Control/KeyboardController.js @@ -1,4 +1,4 @@ -define(["Game/Core/Control/InputController", "Game/Client/Control/KeyboardInput"], function (InputController, KeyboardInput){ +define(["Game/Core/Control/InputController", "Game/Client/Control/KeyboardInput"], function (InputController, KeyboardInput) { function KeyboardController (me, gameController) { diff --git a/app/Game/Client/Control/KeyboardInput.js b/app/Game/Client/Control/KeyboardInput.js index 32f51b3..9e87bd8 100755 --- a/app/Game/Client/Control/KeyboardInput.js +++ b/app/Game/Client/Control/KeyboardInput.js @@ -1,4 +1,4 @@ -define(["Game/Client/Control/Key"], function (Key){ +define(["Game/Client/Control/Key"], function (Key) { function KeyboardInput (keyboardController) { diff --git a/app/Game/Client/Networker.js b/app/Game/Client/Networker.js index 464e272..0aaddf6 100755 --- a/app/Game/Client/Networker.js +++ b/app/Game/Client/Networker.js @@ -41,7 +41,7 @@ function (ProtocolHelper, GameController) { console.log('disconnected. game destroyed. no auto-reconnect'); } - Networker.prototype.join = function (channelName){ + Networker.prototype.join = function (channelName) { this.sendCommand('join', channelName); } diff --git a/app/Game/Client/View/CameraController.js b/app/Game/Client/View/CameraController.js index 3c514f8..9883db0 100755 --- a/app/Game/Client/View/CameraController.js +++ b/app/Game/Client/View/CameraController.js @@ -31,17 +31,17 @@ define(['Lib/Vendor/Three', 'Game/Config/Settings'], function (Three, Settings) this.camera.position.z = 481; } - CameraController.prototype.getCamera = function (){ + CameraController.prototype.getCamera = function () { return this.camera; } - CameraController.prototype.setPosition = function (x, y){ + CameraController.prototype.setPosition = function (x, y) { this.camera.position.x = x; this.camera.position.y = y; } - CameraController.prototype.setZoom = function (z){ + CameraController.prototype.setZoom = function (z) { this.camera.position.z = z; } diff --git a/app/Game/Client/View/DomController.js b/app/Game/Client/View/DomController.js index f4fe5ed..b874b0e 100755 --- a/app/Game/Client/View/DomController.js +++ b/app/Game/Client/View/DomController.js @@ -5,7 +5,7 @@ define(['Game/Config/Settings'], function (Settings) { debugCanvas: null }; - DomController.getCanvasContainer = function (){ + DomController.getCanvasContainer = function () { var container = document.getElementById(Settings.CANVAS_DOM_ID); if(container) { @@ -15,14 +15,14 @@ define(['Game/Config/Settings'], function (Settings) { } } - DomController.getCanvas = function (){ + DomController.getCanvas = function () { return DomController.canvas; } - DomController.setCanvas = function (canvas){ + DomController.setCanvas = function (canvas) { var container = DomController.getCanvasContainer(); - if(DomController.canvas){ + if(DomController.canvas) { container.removeChild(DomController.canvas); } @@ -30,14 +30,14 @@ define(['Game/Config/Settings'], function (Settings) { container.appendChild(canvas); } - DomController.getDebugCanvas = function (){ + DomController.getDebugCanvas = function () { return DomController.debugCanvas; } - DomController.createDebugCanvas = function (){ + DomController.createDebugCanvas = function () { var container = DomController.getCanvasContainer(); - if(DomController.debugCanvas){ + if(DomController.debugCanvas) { container.removeChild(DomController.debugCanvas); } diff --git a/app/Game/Client/View/ViewController.js b/app/Game/Client/View/ViewController.js index fb84ec6..3088750 100755 --- a/app/Game/Client/View/ViewController.js +++ b/app/Game/Client/View/ViewController.js @@ -5,9 +5,9 @@ var requires = [ "Game/Client/View/CameraController" ]; -define(requires, function (DomController, Three, Settings, CameraController){ +define(requires, function (DomController, Three, Settings, CameraController) { - function ViewController (){ + function ViewController () { this.mesh = null; this.scene = null; @@ -25,7 +25,7 @@ define(requires, function (DomController, Three, Settings, CameraController){ } } - ViewController.prototype.init = function (){ + ViewController.prototype.init = function () { var self = this; @@ -45,7 +45,7 @@ define(requires, function (DomController, Three, Settings, CameraController){ DomController.setCanvas(this.renderer.domElement); - if(Settings.DEBUG_MODE){ + if(Settings.DEBUG_MODE) { DomController.createDebugCanvas(); } @@ -61,12 +61,12 @@ define(requires, function (DomController, Three, Settings, CameraController){ this.scene.add(directionalLight); - this.createMesh(100, 100, 100, 100, 'static/img/100.png', function (mesh){ + this.createMesh(100, 100, 100, 100, 'static/img/100.png', function (mesh) { self.mesh = mesh; self.scene.add(mesh); }); /* - this.createMesh(50, 50, 200, 100, 'static/img/100.png', function (mesh){ + this.createMesh(50, 50, 200, 100, 'static/img/100.png', function (mesh) { self.scene.add(mesh); }); */ @@ -93,7 +93,7 @@ define(requires, function (DomController, Three, Settings, CameraController){ ViewController.prototype.createMesh = function (width, height, x, y, imgPath, callback) { var textureImg = new Image(); - textureImg.onload = function (){ + textureImg.onload = function () { var material = new Three.MeshLambertMaterial({ map: Three.ImageUtils.loadTexture(imgPath) }); diff --git a/app/Game/Core/Control/InputController.js b/app/Game/Core/Control/InputController.js index 125d83a..3d2e7a9 100755 --- a/app/Game/Core/Control/InputController.js +++ b/app/Game/Core/Control/InputController.js @@ -1,4 +1,4 @@ -define(function (){ +define(function () { function InputController (player) { diff --git a/app/Game/Core/Physics/Doll.js b/app/Game/Core/Physics/Doll.js index 1e11676..052c70b 100755 --- a/app/Game/Core/Physics/Doll.js +++ b/app/Game/Core/Physics/Doll.js @@ -1,6 +1,6 @@ define(["Lib/Vendor/Box2D", "Game/Config/Settings", "Game/Core/Collision/Detector"], function (Box2D, Settings, CollisionDetector) { - function Doll (physicsEngine, id){ + function Doll (physicsEngine, id) { this.id = id; this.physicsEngine = physicsEngine; this.body; diff --git a/app/Game/Core/Protocol/Helper.js b/app/Game/Core/Protocol/Helper.js index 6d4d329..3fd164b 100755 --- a/app/Game/Core/Protocol/Helper.js +++ b/app/Game/Core/Protocol/Helper.js @@ -6,17 +6,17 @@ function (Parser) { var Helper = {} - Helper.encodeCommand = function (command, options){ + Helper.encodeCommand = function (command, options) { return Parser.encode(Helper.assemble(command, options)); } - Helper.assemble = function (command, options){ + Helper.assemble = function (command, options) { var commands = {}; commands[command] = options || null; return commands; } - Helper.runCommands = function (message, callback){ + Helper.runCommands = function (message, callback) { var commands = Parser.decode(message); for(var command in commands) { diff --git a/app/Game/Core/Protocol/Parser.js b/app/Game/Core/Protocol/Parser.js index 0b97aeb..1a47eb8 100755 --- a/app/Game/Core/Protocol/Parser.js +++ b/app/Game/Core/Protocol/Parser.js @@ -5,11 +5,11 @@ function () { var Parser = {}; - Parser.encode = function (message){ + Parser.encode = function (message) { return JSON.stringify(message); } - Parser.decode = function (message){ + Parser.decode = function (message) { return JSON.parse(message); } diff --git a/app/Game/Server/Channel.js b/app/Game/Server/Channel.js index 2da0f5f..db99290 100755 --- a/app/Game/Server/Channel.js +++ b/app/Game/Server/Channel.js @@ -23,7 +23,7 @@ */ } - Channel.validateName = function (name){ + Channel.validateName = function (name) { return true; } @@ -53,7 +53,7 @@ Channel.prototype.forward = function (target, message) { for(var command in message) { - if(typeof target[command] == 'function'){ + if(typeof target[command] == 'function') { target[command].call(target, message[command]); } else { throw 'trying to call undefined function ' + target[command]; @@ -67,7 +67,7 @@ } /* - Channel.prototype.addUser = function (user){ + Channel.prototype.addUser = function (user) { var userIds = Object.keys(this.users); this.users[user.id] = user; diff --git a/app/Game/Server/GameController.js b/app/Game/Server/GameController.js index 7c15d33..9134d08 100755 --- a/app/Game/Server/GameController.js +++ b/app/Game/Server/GameController.js @@ -62,7 +62,7 @@ function (Parent, PhysicsEngine, Settings, InputController, requestAnimFrame, No do { var userData = body.GetUserData(); - if(userData && body.IsAwake()){ + if(userData && body.IsAwake()) { update[userData] = { p: body.GetPosition(), a: body.GetAngle(), diff --git a/app/Game/Server/User.js b/app/Game/Server/User.js index 90e4352..b24cd41 100755 --- a/app/Game/Server/User.js +++ b/app/Game/Server/User.js @@ -18,7 +18,7 @@ function (Parent, ProtocolHelper, NotificationCenter) { User.prototype = Object.create(Parent.prototype); - User.prototype.init = function (socketLink){ + User.prototype.init = function (socketLink) { var self = this; diff --git a/app/Lib/Utilities/RequestAnimFrame.js b/app/Lib/Utilities/RequestAnimFrame.js index eec451b..e961c26 100755 --- a/app/Lib/Utilities/RequestAnimFrame.js +++ b/app/Lib/Utilities/RequestAnimFrame.js @@ -4,9 +4,9 @@ define([ function (Settings) { - var requestAnimFrame = (function (){ + var requestAnimFrame = (function () { - var _setTimeout = function ( callback ){ + var _setTimeout = function ( callback ) { setTimeout(callback, Settings.BOX2D_TIME_STEP * 1000); } diff --git a/app/Lobby/Coordinator.js b/app/Lobby/Coordinator.js index 8c8bc57..a85f897 100755 --- a/app/Lobby/Coordinator.js +++ b/app/Lobby/Coordinator.js @@ -13,25 +13,25 @@ function (User, Channel, childProcess) { this.lobbyUsers = {}; } - Coordinator.prototype.createUser = function (socketLink){ + Coordinator.prototype.createUser = function (socketLink) { var user = new User(socketLink, this); this.assignUserToLobby(user); } - Coordinator.prototype.assignUserToLobby = function (user){ + Coordinator.prototype.assignUserToLobby = function (user) { if(user.channelProcess) { //user.channel.releaseUser(user); -> generate message } this.lobbyUsers[user.id] = user; } - Coordinator.prototype.assignUserToChannel = function (user, channelName){ + Coordinator.prototype.assignUserToChannel = function (user, channelName) { if(user.channelProcess) { //user.channel.releaseUser(user); -> generate message } - if(!Channel.validateName(channelName)){ + if(!Channel.validateName(channelName)) { //TODO send validation error return false; } @@ -62,7 +62,7 @@ function (User, Channel, childProcess) { delete this.lobbyUsers[user.id]; } - Coordinator.prototype.removeUser = function (user){ + Coordinator.prototype.removeUser = function (user) { delete this.lobbyUsers[user.id]; if(user.channelProcess) { //user.channel.releaseUser(user); -> generate message diff --git a/app/Lobby/User.js b/app/Lobby/User.js index 7e5bc8e..f982ccf 100755 --- a/app/Lobby/User.js +++ b/app/Lobby/User.js @@ -13,10 +13,10 @@ function (Parent, ProtocolHelper) { var self = this; - socketLink.on('message', function (message){ + socketLink.on('message', function (message) { self.onMessage(message); }); - socketLink.on('disconnect', function (){ + socketLink.on('disconnect', function () { self.onDisconnect(); }); } @@ -27,18 +27,18 @@ function (Parent, ProtocolHelper) { this.channelProcess = channelProcess; } - User.prototype.onMessage = function (message){ + User.prototype.onMessage = function (message) { var self = this; - ProtocolHelper.runCommands(message, function (command, options){ + ProtocolHelper.runCommands(message, function (command, options) { self.processControlCommand(command, options); }); } - User.prototype.onDisconnect = function (){ + User.prototype.onDisconnect = function () { this.coordinator.removeUser(this); } - User.prototype.processControlCommand = function (command, options){ + User.prototype.processControlCommand = function (command, options) { switch(command) { case 'join':