Browse Source

cleanup

tags/v0.3.0
BigBadWaffle 5 years ago
parent
commit
53eecaff89
4 changed files with 13 additions and 30 deletions
  1. +7
    -16
      src/client/js/rendering/renderer.js
  2. +1
    -3
      src/client/js/system/addons.js
  3. +3
    -9
      src/client/js/system/client.js
  4. +2
    -2
      src/client/js/system/globals.js

+ 7
- 16
src/client/js/rendering/renderer.js View File

@@ -735,12 +735,9 @@ define([
},

addFilter: function (sprite) {
let thickness = 16;
if (sprite.width > scale)
thickness = 8;
let thickness = (sprite.width > scale) ? 8 : 16;

let filter = new shaderOutline(this.renderer.width, this.renderer.height, thickness, '0xffffff');

if (!sprite.filters)
sprite.filters = [filter];
else
@@ -750,10 +747,8 @@ define([
},

removeFilter: function (sprite, filter) {
if (!sprite.filters)
return;

sprite.filters = null;
if (sprite.filters)
sprite.filters = null;
},

buildText: function (obj) {
@@ -776,8 +771,7 @@ define([
},

buildEmitter: function (config) {
let emitter = particles.buildEmitter(config);
return emitter;
return particles.buildEmitter(config);
},

destroyEmitter: function (emitter) {
@@ -789,15 +783,12 @@ define([
},

reorder: function (sprite) {
let mobLayer = this.layers.mobs;
let mobs = mobLayer.children;
mobs.sort((a, b) => b.y - a.y);
this.layers.mobs.children.sort((a, b) => b.y - a.y);
},

destroyObject: function (obj) {
if (!obj.sprite.parent)
return;
obj.sprite.parent.removeChild(obj.sprite);
if (obj.sprite.parent)
obj.sprite.parent.removeChild(obj.sprite);
},

render: function () {


+ 1
- 3
src/client/js/system/addons.js View File

@@ -12,8 +12,6 @@ window.addons = {
init: function (events) {
this.events = events;

this.addons.forEach(function (m) {
m.init(this.events);
}, this);
this.addons.forEach(a => a.init(this.events));
}
};

+ 3
- 9
src/client/js/system/client.js View File

@@ -51,21 +51,15 @@ define([
// before instantiating it
let oList = response.onGetObject;
if (oList) {
let prepend = oList.filter(function (o) {
return o.self;
});
oList.spliceWhere(function (o) {
return prepend.some(function (p) {
return p === o;
});
});
let prepend = oList.filter(o => o.self);
oList.spliceWhere(o => prepend.some(p => p === o));
oList.unshift.apply(oList, prepend);
}

for (let e in response) {
let r = response[e];

//Certain messages expect to be performed last (because the object they act on hasn't been greated when they get queued)
//Certain messages expect to be performed last (because the object they act on hasn't been created when they get queued)
r.sort(function (a, b) {
if (a.performLast)
return 1;


+ 2
- 2
src/client/js/system/globals.js View File

@@ -1,7 +1,7 @@
define([
], function (
) {
return {


Loading…
Cancel
Save