jeena/chuck.js
1
0
Fork 0
mirror of https://github.com/logsol/chuck.js.git synced 2026-05-11 10:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

finished nc merge

Browse source
This commit is contained in:
logsol 2014-03-17 22:07:57 +01:00
parent f7ca9d2393
commit cacd5d74c0
8 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Game/Client/Control/PlayerController.js
View file

@ -111,11 +111,11 @@ function (Parent, KeyboardInput, MouseInput, Nc) {
}; };
PlayerController.prototype.showInfo = function() { PlayerController.prototype.showInfo = function() {
Nc.trigger(Nc.ns.client.view.gameInfo.toggle, true); Nc.trigger(Nc.ns.client.game.gameInfo.toggle, true);
}; };
PlayerController.prototype.hideInfo = function() { PlayerController.prototype.hideInfo = function() {
Nc.trigger(Nc.ns.client.view.gameInfo.toggle, false); Nc.trigger(Nc.ns.client.game.gameInfo.toggle, false);
}; };

2
app/Game/Client/GameController.js
View file

@ -18,7 +18,7 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Nc, reque
this.view = ViewManager.createView(); this.view = ViewManager.createView();
this.me = null; this.me = null;
Nc.on(Nc.ns.client.view.gameInfo.toggle, this.toggleInfo, this); Nc.on(Nc.ns.client.game.gameInfo.toggle, this.toggleInfo, this);
Parent.call(this); Parent.call(this);
} }

4
app/Game/Client/GameObjects/Doll.js
View file

@ -77,7 +77,7 @@ function (Parent, Settings, Nc, Exception) {
Nc.trigger(Nc.ns.client.view.mesh.add, mesh); Nc.trigger(Nc.ns.client.view.mesh.add, mesh);
}; };
Nc.trigger("view/createAnimatedMesh", texturePaths, callback, { Nc.trigger(Nc.ns.client.view.animatedMesh.create, texturePaths, callback, {
visible: false, visible: false,
pivot: { pivot: {
x: 35/2 * 4, x: 35/2 * 4,
@ -95,7 +95,7 @@ function (Parent, Settings, Nc, Exception) {
self.headMesh = mesh; self.headMesh = mesh;
Nc.trigger(Nc.ns.client.view.mesh.add, mesh); Nc.trigger(Nc.ns.client.view.mesh.add, mesh);
} }
Nc.trigger("view/createMesh", texturePath, callback, { Nc.trigger(Nc.ns.client.view.mesh.create, texturePath, callback, {
pivot: { pivot: {
x: 5, x: 5,
y: 12 y: 12

2
app/Game/Client/GameObjects/Item.js
View file

@ -25,7 +25,7 @@ function (Parent, Settings, Nc) {
Nc.trigger(Nc.ns.client.view.mesh.add, mesh); Nc.trigger(Nc.ns.client.view.mesh.add, mesh);
} }
Nc.trigger("view/createMesh", Nc.trigger(Nc.ns.client.view.mesh.create,
texturePath, texturePath,
callback, callback,
{ {

2
app/Game/Client/GameObjects/Items/RagDoll.js
View file

@ -40,7 +40,7 @@ function (Parent, CoreItem, Settings, Nc) {
Nc.trigger(Nc.ns.client.view.mesh.add, mesh); Nc.trigger(Nc.ns.client.view.mesh.add, mesh);
} }
Nc.trigger("view/createMesh", Nc.trigger(Nc.ns.client.view.mesh.create,
texturePath + name + ".png", texturePath + name + ".png",
callback, callback,
{ {

2
app/Game/Client/GameObjects/Tile.js
View file

@ -30,7 +30,7 @@ function (Parent, Settings, Nc) {
Nc.trigger(Nc.ns.client.view.mesh.add, mesh); Nc.trigger(Nc.ns.client.view.mesh.add, mesh);
} }
Nc.trigger("view/createMesh", Nc.trigger(Nc.ns.client.view.mesh.create,
texturePath, texturePath,
callback, callback,
{ {

6
app/Game/Client/View/Views/AbstractView.js
View file

@ -12,8 +12,8 @@ function (DomController, Settings, Exception, Nc) {
this.canvas = null; this.canvas = null;
this.debugMode = false; this.debugMode = false;
Nc.on("view/createMesh", this.createMesh, this); Nc.on(Nc.ns.client.view.mesh.create, this.createMesh, this);
Nc.on("view/createAnimatedMesh", this.createAnimatedMesh, this); Nc.on(Nc.ns.client.view.animatedMesh.create, this.createAnimatedMesh, this);
Nc.on(Nc.ns.client.view.mesh.add, this.addMesh, this); Nc.on(Nc.ns.client.view.mesh.add, this.addMesh, this);
Nc.on(Nc.ns.client.view.mesh.remove, this.removeMesh, this); Nc.on(Nc.ns.client.view.mesh.remove, this.removeMesh, this);
Nc.on(Nc.ns.client.view.mesh.update, this.updateMesh, this); Nc.on(Nc.ns.client.view.mesh.update, this.updateMesh, this);
@ -21,8 +21,6 @@ function (DomController, Settings, Exception, Nc) {
Nc.on(Nc.ns.client.view.fullscreen.change, this.onFullscreenChange, this); Nc.on(Nc.ns.client.view.fullscreen.change, this.onFullscreenChange, this);
Nc.on(Nc.ns.client.view.debugMode.toggle, this.onToggleDebugMode, this); Nc.on(Nc.ns.client.view.debugMode.toggle, this.onToggleDebugMode, this);
Nc.on("view/toggleInfo", this.onToggleInfo, this);
Nc.on(Nc.ns.client.view.playerInfo.createAndAdd, this.onCreateAndAddPlayerInfo, this); Nc.on(Nc.ns.client.view.playerInfo.createAndAdd, this.onCreateAndAddPlayerInfo, this);
Nc.on(Nc.ns.client.view.playerInfo.update, this.onUpdatePlayerInfo, this); Nc.on(Nc.ns.client.view.playerInfo.update, this.onUpdatePlayerInfo, this);
Nc.on(Nc.ns.client.view.playerInfo.remove, this.onRemovePlayerInfo, this); Nc.on(Nc.ns.client.view.playerInfo.remove, this.onRemovePlayerInfo, this);

3
app/Lib/Utilities/NotificationCenter.js
View file

@ -31,6 +31,9 @@ function (Exception) {
remove: null, remove: null,
update: null update: null
}, },
animatedMesh: {
create: null
},
playerInfo: { playerInfo: {
createAndAdd: null, createAndAdd: null,
remove: null, remove: null,