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

Issue #215 : Dev environment : first undo/redo drawing test

Browse Source
This commit is contained in:
jdescottes 2015-08-25 01:01:12 +02:00
parent 754bc9b830
commit 6b6674a04d
5 changed files with 656 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/js/devtools/DrawingTestPlayer.js
View File

@ -5,7 +5,7 @@
this.initialState = testRecord.initialState; this.initialState = testRecord.initialState;
this.events = testRecord.events; this.events = testRecord.events;
this.referencePng = testRecord.png; this.referencePng = testRecord.png;
this.step = step || ns.DrawingTestPlayer.DEFAULT_STEP; this.step = step || this.initialState.step || ns.DrawingTestPlayer.DEFAULT_STEP;
this.callbacks = []; this.callbacks = [];
this.shim = null; this.shim = null;
}; };
@ -81,6 +81,11 @@
this.timer = window.setTimeout(function () { this.timer = window.setTimeout(function () {
var recordEvent = this.events[index]; var recordEvent = this.events[index];
if (!recordEvent) {
this.onTestEnd_();
return;
}
if (recordEvent.type === 'mouse-event') { if (recordEvent.type === 'mouse-event') {
this.playMouseEvent_(recordEvent); this.playMouseEvent_(recordEvent);
} else if (recordEvent.type === 'keyboard-event') { } else if (recordEvent.type === 'keyboard-event') {
@ -93,11 +98,7 @@
this.playInstrumentedEvent_(recordEvent); this.playInstrumentedEvent_(recordEvent);
} }
if (this.events[index + 1]) { this.playEvent_(index + 1);
this.playEvent_(index + 1);
} else {
this.onTestEnd_();
}
}.bind(this), this.step); }.bind(this), this.step);
}; };

2
src/js/rendering/frame/CachedFrameRenderer.js
View File

@ -38,8 +38,8 @@
size.width, size.height, size.width, size.height,
frame.getHash() frame.getHash()
].join('-'); ].join('-');
if (this.serializedFrame != serializedFrame) { if (this.serializedFrame != serializedFrame) {
// console.log('rendering')
this.serializedFrame = serializedFrame; this.serializedFrame = serializedFrame;
this.superclass.render.call(this, frame); this.superclass.render.call(this, frame);
} }

1
test/drawing/DrawingTests.browser.js
View File

@ -3,6 +3,7 @@
"bucket.drawing.json", "bucket.drawing.json",
"color.picker.json", "color.picker.json",
"frames.fun.json", "frames.fun.json",
"history.basic.json",
"layers.fun.json", "layers.fun.json",
"layers.merge.json", "layers.merge.json",
"lighten.darken.json", "lighten.darken.json",

1
test/drawing/DrawingTests.casper.js
View File

@ -2,6 +2,7 @@
"pen.drawing.json", "pen.drawing.json",
"color.picker.json", "color.picker.json",
"frames.fun.json", "frames.fun.json",
"history.basic.json",
"layers.fun.json", "layers.fun.json",
"layers.merge.json", "layers.merge.json",
"move.json", "move.json",

646
test/drawing/tests/history.basic.json Normal file
View File

@ -0,0 +1,646 @@
{
"events": [{
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 0,
"y": 0
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 0,
"y": 0
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 1,
"y": 0
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 1,
"y": 0
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 2,
"y": 0
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 2,
"y": 0
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 3,
"y": 0
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 3,
"y": 0
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 3,
"y": 1
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 3,
"y": 1
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 3,
"y": 2
},
"type": "mouse-event"
}, {
"event": {
"type": "mousemove",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 3,
"y": 2
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 3,
"y": 2
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 3,
"y": 3
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 3,
"y": 3
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 2,
"y": 3
},
"type": "mouse-event"
}, {
"event": {
"type": "mousemove",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 2,
"y": 3
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 2,
"y": 3
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 1,
"y": 3
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 1,
"y": 3
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 0,
"y": 3
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 0,
"y": 3
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 0,
"y": 2
},
"type": "mouse-event"
}, {
"event": {
"type": "mousemove",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 0,
"y": 2
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 0,
"y": 2
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 0,
"y": 1
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 0,
"y": 1
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 1,
"y": 1
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 1,
"y": 1
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 2,
"y": 1
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 2,
"y": 1
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 2,
"y": 2
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 2,
"y": 2
},
"type": "mouse-event"
}, {
"event": {
"type": "mousedown",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 1,
"y": 2
},
"type": "mouse-event"
}, {
"event": {
"type": "mouseup",
"button": 0,
"shiftKey": false,
"altKey": false,
"ctrlKey": false
},
"coords": {
"x": 1,
"y": 2
},
"type": "mouse-event"
},
{"type":"tool-event","toolId":"tool-colorpicker"},{
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}, {
"type": "keyboard-event",
"event": {
"which": 90,
"shiftKey": false,
"altKey": false,
"ctrlKey": true,
"target": {
"nodeName": "BODY"
}
}
}],
"initialState": {
"size": {
"width": 4,
"height": 4
},
"primaryColor": "#000000",
"secondaryColor": "rgba(0, 0, 0, 0)",
"selectedTool": "tool-pen",
"step" : 100
},
"png": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAD0lEQVQIW2NkQAOMpAsAAADuAAVDMQ2mAAAAAElFTkSuQmCC"
}