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 pull request #184 from juliandescottes/feature-shift-frame

Browse Source 
Feature shift frame
This commit is contained in:
Julian Descottes
2014-05-17 11:24:29 +02:00
parent c7c536dc80 5b4074fc38
commit ac2fe87558
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/js/drawingtools/Move.js
View File

@@ -30,15 +30,23 @@
ns.Move.prototype.moveToolAt = function(col, row, color, frame, overlay, event) { ns.Move.prototype.moveToolAt = function(col, row, color, frame, overlay, event) {
var colDiff = col - this.startCol, rowDiff = row - this.startRow; var colDiff = col - this.startCol, rowDiff = row - this.startRow;
this.shiftFrame(colDiff, rowDiff, frame, this.frameClone); this.shiftFrame(colDiff, rowDiff, frame, this.frameClone, event);
}; };
ns.Move.prototype.shiftFrame = function (colDiff, rowDiff, frame, reference) { ns.Move.prototype.shiftFrame = function (colDiff, rowDiff, frame, reference, event) {
var color; var color;
for (var col = 0 ; col < frame.getWidth() ; col++) { var w = frame.getWidth();
for (var row = 0 ; row < frame.getHeight() ; row++) { var h = frame.getHeight();
if (reference.containsPixel(col - colDiff, row - rowDiff)) { for (var col = 0 ; col < w ; col++) {
color = reference.getPixel(col - colDiff, row - rowDiff); for (var row = 0 ; row < h ; row++) {
var x = col - colDiff;
var y = row - rowDiff;
if (event.shiftKey) {
x = (x + w) % w;
y = (y + h) % h;
}
if (reference.containsPixel(x, y)) {
color = reference.getPixel(x, y);
} else { } else {
color = Constants.TRANSPARENT_COLOR; color = Constants.TRANSPARENT_COLOR;
} }
@@ -51,15 +59,19 @@
* @override * @override
*/ */
ns.Move.prototype.releaseToolAt = function(col, row, color, frame, overlay, event) { ns.Move.prototype.releaseToolAt = function(col, row, color, frame, overlay, event) {
this.moveToolAt(col, row, color, frame, overlay); this.moveToolAt(col, row, color, frame, overlay, event);
this.raiseSaveStateEvent({ this.raiseSaveStateEvent({
colDiff : col - this.startCol, colDiff : col - this.startCol,
rowDiff : row - this.startRow rowDiff : row - this.startRow,
shiftKey : event.shiftKey
}); });
}; };
ns.Move.prototype.replay = function(frame, replayData) { ns.Move.prototype.replay = function(frame, replayData) {
this.shiftFrame(replayData.colDiff, replayData.rowDiff, frame, frame.clone()); var event = {
shiftKey : replayData.shiftKey
};
this.shiftFrame(replayData.colDiff, replayData.rowDiff, frame, frame.clone(), event);
}; };
})(); })();