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

Layers:Review:Removed grid drawing routine : was never drawn

Browse Source
This commit is contained in:
jdescottes
2013-09-30 22:44:02 +02:00
parent f514b6cd10
commit 2686a2e944
5 changed files with 24 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
js/controller/DrawingController.js
View File

@ -16,9 +16,11 @@
*/
this.container = container;
this.dpi = this.calculateDPI_();
// TODO(vincz): Store user prefs in a localstorage string ?
var renderingOptions = {
"dpi": this.calculateDPI_(),
"dpi": this.dpi,
"supportGridRendering" : true
};
@ -248,7 +250,7 @@
ns.DrawingController.prototype.renderFrame = function () {
var frame = this.piskelController.getCurrentFrame();
var serializedFrame = frame.serialize();
var serializedFrame = this.dpi + "-" + frame.serialize();
if (this.serializedFrame != serializedFrame) {
if (!frame.isSameSize(this.overlayFrame)) {
this.overlayFrame = pskl.model.Frame.createEmptyFromFrame(frame);
@ -259,7 +261,7 @@
};
ns.DrawingController.prototype.renderOverlay = function () {
var serializedOverlay = this.overlayFrame.serialize();
var serializedOverlay = this.dpi + "-" + this.overlayFrame.serialize();
if (this.serializedOverlay != serializedOverlay) {
this.serializedOverlay = serializedOverlay;
this.overlayRenderer.render(this.overlayFrame);
@ -271,8 +273,14 @@
var currentFrameIndex = this.piskelController.currentFrameIndex;
var currentLayerIndex = this.piskelController.currentLayerIndex;
var serialized = [currentFrameIndex, this.piskelController.currentLayerIndex, layers.length].join("-");
if (this.serializedLayerFrame != serialized) {
var serializedLayerFrame = [
this.dpi,
currentFrameIndex,
currentLayerIndex,
layers.length
].join("-");
if (this.serializedLayerFrame != serializedLayerFrame) {
this.layersAboveRenderer.clear();
this.layersBelowRenderer.clear();
@ -286,7 +294,7 @@
this.layersAboveRenderer.render(upFrame);
}
this.serializedLayerFrame = serialized;
this.serializedLayerFrame = serializedLayerFrame;
}
};
@ -297,10 +305,6 @@
return pskl.utils.FrameUtils.merge(frames);
};
ns.DrawingController.prototype.forceRendering_ = function () {
this.serializedFrame = this.serializedOverlay = null;
};
/**
* @private
*/
@ -327,17 +331,15 @@
* @private
*/
ns.DrawingController.prototype.updateDPI_ = function() {
var dpi = this.calculateDPI_();
this.dpi = this.calculateDPI_();
this.overlayRenderer.updateDPI(dpi);
this.renderer.updateDPI(dpi);
this.layersAboveRenderer.updateDPI(dpi);
this.layersBelowRenderer.updateDPI(dpi);
this.serializedLayerFrame = "";
this.overlayRenderer.setDPI(this.dpi);
this.renderer.setDPI(this.dpi);
this.layersAboveRenderer.setDPI(this.dpi);
this.layersBelowRenderer.setDPI(this.dpi);
var currentFrameHeight = this.piskelController.getCurrentFrame().getHeight();
var canvasHeight = currentFrameHeight * dpi;
var canvasHeight = currentFrameHeight * this.dpi;
if (pskl.UserSettings.get(pskl.UserSettings.SHOW_GRID)) {
canvasHeight += Constants.GRID_STROKE_WIDTH * currentFrameHeight;
}
@ -347,7 +349,5 @@
'top': verticalGapInPixel + 'px',
'height': canvasHeight + 'px'
});
this.forceRendering_();
};
})();