diff --git a/app/Game/Client/Control/Inputs/KeyboardAndMouse.js b/app/Game/Client/Control/Inputs/KeyboardAndMouse.js index 36dea66..50af8a1 100644 --- a/app/Game/Client/Control/Inputs/KeyboardAndMouse.js +++ b/app/Game/Client/Control/Inputs/KeyboardAndMouse.js @@ -6,7 +6,7 @@ define([ "Game/Client/Control/Swiper" ], -function (Parent, KeyboardInput, DomController, Settings, Swiper) { +function (Parent, KeyboardInput, domController, Settings, Swiper) { "use strict"; @@ -122,7 +122,7 @@ function (Parent, KeyboardInput, DomController, Settings, Swiper) { }; KeyboardAndMouse.prototype.mouseInit = function() { - var canvas = DomController.getCanvas(); + var canvas = domController.getCanvas(); var self = this; canvas.onmousedown = function(e) { diff --git a/app/Game/Client/GameController.js b/app/Game/Client/GameController.js index 1447520..dfb8165 100755 --- a/app/Game/Client/GameController.js +++ b/app/Game/Client/GameController.js @@ -18,7 +18,7 @@ define([ "Lib/Utilities/Exception" ], -function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Nc, requestAnimFrame, Settings, GameObject, Doll, DomController, ProtocolHelper, Me, AudioPlayer, PointerLockManager, Assert, Exception) { +function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Nc, requestAnimFrame, Settings, GameObject, Doll, domController, ProtocolHelper, Me, AudioPlayer, PointerLockManager, Assert, Exception) { "use strict"; @@ -58,7 +58,7 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Nc, reque Nc.trigger(Nc.ns.client.game.events.render); this.view.render(); - DomController.fpsStep(); + domController.fpsStep(); }; GameController.prototype.mePositionStateOverride = function() { diff --git a/app/Game/Client/Networker.js b/app/Game/Client/Networker.js index fabdc3b..cc66ade 100755 --- a/app/Game/Client/Networker.js +++ b/app/Game/Client/Networker.js @@ -7,7 +7,7 @@ define([ "Game/Client/View/DomController" ], -function (ProtocolHelper, GameController, User, Nc, Settings, DomController) { +function (ProtocolHelper, GameController, User, Nc, Settings, domController) { "use strict"; @@ -50,7 +50,7 @@ function (ProtocolHelper, GameController, User, Nc, Settings, DomController) { Nc.on(Nc.ns.client.to.server.gameCommand.send, this.sendGameCommand, this); Nc.on(Nc.ns.core.game.events.level.loaded, this.onLevelLoaded, this); - DomController.setNick(nickname); + domController.setNick(nickname); } // Socket callbacks @@ -63,7 +63,7 @@ function (ProtocolHelper, GameController, User, Nc, Settings, DomController) { nickname: this.nickname } this.sendCommand('join', options); - DomController.setConnected(true); + domController.setConnected(true); } else { alert("Error: no channel name"); window.location.href = "/"; @@ -74,7 +74,7 @@ function (ProtocolHelper, GameController, User, Nc, Settings, DomController) { //if(this.gameController) this.gameController.destruct(); //this.gameController = null; console.log('disconnected. game destroyed. no auto-reconnect'); - DomController.setConnected(false); + domController.setConnected(false); } Networker.prototype.onJoinSuccess = function (options) { @@ -183,7 +183,7 @@ function (ProtocolHelper, GameController, User, Nc, Settings, DomController) { Networker.prototype.onPong = function(timestamp) { var ping = (Date.now() - parseInt(timestamp, 10)); - DomController.setPing(ping); + domController.setPing(ping); setTimeout(this.ping.bind(this), 1000); }; diff --git a/app/Game/Client/Physics/Engine.js b/app/Game/Client/Physics/Engine.js index 231bf1d..4b646c0 100755 --- a/app/Game/Client/Physics/Engine.js +++ b/app/Game/Client/Physics/Engine.js @@ -8,7 +8,7 @@ define([ "Game/Client/View/Pixi/Layers/Debug" ], -function (Parent, Settings, DomController, Box2D, Nc, DebugDraw, debugLayer) { +function (Parent, Settings, domController, Box2D, Nc, DebugDraw, debugLayer) { "use strict"; diff --git a/app/Game/Client/View/Abstract/View.js b/app/Game/Client/View/Abstract/View.js index 15dd098..dd162a5 100755 --- a/app/Game/Client/View/Abstract/View.js +++ b/app/Game/Client/View/Abstract/View.js @@ -6,7 +6,7 @@ define([ "Lib/Utilities/NotificationCenter" ], -function (Abstract, DomController, Settings, Exception, Nc) { +function (Abstract, domController, Settings, Exception, Nc) { "use strict"; @@ -47,7 +47,7 @@ function (Abstract, DomController, Settings, Exception, Nc) { AbstractView.prototype.initCanvas = function (canvas) { this.canvas = canvas; - DomController.initCanvas(canvas); + domController.initCanvas(canvas); } AbstractView.prototype.setMe = function(player) { diff --git a/app/Game/Client/View/Pixi/View.js b/app/Game/Client/View/Pixi/View.js index 355be34..8ef2752 100755 --- a/app/Game/Client/View/Pixi/View.js +++ b/app/Game/Client/View/Pixi/View.js @@ -14,7 +14,7 @@ define([ "Game/Client/View/Pixi/Layers/Messages" ], -function (Parent, DomController, PIXI, Settings, Nc, Exception, GameStats, LayerManager, Ghost, Swiper, PointerLockManager, Debug, Messages) { +function (Parent, domController, PIXI, Settings, Nc, Exception, GameStats, LayerManager, Ghost, Swiper, PointerLockManager, Debug, Messages) { "use strict"; @@ -47,7 +47,7 @@ function (Parent, DomController, PIXI, Settings, Nc, Exception, GameStats, Layer PixiView.prototype.init = function () { var rendererOptions = { - view: DomController.getCanvas(), + view: domController.getCanvas(), antialiasing: false, transparent: false, resolution: 1 diff --git a/app/Game/Client/View/Three/View.js b/app/Game/Client/View/Three/View.js index 3255a28..e653802 100755 --- a/app/Game/Client/View/Three/View.js +++ b/app/Game/Client/View/Three/View.js @@ -1,11 +1,10 @@ define([ "Game/Client/View/Abstract/View", - "Game/Client/View/DomController", "Lib/Vendor/Three", "Game/Config/Settings" ], -function (Parent, DomController, Three, Settings) { +function (Parent, Three, Settings) { "use strict";