Skip to content
Permalink
Browse files

Merge pull request #22 from TheOnly92/multi_cmd

Support multiple calls of same command.
  • Loading branch information...
RSamaium committed Nov 27, 2013
2 parents fcdc9f1 + e681e45 commit d83a2f5512efb206bef96cf76e68f438f1f45b16
Showing with 45 additions and 39 deletions.
  1. +45 −39 canvasengine.js
@@ -3189,48 +3189,50 @@ In the method "ready" in the scene class :
array_cmd = this._cmd;
}
for (var _name in array_cmd) {
cmd = array_cmd[_name];
for (var j=0 ; j < this._canvas.length ; j++) {
cmd_propreties = cmd.propreties;
if (isCmd && _name == "restore") {
this.clearPropreties();
}
if (cmd_propreties) {
for (var key in cmd_propreties) {
applyBuffer = 1;

if (key == "globalAlpha") {
cmd_propreties[key] = this.real_opacity;
}

if (ctx) {
ctx[key] = cmd_propreties[key];
}
else {
this._canvas[j][layer][key] = cmd_propreties[key];
}

applyBuffer &= bufferProp.call(this, cmd_propreties, "globalAlpha", 1);
applyBuffer &= bufferProp.call(this, cmd_propreties, "strokeStyle", '#' + this.color_key);
applyBuffer &= bufferProp.call(this, cmd_propreties, "fillStyle", '#' + this.color_key);

if (applyBuffer) {
bufferProp.call(this, cmd_propreties, key, cmd_propreties[key]);
for (var _i in array_cmd[_name]) {
cmd = array_cmd[_name][_i];
for (var j=0 ; j < this._canvas.length ; j++) {
cmd_propreties = cmd.propreties;
if (isCmd && _name == "restore") {
this.clearPropreties();
}
if (cmd_propreties) {
for (var key in cmd_propreties) {
applyBuffer = 1;

if (key == "globalAlpha") {
cmd_propreties[key] = this.real_opacity;
}

if (ctx) {
ctx[key] = cmd_propreties[key];
}
else {
this._canvas[j][layer][key] = cmd_propreties[key];
}

applyBuffer &= bufferProp.call(this, cmd_propreties, "globalAlpha", 1);
applyBuffer &= bufferProp.call(this, cmd_propreties, "strokeStyle", '#' + this.color_key);
applyBuffer &= bufferProp.call(this, cmd_propreties, "fillStyle", '#' + this.color_key);

if (applyBuffer) {
bufferProp.call(this, cmd_propreties, key, cmd_propreties[key]);
}

}

}
}
if (ctx) {
ctx[_name].apply(ctx, cmd.params);
}
else {
this._canvas[j][layer][_name].apply(this._canvas[j][layer], cmd.params);
if (this._forceEvent) {
if (_name == "rect") {
this._bufferEvent("fillRect", cmd.params);
if (ctx) {
ctx[_name].apply(ctx, cmd.params);
}
else {
this._canvas[j][layer][_name].apply(this._canvas[j][layer], cmd.params);
if (this._forceEvent) {
if (_name == "rect") {
this._bufferEvent("fillRect", cmd.params);
}
}
this._bufferEvent(_name, cmd.params);
}
this._bufferEvent(_name, cmd.params);
}
}
}
@@ -3248,7 +3250,11 @@ In the method "ready" in the scene class :
if (this[propreties[k]]) obj[propreties[k]] = this[propreties[k]];
}
obj["globalAlpha"] = 1;
this._cmd[name] = {params: params, propreties: obj};
if (typeof this._cmd[name] !== "undefined" && this._cmd[name] !== null) {
this._cmd[name].push({params: params, propreties: obj});
} else {
this._cmd[name] = [{params: params, propreties: obj}];
}
},

hasCmd: function(name) {

0 comments on commit d83a2f5

Please sign in to comment.
You can’t perform that action at this time.