added optimizer scripts and some code style improvements

This commit is contained in:
logsol 2015-03-09 04:56:28 +01:00
parent 6b472dc134
commit 5f5fec5b10
16 changed files with 397 additions and 36 deletions

View file

@ -1,4 +1,9 @@
define(function () {
define([
],
function () {
"use strict";
function Key () {
this._active = false;

View file

@ -20,12 +20,6 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Nc, reque
"use strict";
if (!window.cancelAnimationFrame) {
window.cancelAnimationFrame = function(id) {
clearTimeout(id);
};
}
function GameController (options) {
this.clientIsReady = false;
@ -277,6 +271,12 @@ function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Nc, reque
GameController.prototype.destroy = function() {
if (!window.cancelAnimationFrame) {
window.cancelAnimationFrame = function(id) {
clearTimeout(id);
};
}
cancelAnimationFrame(this.animationRequestId);
Parent.prototype.destroy.call(this);

View file

@ -118,5 +118,4 @@ function (Parent, Settings, Nc) {
};
return Me;
})
});

View file

@ -62,4 +62,4 @@ function (Parent, Settings, DomController, Box2D, Nc, DebugDraw, DebugLayer) {
}
return Engine;
})
});

View file

@ -11,13 +11,12 @@ function (Settings, Nc, Screenfull, Graph, PointerLockManager) {
"use strict";
function DomController() {
this.canvas = document.getElementById("canvas");
this.canvas = null;
this.stats = null;
this.ping = null;
this.nickContainer = null;
this.fpsContainer = "";
this.devToolsContainer = document.getElementById("menuBar");
this.devToolsContainer = null;
this.initDevTools();
}
@ -27,6 +26,9 @@ function (Settings, Nc, Screenfull, Graph, PointerLockManager) {
var self = this;
var li, button, label;
this.canvas = document.getElementById("canvas");
this.devToolsContainer = document.getElementById("menuBar");
// create back to menu button
li = document.createElement("li");
li.id = "back-to-menu";

View file

@ -9,13 +9,6 @@ define([
function (Parent, PIXI, ColorRangeReplaceFilter, Settings, ColorConverter) {
"use strict";
var AVAILABLE_MESH_FILTERS = {
"blur": PIXI.BlurFilter,
"desaturate": PIXI.GrayFilter,
"pixelate": PIXI.PixelateFilter,
"colorRangeReplace": ColorRangeReplaceFilter,
};
function Layer (name, parallaxSpeed) {
Parent.call(this, name, parallaxSpeed);
@ -60,6 +53,15 @@ function (Parent, PIXI, ColorRangeReplaceFilter, Settings, ColorConverter) {
Layer.prototype = Object.create(Parent.prototype);
Layer.prototype.getAvailableMeshFilters = function() {
return {
"blur": PIXI.BlurFilter,
"desaturate": PIXI.GrayFilter,
"pixelate": PIXI.PixelateFilter,
"colorRangeReplace": ColorRangeReplaceFilter,
};
};
Layer.prototype.getContainer = function() {
return this.container;
};
@ -135,11 +137,11 @@ function (Parent, PIXI, ColorRangeReplaceFilter, Settings, ColorConverter) {
Layer.prototype.addFilter = function(mesh, filterName, options) {
if (!AVAILABLE_MESH_FILTERS.hasOwnProperty(filterName)) {
if (!this.getAvailableMeshFilters().hasOwnProperty(filterName)) {
throw new Exception('Filter ' + filterName + ' is not available');
}
var MeshFilter = AVAILABLE_MESH_FILTERS[filterName];
var MeshFilter = this.getAvailableMeshFilters()[filterName];
var filter = new MeshFilter();
switch (filterName) {
@ -189,7 +191,7 @@ function (Parent, PIXI, ColorRangeReplaceFilter, Settings, ColorConverter) {
return;
}
var MeshFilter = AVAILABLE_MESH_FILTERS[options.filter];
var MeshFilter = this.getAvailableMeshFilters()[options.filter];
filters = filters.filter(function(filter){
return !filter instanceof MeshFilter;
@ -271,9 +273,6 @@ function (Parent, PIXI, ColorRangeReplaceFilter, Settings, ColorConverter) {
this.container.x += Settings.STAGE_WIDTH / 2;
this.container.y += Settings.STAGE_HEIGHT / 2;
}
};
return Layer;

View file

@ -1,4 +1,7 @@
define(function() {
define([
],
function () {
var ItemSettings = {

View file

@ -1,4 +1,7 @@
define(function() {
define([
],
function () {
var Settings = {
STAGE_WIDTH: 600,

View file

@ -1,4 +1,7 @@
define(function () {
define([
],
function () {
function PlayerController (player) {

View file

@ -96,4 +96,4 @@ define([
}
return Level;
})
});

View file

@ -213,4 +213,4 @@ define([
}
return TiledLevel;
})
});

View file

@ -1,4 +1,7 @@
define(function () {
define([
],
function () {
function User (id, options) {
this.id = id;

View file

@ -1,4 +1,7 @@
define(function() {
define([
],
function () {
/*
* Copyright (c) 2006-2007 Erin Catto http://www.gphysics.com

View file

@ -7,8 +7,6 @@ function (Nc, childProcess) {
"use strict";
var fork = childProcess.fork;
function PipeToChannel (options) {
this.fork = null;
@ -16,7 +14,7 @@ function (Nc, childProcess) {
this.users = [];
try {
this.fork = fork('channel.js'
this.fork = childProcess.fork('channel.js'
/*, {
execArgv: ['--debug=5859']
}*/