scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-22 21:42:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'develop' into reshapeCurves

Browse source
This commit is contained in:
DD Liu 2020-07-28 13:47:13 -04:00
commit 3039b48849
4 changed files with 50 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -24,7 +24,7 @@
"url": "git+ssh://git@github.com/LLK/scratch-paint.git"
},
"dependencies": {
"@scratch/paper": "0.11.20200529164227",
"@scratch/paper": "0.11.20200709220949",
"classnames": "2.2.5",
"keymirror": "0.1.1",
"lodash.bindall": "4.4.0",

36
src/helper/blob-tools/broad-brush-helper.js
View file

@ -34,10 +34,11 @@ class BroadBrushHelper {
onBroadMouseDown (event, tool, options) {
this.steps = 0;
this.smoothed = 0;
this.lastVec = null;
tool.minDistance = Math.min(5, Math.max(2 / paper.view.zoom, options.brushSize / 2));
tool.maxDistance = options.brushSize;
if (event.event.button > 0) return; // only first mouse button
this.finalPath = new paper.Path.Circle({
center: event.point,
radius: options.brushSize / 2
@ -45,7 +46,7 @@ class BroadBrushHelper {
styleBlob(this.finalPath, options);
this.lastPoint = event.point;
}
onBroadMouseDrag (event, tool, options) {
this.steps++;
const step = (event.delta).normalize(options.brushSize / 2);
@ -78,7 +79,6 @@ class BroadBrushHelper {
this.endCaps.push(this.union(circ, this.union(rect, rect2)));
}
}
this.lastVec = event.delta;
step.angle += 90;
// Move the first point out away from the drag so that the end of the path is rounded
@ -96,17 +96,28 @@ class BroadBrushHelper {
this.finalPath.insert(0, new paper.Segment(this.lastPoint.subtract(step)));
this.finalPath.add(new paper.Segment(this.lastPoint.add(step)));
}
const top = event.middlePoint.add(step);
const bottom = event.middlePoint.subtract(step);
this.finalPath.add(top);
// Update angle of the last brush step's points to match the average angle of the last mouse vector and this
// mouse vector (aka the vertex normal).
if (this.lastVec) {
const lastNormal = this.lastVec.normalize(options.brushSize / 2).rotate(90);
const averageNormal = new paper.Point(
lastNormal.x + step.x,
lastNormal.y + step.y
).normalize(options.brushSize / 2);
this.finalPath.segments[0].point = this.lastPoint.subtract(averageNormal);
this.finalPath.segments[this.finalPath.segments.length - 1].point = this.lastPoint.add(averageNormal);
}
this.finalPath.add(event.point.add(step));
this.finalPath.insert(0, bottom);
this.finalPath.insert(0, event.point.subtract(step));
if (this.finalPath.segments.length > this.smoothed + (this.smoothingThreshold * 2)) {
this.simplify(1);
}
this.lastVec = event.delta;
this.lastPoint = event.point;
}
@ -185,10 +196,15 @@ class BroadBrushHelper {
return this.finalPath;
}
let delta = this.lastVec;
// If the mouse up is at the same point as the mouse drag event then we need
// the second to last point to get the right direction vector for the end cap
if (!event.point.equals(this.lastPoint)) {
const step = event.delta.normalize(options.brushSize / 2);
// The given event.delta is the difference between the mouse down coords and the mouse up coords,
// but we want the difference between the last mouse drag coords and the mouse up coords.
delta = event.point.subtract(this.lastPoint);
const step = delta.normalize(options.brushSize / 2);
step.angle += 90;
const top = event.point.add(step);
@ -199,7 +215,7 @@ class BroadBrushHelper {
// Simplify before adding end cap so cap doesn't get warped
this.simplify(1);
const handleVec = event.delta.normalize(options.brushSize / 2);
const handleVec = delta.normalize(options.brushSize / 2);
this.finalPath.add(new paper.Segment(
event.point.add(handleVec),
handleVec.rotate(90),
@ -219,7 +235,7 @@ class BroadBrushHelper {
this.finalPath.remove();
this.finalPath = newPath;
}
// Try to merge end caps
for (const cap of this.endCaps) {
const temp = this.union(this.finalPath, cap);

2
src/helper/group.js
View file

@ -92,6 +92,8 @@ const ungroupItems = function (items, setSelectedItems, onUpdateImage) {
if (!item.hasChildren()) {
emptyGroups.push(item);
}
} else if (setSelectedItems) {
item.selected = true;
}
}
if (setSelectedItems) {

22
src/hocs/keyboard-shortcuts-hoc.jsx
View file

@ -8,7 +8,8 @@ import CopyPasteHOC from './copy-paste-hoc.jsx';
import {selectAllBitmap} from '../helper/bitmap';
import {clearSelection, deleteSelection, getSelectedLeafItems,
selectAllItems, selectAllSegments} from '../helper/selection';
selectAllItems, selectAllSegments, getSelectedRootItems} from '../helper/selection';
import {groupSelection, shouldShowGroup, ungroupSelection, shouldShowUngroup} from '../helper/group';
import {clearSelectedItems, setSelectedItems} from '../reducers/selected-items';
import {changeMode} from '../reducers/modes';
@ -47,11 +48,30 @@ const KeyboardShortcutsHOC = function (WrappedComponent) {
this.props.onRedo();
} else if (event.key === 'z') {
this.props.onUndo();
} else if (event.shiftKey && event.key.toLowerCase() === 'g') {
if (shouldShowUngroup()) {
ungroupSelection(clearSelectedItems, setSelectedItems, this.props.onUpdateImage);
}
event.preventDefault();
} else if (event.key === 'g') {
if (shouldShowGroup()) {
groupSelection(clearSelectedItems, setSelectedItems, this.props.onUpdateImage);
}
event.preventDefault();
} else if (event.key === 'c') {
this.props.onCopyToClipboard();
} else if (event.key === 'v') {
this.changeToASelectMode();
this.props.onPasteFromClipboard();
} else if (event.key === 'x') {
const selectedItems = getSelectedRootItems();
if (selectedItems.length > 0) {
this.props.onCopyToClipboard();
if (deleteSelection(this.props.mode, this.props.onUpdateImage)) {
this.props.setSelectedItems(this.props.format);
}
}
event.preventDefault();
} else if (event.key === 'a') {
this.changeToASelectMode();
event.preventDefault();