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

Merge branch 'master' into enhancement-palette-sorting

Browse Source 
Conflicts:
	src/js/utils/FrameUtils.js
This commit is contained in:
jdescottes
2014-09-21 21:56:22 +02:00
parent 6445b44d02 9ef46d5ec5
commit 8a29b78af8
17 changed files with 289 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/js/rendering/CanvasRenderer.js
View File

@@ -25,7 +25,7 @@
var scaledCanvas = this.createCanvas_(this.zoom);
var scaledContext = scaledCanvas.getContext('2d');
pskl.CanvasUtils.disableImageSmoothing(scaledCanvas);
pskl.utils.CanvasUtils.disableImageSmoothing(scaledCanvas);
scaledContext.scale(this.zoom, this.zoom);
scaledContext.drawImage(canvas, 0, 0);
@@ -44,6 +44,6 @@
zoom = zoom || 1;
var width = this.frame.getWidth() * zoom;
var height = this.frame.getHeight() * zoom;
return pskl.CanvasUtils.createCanvas(width, height);
return pskl.utils.CanvasUtils.createCanvas(width, height);
};
})();

2
src/js/rendering/FramesheetRenderer.js
View File

@@ -37,7 +37,7 @@
var count = this.frames.length;
var width = count * sampleFrame.getWidth();
var height = sampleFrame.getHeight();
return pskl.CanvasUtils.createCanvas(width, height);
return pskl.utils.CanvasUtils.createCanvas(width, height);
};
})();

10
src/js/rendering/frame/FrameRenderer.js
View File

@@ -70,8 +70,8 @@
};
ns.FrameRenderer.prototype.clear = function () {
pskl.CanvasUtils.clear(this.canvas);
pskl.CanvasUtils.clear(this.displayCanvas);
pskl.utils.CanvasUtils.clear(this.canvas);
pskl.utils.CanvasUtils.clear(this.displayCanvas);
};
ns.FrameRenderer.prototype.setZoom = function (zoom) {
@@ -153,8 +153,8 @@
var height = this.displayHeight;
var width = this.displayWidth;
this.displayCanvas = pskl.CanvasUtils.createCanvas(width, height, this.classes);
pskl.CanvasUtils.disableImageSmoothing(this.displayCanvas);
this.displayCanvas = pskl.utils.CanvasUtils.createCanvas(width, height, this.classes);
pskl.utils.CanvasUtils.disableImageSmoothing(this.displayCanvas);
this.container.append(this.displayCanvas);
};
@@ -223,7 +223,7 @@
*/
ns.FrameRenderer.prototype.renderFrame_ = function (frame) {
if (!this.canvas || frame.getWidth() != this.canvas.width || frame.getHeight() != this.canvas.height) {
this.canvas = pskl.CanvasUtils.createCanvas(frame.getWidth(), frame.getHeight());
this.canvas = pskl.utils.CanvasUtils.createCanvas(frame.getWidth(), frame.getHeight());
}
var context = this.canvas.getContext('2d');