mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

another fix in the code

Browse Source
This commit is contained in:
jdescottes 2014-07-14 16:25:03 +02:00
parent a0485331ae
commit d6569f6ed3
5 changed files with 91 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/piskel-style-packaged-2014-07-14-12-37.css → css/piskel-style-packaged-2014-07-14-04-22.css
View File

@ -198,9 +198,9 @@ body {
*/
.canvas.layers-below-canvas {z-index: 7;}
.canvas.drawing-canvas {z-index: 8;}
.canvas.layers-above-canvas {z-index: 9;}
.canvas.onion-skin-canvas {z-index: 10;}
.canvas.canvas-overlay {z-index: 11;}
.canvas.canvas-overlay {z-index: 9;}
.canvas.onion-skin-canvas {z-index: 10;}
.canvas.layers-above-canvas {z-index: 11;}

87
js/piskel-packaged-2014-07-14-12-37.js → js/piskel-packaged-2014-07-14-04-22.js
View File

@ -16505,6 +16505,8 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
this.add(this.aboveRenderer);
this.serializedRendering = '';
$.subscribe(Events.PISKEL_RESET, this.flush.bind(this));
};
pskl.utils.inherit(pskl.rendering.layer.LayersRenderer, pskl.rendering.CompositeRenderer);
@ -16516,6 +16518,10 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
var currentFrameIndex = this.piskelController.getCurrentFrameIndex();
var currentLayerIndex = this.piskelController.getCurrentLayerIndex();
var downLayers = layers.slice(0, currentLayerIndex);
var upLayers = layers.slice(currentLayerIndex + 1, layers.length);
var serializedRendering = [
this.getZoom(),
this.getGridWidth(),
@ -16523,8 +16529,8 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
offset.y,
size.width,
size.height,
currentFrameIndex,
currentLayerIndex,
this.getHashForLayersAt_(currentFrameIndex, downLayers),
this.getHashForLayersAt_(currentFrameIndex, upLayers),
layers.length
].join("-");
@ -16534,18 +16540,15 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
this.clear();
var downLayers = layers.slice(0, currentLayerIndex);
if (downLayers.length > 0) {
var downFrame = this.getFrameForLayersAt_(currentFrameIndex, downLayers);
this.belowRenderer.render(downFrame);
}
var upLayers = layers.slice(currentLayerIndex + 1, layers.length);
if (upLayers.length > 0) {
var upFrame = this.getFrameForLayersAt_(currentFrameIndex, upLayers);
this.aboveRenderer.render(upFrame);
}
}
};
@ -16569,6 +16572,13 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
return pskl.utils.FrameUtils.merge(frames);
};
ns.LayersRenderer.prototype.getHashForLayersAt_ = function (frameIndex, layers) {
var hash = layers.map(function (l) {
return l.getFrameAt(frameIndex).getHash();
});
return hash.join('-');
};
ns.LayersRenderer.prototype.flush = function () {
this.serializedRendering = '';
};
@ -18353,9 +18363,11 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
};
ns.AnimatedPreviewController.prototype.setFPS = function (fps) {
this.fps = fps;
$("#preview-fps").val(this.fps);
$("#display-fps").html(this.fps + " FPS");
if (fps) {
this.fps = fps;
$("#preview-fps").val(this.fps);
$("#display-fps").html(this.fps + " FPS");
}
};
ns.AnimatedPreviewController.prototype.getFPS = function () {
@ -20524,10 +20536,16 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
ns.LocalStorageService.prototype.load = function(name) {
var piskelString = this.getPiskel(name);
var key = this.getKey_(name);
var serializedPiskel = JSON.parse(piskelString);
// FIXME : should be moved to deserializer
// Deserializer should call callback with descriptor + fps information
var fps = serializedPiskel.piskel.fps;
var description = serializedPiskel.piskel.description;
pskl.utils.serialization.Deserializer.deserialize(JSON.parse(piskelString), function (piskel) {
piskel.setDescriptor(new pskl.model.piskel.Descriptor(name, key.description, true));
pskl.utils.serialization.Deserializer.deserialize(serializedPiskel, function (piskel) {
piskel.setDescriptor(new pskl.model.piskel.Descriptor(name, description, true));
pskl.app.piskelController.setPiskel(piskel);
pskl.app.animationController.setFPS(fps);
});
};
@ -20665,6 +20683,7 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
var info = {
name : descriptor.name,
description : descriptor.info,
fps : this.piskelController.getFPS(),
date : Date.now(),
hash : hash
};
@ -20695,9 +20714,11 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
pskl.utils.serialization.Deserializer.deserialize(previousPiskel, function (piskel) {
piskel.setDescriptor(new pskl.model.piskel.Descriptor(previousInfo.name, previousInfo.description, true));
pskl.app.piskelController.setPiskel(piskel);
pskl.app.animationController.setFPS(previousInfo.fps);
});
};
})();;(function () {
})();
;(function () {
var ns = $.namespace('pskl.service');
ns.BeforeUnloadService = function (piskelController) {
@ -22698,3 +22719,47 @@ zlib.js 2012 - imaya [ https://github.com/imaya/zlib.js ] The MIT License
}
};
})();
;(function () {
var flipFrame = function (frame, horizontal, vertical) {
var clone = frame.clone();
var w = frame.getWidth();
var h = frame.getHeight();
clone.forEachPixel(function (color, x, y) {
if (horizontal) {
x = w-x-1;
}
if (vertical) {
y = h-y-1;
}
frame.pixels[x][y] = color;
});
frame.version++;
};
window.flip = function (horizontal, vertical) {
var currentFrameIndex = pskl.app.piskelController.getCurrentFrameIndex();
var layers = pskl.app.piskelController.getLayers();
layers.forEach(function (layer) {
flipFrame(layer.getFrameAt(currentFrameIndex), horizontal, vertical);
});
$.publish(Events.PISKEL_RESET);
$.publish(Events.PISKEL_SAVE_STATE, {
type : pskl.service.HistoryService.SNAPSHOT
});
};
window.copyToAll = function () {
var ref = pskl.app.piskelController.getCurrentFrame();
var layer = pskl.app.piskelController.getCurrentLayer();
layer.getFrames().forEach(function (frame) {
if (frame !== ref) {
frame.setPixels(ref.getPixels());
}
});
$.publish(Events.PISKEL_RESET);
$.publish(Events.PISKEL_SAVE_STATE, {
type : pskl.service.HistoryService.SNAPSHOT
});
};
})();

10
js/piskel-packaged-min-2014-07-14-12-37.js → js/piskel-packaged-min-2014-07-14-04-22.js
View File

File diff suppressed because one or more lines are too long

10
js/piskel-packaged-min.js vendored
View File

File diff suppressed because one or more lines are too long

4
piskel-boot-0.1.0.js
View File

@ -1,9 +1,9 @@
(function () {
/**
* See @Gruntfile.js => after build, -2014-07-14-12-37 is replaced by the build version
* See @Gruntfile.js => after build, -2014-07-14-04-22 is replaced by the build version
*/
var version = '-2014-07-14-12-37';
var version = '-2014-07-14-04-22';
var versionHasNotBeenReplaced = version.indexOf('@@') === 0;
if (versionHasNotBeenReplaced) {
version = '';