mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
Shit merge
This commit is contained in:
@ -20,7 +20,7 @@
|
||||
|
||||
// Change model:
|
||||
frame[col][row] = Constants.TRANSPARENT_COLOR;
|
||||
|
||||
|
||||
// Draw on canvas:
|
||||
// TODO: Remove that when we have the centralized redraw loop
|
||||
this.drawPixelInCanvas(col, row, canvas, Constants.TRANSPARENT_COLOR, dpi);
|
||||
@ -33,4 +33,9 @@
|
||||
this.applyToolAt(col, row, frame, color, canvas, dpi);
|
||||
};
|
||||
|
||||
ns.Eraser.prototype.releaseToolAt = function(col, row, frame, color, canvas, dpi) {
|
||||
// TODO: Create a afterRelease event hook or put that deep in the model
|
||||
$.publish(Events.FRAMESHEET_UPDATED);
|
||||
};
|
||||
|
||||
})();
|
@ -21,12 +21,18 @@
|
||||
var targetColor = pskl.utils.normalizeColor(frame[col][row]);
|
||||
//this.recursiveFloodFill_(frame, col, row, targetColor, color);
|
||||
this.queueLinearFloodFill_(frame, col, row, targetColor, color);
|
||||
|
||||
$.publish(Events.FRAMESHEET_UPDATED);
|
||||
|
||||
// Draw in canvas:
|
||||
// TODO: Remove that when we have the centralized redraw loop
|
||||
this.drawFrameInCanvas(frame, canvas, dpi);
|
||||
};
|
||||
|
||||
ns.PaintBucket.prototype.releaseToolAt = function(col, row, frame, color, canvas, dpi) {
|
||||
// TODO: Create a afterRelease event hook or put that deep in the model
|
||||
$.publish(Events.FRAMESHEET_UPDATED);
|
||||
};
|
||||
|
||||
/**
|
||||
* Flood-fill (node, target-color, replacement-color):
|
||||
* 1. Set Q to the empty queue.
|
||||
|
@ -81,9 +81,12 @@
|
||||
// TODO: Remove that when we have the centralized redraw loop
|
||||
this.drawPixelInCanvas(strokePoints[i].col, strokePoints[i].row, canvas, color, dpi);
|
||||
}
|
||||
|
||||
|
||||
// For now, we are done with the stroke tool and don't need an overlay anymore:
|
||||
this.removeCanvasOverlays();
|
||||
|
||||
// TODO: Create a afterRelease event hook or put that deep in the model
|
||||
$.publish(Events.FRAMESHEET_UPDATED);
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -52,4 +52,9 @@
|
||||
this.previousCol = col;
|
||||
this.previousRow = row;
|
||||
};
|
||||
|
||||
ns.SimplePen.prototype.releaseToolAt = function(col, row, frame, color, canvas, dpi) {
|
||||
// TODO: Create a afterRelease event hook or out that deep in the model
|
||||
$.publish(Events.FRAMESHEET_UPDATED);
|
||||
};
|
||||
})();
|
||||
|
@ -97,6 +97,9 @@
|
||||
|
||||
// For now, we are done with the stroke tool and don't need an overlay anymore:
|
||||
this.removeCanvasOverlays();
|
||||
|
||||
// TODO: Create a afterRelease event hook or out that deep in the model
|
||||
$.publish(Events.FRAMESHEET_UPDATED);
|
||||
};
|
||||
|
||||
})();
|
||||
|
Reference in New Issue
Block a user