checked paths for inheritance in client

This commit is contained in:
logsol 2013-12-09 16:48:37 +01:00
parent d8933dc9d3
commit 907ef49a53
8 changed files with 33 additions and 12 deletions

View file

@ -1,9 +1,9 @@
define([ define([
"Lib/Vendor/Box2D", "Game/Core/Collision/Detector",
"Game/Core/Collision/Detector" "Lib/Vendor/Box2D"
], ],
function (Box2D, Parent) { function (Parent, Box2D) {
function Detector (player) { function Detector (player) {
Parent.call(this, player); Parent.call(this, player);

View file

@ -1,4 +1,8 @@
define(["Game/Client/Control/Key"], function (Key) { define([
"Game/Client/Control/Key"
],
function (Key) {
function KeyboardInput (playerController) { function KeyboardInput (playerController) {

View file

@ -1,6 +1,6 @@
define([ define([
"Lib/Vendor/Box2D",
"Game/Core/GameController", "Game/Core/GameController",
"Lib/Vendor/Box2D",
"Game/Client/Physics/Engine", "Game/Client/Physics/Engine",
"Game/Client/View/ViewController", "Game/Client/View/ViewController",
"Game/Client/Control/PlayerController", "Game/Client/Control/PlayerController",
@ -10,7 +10,7 @@ define([
"Lib/Vendor/Stats" "Lib/Vendor/Stats"
], ],
function (Box2D, Parent, PhysicsEngine, ViewController, PlayerController, NotificationCenter, requestAnimFrame, Settings, Stats) { function (Parent, Box2D, PhysicsEngine, ViewController, PlayerController, NotificationCenter, requestAnimFrame, Settings, Stats) {
function GameController () { function GameController () {
this.viewController = new ViewController(); this.viewController = new ViewController();

View file

@ -1,7 +1,7 @@
define([ define([
"Game/Core/Protocol/Helper", "Game/Core/Protocol/Helper",
"Game/Client/GameController", "Game/Client/GameController",
"Game/Core/User", "Game/Client/User",
"Game/Core/NotificationCenter" "Game/Core/NotificationCenter"
], ],

9
app/Game/Client/User.js Normal file
View file

@ -0,0 +1,9 @@
define([
"Game/Core/User"
],
function(Parent) {
return Parent;
});

View file

@ -1,4 +1,9 @@
define(['Lib/Vendor/Three', 'Game/Config/Settings'], function (Three, Settings) { define([
'Lib/Vendor/Three',
'Game/Config/Settings'
],
function (Three, Settings) {
function CameraController () { function CameraController () {
this.zoom = 1; this.zoom = 1;

View file

@ -1,4 +1,8 @@
define(['Game/Config/Settings'], function (Settings) { define([
'Game/Config/Settings'
],
function (Settings) {
var DomController = { var DomController = {
canvas: null, canvas: null,

View file

@ -1,9 +1,8 @@
define([ define([
"Lib/Vendor/Box2D", "Lib/Vendor/Box2D"
"Game/Core/Collision/Detector"
], ],
function (Box2D, Parent) { function (Box2D) {
function Detector () { // FIXME evtl.bind(this) ? function Detector () { // FIXME evtl.bind(this) ?
this.listener = new Box2D.Dynamics.b2ContactListener(); this.listener = new Box2D.Dynamics.b2ContactListener();