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

Previews are fixed. Removed drawing methods from piskel .js

Browse Source
This commit is contained in:
juliandescottes
2012-09-04 22:18:00 +02:00
parent c261c370ad
commit 69a03a3416
9 changed files with 49 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/drawingtools/Eraser.js
View File

@ -16,7 +16,7 @@
/**
* @override
*/
ns.Eraser.prototype.applyToolAt = function(col, row, frame) {
this.superclass.applyToolAt.call(this, col, row, frame, Constants.TRANSPARENT_COLOR);
ns.Eraser.prototype.applyToolAt = function(col, row, color, drawer) {
this.superclass.applyToolAt.call(this, col, row, Constants.TRANSPARENT_COLOR, drawer);
};
})();

2
js/drawingtools/PaintBucket.js
View File

@ -73,7 +73,7 @@
var nextCol = currentItem.col + dx[i]
var nextRow = currentItem.row + dy[i]
try {
if (frame.isInFrame(nextCol, nextRow) && frame.getPixel(nextCol, nextRow) == targetColor) {
if (frame.containsPixel(nextCol, nextRow) && frame.getPixel(nextCol, nextRow) == targetColor) {
queue.push({"col": nextCol, "row": nextRow });
}
} catch(e) {

2
js/drawingtools/Rectangle.js
View File

@ -52,7 +52,7 @@
*/
ns.Rectangle.prototype.releaseToolAt = function(col, row, color, drawer) {
// If the stroke tool is released outside of the canvas, we cancel the stroke:
if(drawer.frame.isInFrame(col, row)) {
if(drawer.frame.containsPixel(col, row)) {
var strokePoints = this.getRectanglePixels_(this.startCol, col, this.startRow, row);
for(var i = 0; i< strokePoints.length; i++) {
// Change model:

14
js/drawingtools/SimplePen.js
View File

@ -19,13 +19,15 @@
* @override
*/
ns.SimplePen.prototype.applyToolAt = function(col, row, color, drawer) {
this.previousCol = col;
this.previousRow = row;
drawer.frame.setPixel(col, row, color);
if (drawer.frame.containsPixel(col, row)) {
this.previousCol = col;
this.previousRow = row;
drawer.frame.setPixel(col, row, color);
// Draw on canvas:
// TODO: Remove that when we have the centralized redraw loop
drawer.renderFramePixel(col, row);
// Draw on canvas:
// TODO: Remove that when we have the centralized redraw loop
drawer.renderFramePixel(col, row);
}
};
ns.SimplePen.prototype.moveToolAt = function(col, row, color, drawer) {

2
js/drawingtools/Stroke.js
View File

@ -69,7 +69,7 @@
ns.Stroke.prototype.releaseToolAt = function(col, row, color, drawer) {
// If the stroke tool is released outside of the canvas, we cancel the stroke:
// TODO: Mutualize this check in common method
if(drawer.frame.isInFrame(col, row)) {
if(drawer.frame.containsPixel(col, row)) {
// The user released the tool to draw a line. We will compute the pixel coordinate, impact
// the model and draw them in the drawing canvas (not the fake overlay anymore)
var strokePoints = this.getLinePixels_(this.startCol, col, this.startRow, row);