From f1f341b53a1a49427cf7ef40afdcd95a9b0e4e9d Mon Sep 17 00:00:00 2001 From: Naafiyan Ahmed Date: Thu, 17 Mar 2022 16:35:30 -0400 Subject: feat: working on implementing writing mode --- src/client/views/GestureOverlay.tsx | 22 +++++++++++----------- src/client/views/collections/CollectionMenu.tsx | 1 + 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/client/views/GestureOverlay.tsx b/src/client/views/GestureOverlay.tsx index 04abdbf37..130e71924 100644 --- a/src/client/views/GestureOverlay.tsx +++ b/src/client/views/GestureOverlay.tsx @@ -617,20 +617,20 @@ export class GestureOverlay extends Touchable { newPoints.pop(); const controlPoints: { X: number, Y: number }[] = []; - const bezierCurves = fitCurve(newPoints, 10); - for (const curve of bezierCurves) { + // const bezierCurves = fitCurve(newPoints, 10); + // for (const curve of bezierCurves) { - controlPoints.push({ X: curve[0][0], Y: curve[0][1] }); - controlPoints.push({ X: curve[1][0], Y: curve[1][1] }); - controlPoints.push({ X: curve[2][0], Y: curve[2][1] }); - controlPoints.push({ X: curve[3][0], Y: curve[3][1] }); + // controlPoints.push({ X: curve[0][0], Y: curve[0][1] }); + // controlPoints.push({ X: curve[1][0], Y: curve[1][1] }); + // controlPoints.push({ X: curve[2][0], Y: curve[2][1] }); + // controlPoints.push({ X: curve[3][0], Y: curve[3][1] }); - } - const dist = Math.sqrt((controlPoints[0].X - controlPoints.lastElement().X) * (controlPoints[0].X - controlPoints.lastElement().X) + - (controlPoints[0].Y - controlPoints.lastElement().Y) * (controlPoints[0].Y - controlPoints.lastElement().Y)); - if (controlPoints.length > 4 && dist < 10) controlPoints[controlPoints.length - 1] = controlPoints[0]; - this._points = controlPoints; + // } + // const dist = Math.sqrt((controlPoints[0].X - controlPoints.lastElement().X) * (controlPoints[0].X - controlPoints.lastElement().X) + + // (controlPoints[0].Y - controlPoints.lastElement().Y) * (controlPoints[0].Y - controlPoints.lastElement().Y)); + // if (controlPoints.length > 4 && dist < 10) controlPoints[controlPoints.length - 1] = controlPoints[0]; + // this._points = controlPoints; this.dispatchGesture(GestureUtils.Gestures.Stroke); } diff --git a/src/client/views/collections/CollectionMenu.tsx b/src/client/views/collections/CollectionMenu.tsx index 131f5ba46..fc713e19e 100644 --- a/src/client/views/collections/CollectionMenu.tsx +++ b/src/client/views/collections/CollectionMenu.tsx @@ -733,6 +733,7 @@ export class CollectionFreeFormViewChrome extends React.Component { this._keepPrimitiveMode = keep; + // these are for shapes if (this._selectedPrimitive !== i) { this._selectedPrimitive = i; if (this._title[i] === "highlighter") { -- cgit v1.2.3-70-g09d2