From 3aa89fc8d6d0f4344001b03613657c13159c1017 Mon Sep 17 00:00:00 2001 From: jeena Date: Fri, 27 Dec 2013 01:36:01 +0100 Subject: [PATCH] moved Protocol and NotificationCenter to Lib/Utilities --- app/Game/Client/Control/Input/XyInput.js | 2 +- app/Game/Client/Control/PlayerController.js | 2 +- app/Game/Client/GameController.js | 4 ++-- app/Game/Client/{Physics => GameObjects}/Doll.js | 4 ++-- app/Game/Client/GameObjects/Item.js | 2 +- app/Game/Client/GameObjects/Tile.js | 2 +- app/Game/Client/Networker.js | 4 ++-- app/Game/Client/View/Views/AbstractView.js | 2 +- app/Game/Core/{Physics => GameObjects}/Doll.js | 0 app/Game/Core/Player.js | 2 +- app/Game/Server/Channel.js | 4 ++-- app/Game/Server/Control/PlayerController.js | 4 ++-- app/Game/Server/GameController.js | 4 ++-- app/Game/Server/{Physics => GameObjects}/Doll.js | 2 +- app/Game/Server/PipeToLobby.js | 2 +- app/Game/Server/User.js | 4 ++-- app/{Game/Core => Lib/Utilities}/NotificationCenter.js | 0 app/{Game/Core => Lib/Utilities}/Protocol/Helper.js | 2 +- app/{Game/Core => Lib/Utilities}/Protocol/Parser.js | 0 app/Lobby/Coordinator.js | 2 +- app/Lobby/PipeToChannel.js | 2 +- app/Lobby/User.js | 4 ++-- channel.js | 2 +- lab/Worker.js | 4 ++-- 24 files changed, 30 insertions(+), 30 deletions(-) rename app/Game/Client/{Physics => GameObjects}/Doll.js (98%) rename app/Game/Core/{Physics => GameObjects}/Doll.js (100%) rename app/Game/Server/{Physics => GameObjects}/Doll.js (66%) rename app/{Game/Core => Lib/Utilities}/NotificationCenter.js (100%) rename app/{Game/Core => Lib/Utilities}/Protocol/Helper.js (96%) rename app/{Game/Core => Lib/Utilities}/Protocol/Parser.js (100%) diff --git a/app/Game/Client/Control/Input/XyInput.js b/app/Game/Client/Control/Input/XyInput.js index e02a71d..9f71a77 100644 --- a/app/Game/Client/Control/Input/XyInput.js +++ b/app/Game/Client/Control/Input/XyInput.js @@ -1,5 +1,5 @@ define([ - "Game/Core/NotificationCenter" + "Lib/Utilities/NotificationCenter" ], function (NotificationCenter) { diff --git a/app/Game/Client/Control/PlayerController.js b/app/Game/Client/Control/PlayerController.js index f7e6c6f..9fd594a 100755 --- a/app/Game/Client/Control/PlayerController.js +++ b/app/Game/Client/Control/PlayerController.js @@ -2,7 +2,7 @@ define([ "Game/Core/Control/PlayerController", "Game/Client/Control/KeyboardInput", "Game/Client/Control/Input/MouseInput", - "Game/Core/NotificationCenter" + "Lib/Utilities/NotificationCenter" ], function (Parent, KeyboardInput, MouseInput, NotificationCenter) { diff --git a/app/Game/Client/GameController.js b/app/Game/Client/GameController.js index 74c9bbc..f03c131 100755 --- a/app/Game/Client/GameController.js +++ b/app/Game/Client/GameController.js @@ -4,12 +4,12 @@ define([ "Game/Client/Physics/Engine", "Game/Client/View/ViewManager", "Game/Client/Control/PlayerController", - "Game/Core/NotificationCenter", + "Lib/Utilities/NotificationCenter", "Lib/Utilities/RequestAnimFrame", "Game/Config/Settings", "Lib/Vendor/Stats", "Game/Client/GameObjects/GameObject", - "Game/Client/Physics/Doll" + "Game/Client/GameObjects/Doll" ], function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, NotificationCenter, requestAnimFrame, Settings, Stats, GameObject, Doll) { diff --git a/app/Game/Client/Physics/Doll.js b/app/Game/Client/GameObjects/Doll.js similarity index 98% rename from app/Game/Client/Physics/Doll.js rename to app/Game/Client/GameObjects/Doll.js index a88972f..6aea4e0 100644 --- a/app/Game/Client/Physics/Doll.js +++ b/app/Game/Client/GameObjects/Doll.js @@ -1,7 +1,7 @@ define([ - "Game/Core/Physics/Doll", + "Game/Core/GameObjects/Doll", "Game/Config/Settings", - "Game/Core/NotificationCenter", + "Lib/Utilities/NotificationCenter", "Lib/Utilities/Exception" ], diff --git a/app/Game/Client/GameObjects/Item.js b/app/Game/Client/GameObjects/Item.js index 5051c01..cced995 100644 --- a/app/Game/Client/GameObjects/Item.js +++ b/app/Game/Client/GameObjects/Item.js @@ -1,7 +1,7 @@ define([ "Game/Core/GameObjects/Item", "Game/Config/Settings", - "Game/Core/NotificationCenter" + "Lib/Utilities/NotificationCenter" ], function (Parent, Settings, NotificationCenter) { diff --git a/app/Game/Client/GameObjects/Tile.js b/app/Game/Client/GameObjects/Tile.js index 946e623..432f120 100644 --- a/app/Game/Client/GameObjects/Tile.js +++ b/app/Game/Client/GameObjects/Tile.js @@ -1,7 +1,7 @@ define([ "Game/Core/GameObjects/Tile", "Game/Config/Settings", - "Game/Core/NotificationCenter" + "Lib/Utilities/NotificationCenter" ], function (Parent, Settings, NotificationCenter) { diff --git a/app/Game/Client/Networker.js b/app/Game/Client/Networker.js index 8b4edb7..7f15b9f 100755 --- a/app/Game/Client/Networker.js +++ b/app/Game/Client/Networker.js @@ -1,8 +1,8 @@ define([ - "Game/Core/Protocol/Helper", + "Lib/Utilities/Protocol/Helper", "Game/Client/GameController", "Game/Client/User", - "Game/Core/NotificationCenter", + "Lib/Utilities/NotificationCenter", "Game/Config/Settings" ], diff --git a/app/Game/Client/View/Views/AbstractView.js b/app/Game/Client/View/Views/AbstractView.js index 48154c8..a1bb3fc 100644 --- a/app/Game/Client/View/Views/AbstractView.js +++ b/app/Game/Client/View/Views/AbstractView.js @@ -2,7 +2,7 @@ define([ "Game/Client/View/DomController", "Game/Config/Settings", "Lib/Utilities/Exception", - "Game/Core/NotificationCenter" + "Lib/Utilities/NotificationCenter" ], function (DomController, Settings, Exception, NotificationCenter) { diff --git a/app/Game/Core/Physics/Doll.js b/app/Game/Core/GameObjects/Doll.js similarity index 100% rename from app/Game/Core/Physics/Doll.js rename to app/Game/Core/GameObjects/Doll.js diff --git a/app/Game/Core/Player.js b/app/Game/Core/Player.js index 9fc4a3d..0809f5c 100755 --- a/app/Game/Core/Player.js +++ b/app/Game/Core/Player.js @@ -1,5 +1,5 @@ define([ - "Game/" + GLOBALS.context + "/Physics/Doll", + "Game/" + GLOBALS.context + "/GameObjects/Doll", "Game/Config/Settings" ], diff --git a/app/Game/Server/Channel.js b/app/Game/Server/Channel.js index 58187c8..adb1991 100755 --- a/app/Game/Server/Channel.js +++ b/app/Game/Server/Channel.js @@ -1,8 +1,8 @@ define([ "Game/Server/GameController", - "Game/Core/NotificationCenter", + "Lib/Utilities/NotificationCenter", "Game/Server/User", - "Game/Core/Protocol/Helper" + "Lib/Utilities/Protocol/Helper" ], function (GameController, NotificationCenter, User, ProtocolHelper) { diff --git a/app/Game/Server/Control/PlayerController.js b/app/Game/Server/Control/PlayerController.js index 2fce9b1..f24bbe3 100644 --- a/app/Game/Server/Control/PlayerController.js +++ b/app/Game/Server/Control/PlayerController.js @@ -1,7 +1,7 @@ define([ "Game/Core/Control/PlayerController", - "Game/Core/NotificationCenter", - "Game/Core/Protocol/Parser" + "Lib/Utilities/NotificationCenter", + "Lib/Utilities/Protocol/Parser" ], function(Parent, NotificationCenter, Parser) { diff --git a/app/Game/Server/GameController.js b/app/Game/Server/GameController.js index 91f8204..f424be5 100755 --- a/app/Game/Server/GameController.js +++ b/app/Game/Server/GameController.js @@ -4,10 +4,10 @@ define([ "Game/Config/Settings", "Game/Server/Control/PlayerController", "Lib/Utilities/RequestAnimFrame", - "Game/Core/NotificationCenter", + "Lib/Utilities/NotificationCenter", "Game/Server/Player", "Game/Server/GameObjects/GameObject", - "Game/Server/Physics/Doll" + "Game/Server/GameObjects/Doll" ], function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, NotificationCenter, Player, GameObject, Doll) { diff --git a/app/Game/Server/Physics/Doll.js b/app/Game/Server/GameObjects/Doll.js similarity index 66% rename from app/Game/Server/Physics/Doll.js rename to app/Game/Server/GameObjects/Doll.js index 56624e6..4d8e182 100644 --- a/app/Game/Server/Physics/Doll.js +++ b/app/Game/Server/GameObjects/Doll.js @@ -1,5 +1,5 @@ define([ - "Game/Core/Physics/Doll" + "Game/Core/GameObjects/Doll" ], function(Parent) { diff --git a/app/Game/Server/PipeToLobby.js b/app/Game/Server/PipeToLobby.js index 9cb7eed..4614772 100755 --- a/app/Game/Server/PipeToLobby.js +++ b/app/Game/Server/PipeToLobby.js @@ -1,5 +1,5 @@ define([ - "Game/Core/NotificationCenter", + "Lib/Utilities/NotificationCenter", "Game/Server/Channel" ], diff --git a/app/Game/Server/User.js b/app/Game/Server/User.js index c5b3c54..cbaa026 100644 --- a/app/Game/Server/User.js +++ b/app/Game/Server/User.js @@ -1,7 +1,7 @@ define([ "Game/Core/User", - "Game/Core/NotificationCenter", - "Game/Core/Protocol/Helper" + "Lib/Utilities/NotificationCenter", + "Lib/Utilities/Protocol/Helper" ], function(Parent, NotificationCenter, ProtocolHelper) { diff --git a/app/Game/Core/NotificationCenter.js b/app/Lib/Utilities/NotificationCenter.js similarity index 100% rename from app/Game/Core/NotificationCenter.js rename to app/Lib/Utilities/NotificationCenter.js diff --git a/app/Game/Core/Protocol/Helper.js b/app/Lib/Utilities/Protocol/Helper.js similarity index 96% rename from app/Game/Core/Protocol/Helper.js rename to app/Lib/Utilities/Protocol/Helper.js index cf31bf2..e27af52 100755 --- a/app/Game/Core/Protocol/Helper.js +++ b/app/Lib/Utilities/Protocol/Helper.js @@ -1,5 +1,5 @@ define([ - "Game/Core/Protocol/Parser", + "Lib/Utilities/Protocol/Parser", "Lib/Utilities/Exception" ], diff --git a/app/Game/Core/Protocol/Parser.js b/app/Lib/Utilities/Protocol/Parser.js similarity index 100% rename from app/Game/Core/Protocol/Parser.js rename to app/Lib/Utilities/Protocol/Parser.js diff --git a/app/Lobby/Coordinator.js b/app/Lobby/Coordinator.js index f717a3b..c0399b5 100755 --- a/app/Lobby/Coordinator.js +++ b/app/Lobby/Coordinator.js @@ -2,7 +2,7 @@ define([ "Lobby/User", "Game/Server/Channel", "Lobby/PipeToChannel", - "Game/Core/NotificationCenter" + "Lib/Utilities/NotificationCenter" ], function (User, Channel, PipeToChannel, NotificationCenter) { diff --git a/app/Lobby/PipeToChannel.js b/app/Lobby/PipeToChannel.js index ec02331..d48b465 100755 --- a/app/Lobby/PipeToChannel.js +++ b/app/Lobby/PipeToChannel.js @@ -1,5 +1,5 @@ define([ - "Game/Core/NotificationCenter", + "Lib/Utilities/NotificationCenter", "child_process" ], diff --git a/app/Lobby/User.js b/app/Lobby/User.js index e080190..a6c312d 100755 --- a/app/Lobby/User.js +++ b/app/Lobby/User.js @@ -1,7 +1,7 @@ define([ "Game/Core/User", - "Game/Core/Protocol/Helper", - "Game/Core/NotificationCenter" + "Lib/Utilities/Protocol/Helper", + "Lib/Utilities/NotificationCenter" ], function (Parent, ProtocolHelper, NotificationCenter) { diff --git a/channel.js b/channel.js index 86336d5..9fff4bf 100755 --- a/channel.js +++ b/channel.js @@ -15,7 +15,7 @@ console.checkpoint = function (s) { requirejs([ "Game/Server/PipeToLobby", - "Game/Core/NotificationCenter" + "Lib/Utilities/NotificationCenter" ], function (PipeToLobby, nc) { diff --git a/lab/Worker.js b/lab/Worker.js index a09b454..6beb4d9 100644 --- a/lab/Worker.js +++ b/lab/Worker.js @@ -1,9 +1,9 @@ define([ "Game/Client/Networker", - "Game/Core/Protocol/Helper", + "Lib/Utilities/Protocol/Helper", "Game/Client/GameController", "Game/Client/User", - "Game/Core/NotificationCenter" + "Lib/Utilities/NotificationCenter" ], function (Parent, ProtocolHelper, GameController, User, NotificationCenter) {