Merge branch 'nathan-starter' of https://github.com/brown-dash/Dash-Web into nathan-starter

2 files changed, 29 insertions, 1 deletions

diff --git a/src/pen-gestures/GestureTypes.ts b/src/pen-gestures/GestureTypes.ts
index d86562580..5a8e9bd97 100644
--- a/src/pen-gestures/GestureTypes.ts
+++ b/src/pen-gestures/GestureTypes.ts
@@ -1,12 +1,12 @@
 export enum Gestures {
     Line = 'line',
     Stroke = 'stroke',
-    Scribble = 'scribble',
     Text = 'text',
     Triangle = 'triangle',
     Circle = 'circle',
     Rectangle = 'rectangle',
     Arrow = 'arrow',
+    RightAngle = 'rightangle',
 }
 
 // Defines a point in an ink as a pair of x- and y-coordinates.
diff --git a/src/pen-gestures/ndollar.ts b/src/pen-gestures/ndollar.ts
index ff7f7310b..04262b61f 100644
--- a/src/pen-gestures/ndollar.ts
+++ b/src/pen-gestures/ndollar.ts
@@ -209,6 +209,7 @@ export class NDollarRecognizer {
                 ])
             )
         );
+        this.Multistrokes.push(new Multistroke(Gestures.Rectangle, useBoundedRotationInvariance, new Array([new Point(30, 143), new Point(106, 146), new Point(106, 225), new Point(30, 222), new Point(30, 146)])));
         this.Multistrokes.push(new Multistroke(Gestures.Line, useBoundedRotationInvariance, [[new Point(12, 347), new Point(119, 347)]]));
         this.Multistrokes.push(
             new Multistroke(
@@ -219,6 +220,13 @@ export class NDollarRecognizer {
         );
         this.Multistrokes.push(
             new Multistroke(
+                Gestures.Triangle, // equilateral
+                useBoundedRotationInvariance,
+                new Array([new Point(42, 100), new Point(140, 102), new Point(100, 200), new Point(40, 100)])
+            )
+        );
+        this.Multistrokes.push(
+            new Multistroke(
                 Gestures.Circle,
                 useBoundedRotationInvariance,
                 new Array([
@@ -236,6 +244,26 @@ export class NDollarRecognizer {
                 ])
             )
         );
+        this.Multistrokes.push(
+            new Multistroke(
+                Gestures.Circle,
+                useBoundedRotationInvariance,
+                new Array([
+                    new Point(201, 250),
+                    new Point(160, 230),
+                    new Point(151, 210),
+                    new Point(151, 190),
+                    new Point(160, 170),
+                    new Point(200, 150),
+                    new Point(240, 170),
+                    new Point(248, 190),
+                    new Point(248, 210),
+                    new Point(240, 230),
+                    new Point(200, 250),
+                ])
+            )
+        );
+        this.Multistrokes.push(new Multistroke(Gestures.RightAngle, useBoundedRotationInvariance, new Array([new Point(0, 0), new Point(0, 100), new Point(200, 100)])));
         NumMultistrokes = this.Multistrokes.length; // NumMultistrokes flags the end of the non user-defined gstures strokes
         //
         // PREDEFINED STROKES