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

nc merge

Browse source
This commit is contained in:
logsol 2014-03-17 21:58:54 +01:00
commit f7ca9d2393
23 changed files with 69 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Game/Client/View/DomController.js
View file

@ -39,7 +39,7 @@ function (Settings, Nc, Stats, Screenfull) {
window.onresize = function() {
if(Screenfull.enabled) {
Nc.trigger("view/fullscreenChange", Screenfull.isFullscreen);
Nc.trigger(Nc.ns.client.view.fullscreen.change, Screenfull.isFullscreen);
}
}
@ -71,7 +71,7 @@ function (Settings, Nc, Stats, Screenfull) {
var checkbox = document.createElement("input");
checkbox.type = "checkbox";
checkbox.onclick = function(e) {
Nc.trigger("view/toggleDebugMode", e.target.checked);
Nc.trigger(Nc.ns.client.view.debugMode.toggle, e.target.checked);
self.getDebugCanvas().style.display = e.target.checked ? "" : "none";
}
label.appendChild(checkbox);

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

@ -14,20 +14,21 @@ function (DomController, Settings, Exception, Nc) {
Nc.on("view/createMesh", this.createMesh, this);
Nc.on("view/createAnimatedMesh", this.createAnimatedMesh, this);
Nc.on("view/addMesh", this.addMesh, this);
Nc.on("view/removeMesh", this.removeMesh, this);
Nc.on("view/updateMesh", this.updateMesh, 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.update, this.updateMesh, this);
Nc.on("view/fullscreenChange", this.onFullscreenChange, this);
Nc.on("view/toggleDebugMode", this.onToggleDebugMode, 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("view/toggleInfo", this.onToggleInfo, 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("view/removePlayerInfo", this.onRemovePlayerInfo, this);
Nc.on(Nc.ns.client.view.playerInfo.remove, this.onRemovePlayerInfo, this);
Nc.on("view/updateLoader", this.onUpdateLoader, this);
Nc.on(Nc.ns.client.view.preloadBar.update, this.onUpdateLoader, this);
}
AbstractView.prototype.isWebGlEnabled = function () {