aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoreleanor-park <eleanor_park@brown.edu>2024-04-14 14:45:53 -0400
committereleanor-park <eleanor_park@brown.edu>2024-04-14 14:45:53 -0400
commitb65b601386e04cbace0ce42f38392c1c75039231 (patch)
tree7e564658ace78f9acb75e7b650fb5b5100021658 /src
parent15e40cd865474f524c8e35f9352fc40d4b515ab3 (diff)
repushing
Diffstat (limited to 'src')
-rw-r--r--src/client/views/InkingStroke.tsx2
-rw-r--r--src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/views/InkingStroke.tsx b/src/client/views/InkingStroke.tsx
index 6bee0d20d..44c7b3a6b 100644
--- a/src/client/views/InkingStroke.tsx
+++ b/src/client/views/InkingStroke.tsx
@@ -354,7 +354,7 @@ export class InkingStroke extends ViewBoxBaseComponent<FieldViewProps>() impleme
{ X: inkCoords.X + radius, Y: inkCoords.Y }, // right again
];
const eraserCircle = new InkField(points);
- return eraserCircle;
+ return points;
}
_subContentView: ViewBoxInterface | undefined;
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 2bf4f3c1e..1fd52bd91 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -856,7 +856,7 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
for (var i = 0; i < eraserInkData.length - 3; i += 4) {
const eraserBezier: Bezier = InkField.Segment(eraserInkData, i);
- segment1.push(eraserBezier);
+ segment1.push(eraserBezier); // this renders the eraser bezier, all the commented out code below is for intersecting the stroke with the eraser
for (var j = 0; j < inkData.length; j += 4) {
const inkSegment: Bezier = InkField.Segment(inkData, i);
// this.bintersects(inkSegment, eraserBezier).forEach((val: string | number, i: number) => {