scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2025-01-08 21:52:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

smooth the motion of large brushes

Browse source
This commit is contained in:
DD Liu 2017-08-01 11:21:26 -04:00
parent 6e27d133a8
commit 69666f3b8a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/tools/broad-brush-helper.js
View file

@ -17,7 +17,7 @@ const broadBrushHelper = function (tool) {
let finalPath; let finalPath;
tool.onBroadMouseDown = function (event) { tool.onBroadMouseDown = function (event) {
tool.minDistance = this.options.brushSize / 4; tool.minDistance = 1;
tool.maxDistance = this.options.brushSize; tool.maxDistance = this.options.brushSize;
if (event.event.button > 0) return; // only first mouse button if (event.event.button > 0) return; // only first mouse button
@ -54,7 +54,7 @@ const broadBrushHelper = function (tool) {
if (finalPath.segments.length === 5) { if (finalPath.segments.length === 5) {
// Flatten is necessary to prevent smooth from getting rid of the effect // Flatten is necessary to prevent smooth from getting rid of the effect
// of the handles on the first point. // of the handles on the first point.
finalPath.flatten(this.options.brushSize / 5); finalPath.flatten(Math.min(5, this.options.brushSize / 5));
} }
finalPath.smooth(); finalPath.smooth();
lastPoint = event.point; lastPoint = event.point;

4
src/tools/segment-brush-helper.js
View file

@ -20,7 +20,7 @@ const segmentBrushHelper = function (tool) {
tool.onSegmentMouseDown = function (event) { tool.onSegmentMouseDown = function (event) {
if (event.event.button > 0) return; // only first mouse button if (event.event.button > 0) return; // only first mouse button
tool.minDistance = this.options.brushSize / 4; tool.minDistance = 1;
tool.maxDistance = this.options.brushSize; tool.maxDistance = this.options.brushSize;
finalPath = new paper.Path.Circle({ finalPath = new paper.Path.Circle({
@ -60,7 +60,7 @@ const segmentBrushHelper = function (tool) {
path.closed = true; path.closed = true;
// The unite function on curved paths does not always work (sometimes deletes half the path) // The unite function on curved paths does not always work (sometimes deletes half the path)
// so we have to flatten. // so we have to flatten.
path.flatten(this.options.brushSize / 5); path.flatten(Math.min(5, this.options.brushSize / 5));
lastPoint = event.point; lastPoint = event.point;
const newPath = finalPath.unite(path); const newPath = finalPath.unite(path);