Merge pull request #741 from jonobr1/737-from-object

Added fromObject and copy methods to all Two.Elements and descendants

Author: jonobr1

build/two.js

@@ -1,6 +1,7 @@
 import { Commands } from './utils/path-commands.js';
 import { Events } from './events.js';
 import { Vector } from './vector.js';
+import { toFixed } from './utils/math.js';
 
 /**
  * @class
@@ -16,10 +17,9 @@ import { Vector } from './vector.js';
  * @description An object that holds 3 {@link Two.Vector}s, the anchor point and its corresponding handles: `left` and `right`. In order to properly describe the bezier curve about the point there is also a command property to describe what type of drawing should occur when Two.js renders the anchors.
  */
 export class Anchor extends Vector {
-
   controls = {
     left: new Vector(),
-    right: new Vector()
+    right: new Vector(),
   };
   _command = Commands.move;
   _relative = true;
@@ -30,8 +30,15 @@ export class Anchor extends Vector {
   _largeArcFlag = 0;
   _sweepFlag = 1;
 
-  constructor(x = 0, y = 0, ax = 0, ay = 0, bx = 0, by = 0, command = Commands.move) {
-
+  constructor(
+    x = 0,
+    y = 0,
+    ax = 0,
+    ay = 0,
+    bx = 0,
+    by = 0,
+    command = Commands.move
+  ) {
     super(x, y);
 
     for (let prop in proto) {
@@ -43,11 +50,12 @@ export class Anchor extends Vector {
 
     const broadcast = Anchor.makeBroadcast(this);
 
-    this.controls.left.set(ax, ay)
+    this.controls.left
+      .set(ax, ay)
       .addEventListener(Events.Types.change, broadcast);
-    this.controls.right.set(bx, by)
+    this.controls.right
+      .set(bx, by)
       .addEventListener(Events.Types.change, broadcast);
-
   }
 
   static makeBroadcast(scope) {
@@ -59,14 +67,25 @@ export class Anchor extends Vector {
     }
   }
 
+  /**
+   * @name Two.Anchor.fromObject
+   * @function
+   * @param {Object} obj - Object notation of a {@link Two.Anchor} to create a new instance
+   * @returns {Two.Anchor}
+   * @description Create a new {@link Two.Anchor} from an object notation of a {@link Two.Anchor}.
+   * @nota-bene Works in conjunction with {@link Two.Anchor#toObject}
+   */
+  static fromObject(obj) {
+    return new Anchor().copy(obj);
+  }
+
   /**
    * @name Two.Anchor#copy
    * @function
    * @param {Two.Anchor} v - The anchor to apply values to.
    * @description Copy the properties of one {@link Two.Anchor} onto another.
    */
   copy(v) {
-
     this.x = v.x;
     this.y = v.y;
 
@@ -104,7 +123,6 @@ export class Anchor extends Vector {
     }
 
     return this;
-
   }
 
   /**
@@ -122,22 +140,23 @@ export class Anchor extends Vector {
    * @function
    * @returns {Object} - An object with properties filled out to mirror {@link Two.Anchor}.
    * @description Create a JSON compatible plain object of the current instance. Intended for use with storing values in a database.
+   * @nota-bene Works in conjunction with {@link Two.Anchor.fromObject}
    */
   toObject() {
     return {
-      x: this.x,
-      y: this.y,
+      x: toFixed(this.x),
+      y: toFixed(this.y),
       command: this.command,
       relative: this.relative,
       controls: {
         left: this.controls.left.toObject(),
-        right: this.controls.right.toObject()
+        right: this.controls.right.toObject(),
       },
-      rx: this.rx,
-      ry: this.ry,
-      xAxisRotation: this.xAxisRotation,
-      largeArcFlag: this.largeArcFlag,
-      sweepFlag: this.sweepFlag
+      rx: toFixed(this.rx),
+      ry: toFixed(this.ry),
+      xAxisRotation: toFixed(this.xAxisRotation),
+      largeArcFlag: toFixed(this.largeArcFlag),
+      sweepFlag: toFixed(this.sweepFlag),
     };
   }
 
@@ -150,105 +169,104 @@ export class Anchor extends Vector {
   toString() {
     return JSON.stringify(this.toObject());
   }
-
 }
 
 const proto = {
   command: {
     enumerable: true,
-    get: function() {
+    get: function () {
       return this._command;
     },
-    set: function(command) {
+    set: function (command) {
       if (this._command !== command) {
         this._command = command;
         if (this._bound) {
           this.dispatchEvent(Events.Types.change);
         }
       }
-    }
+    },
   },
   relative: {
     enumerable: true,
-    get: function() {
+    get: function () {
       return this._relative;
     },
-    set: function(relative) {
+    set: function (relative) {
       if (this._relative !== !!relative) {
         this._relative = !!relative;
         if (this._bound) {
           this.dispatchEvent(Events.Types.change);
         }
       }
-    }
+    },
   },
   rx: {
     enumerable: true,
-    get: function() {
+    get: function () {
       return this._rx;
     },
-    set: function(rx) {
+    set: function (rx) {
       if (this._rx !== rx) {
         this._rx = rx;
         if (this._bound) {
           this.dispatchEvent(Events.Types.change);
         }
       }
-    }
+    },
   },
   ry: {
     enumerable: true,
-    get: function() {
+    get: function () {
       return this._ry;
     },
-    set: function(ry) {
+    set: function (ry) {
       if (this._ry !== ry) {
         this._ry = ry;
         if (this._bound) {
           this.dispatchEvent(Events.Types.change);
         }
       }
-    }
+    },
   },
   xAxisRotation: {
     enumerable: true,
-    get: function() {
+    get: function () {
       return this._xAxisRotation;
     },
-    set: function(xAxisRotation) {
+    set: function (xAxisRotation) {
       if (this._xAxisRotation !== xAxisRotation) {
         this._xAxisRotation = xAxisRotation;
         if (this._bound) {
           this.dispatchEvent(Events.Types.change);
         }
       }
-    }
+    },
   },
   largeArcFlag: {
     enumerable: true,
-    get: function() {
+    get: function () {
       return this._largeArcFlag;
     },
-    set: function(largeArcFlag) {
+    set: function (largeArcFlag) {
       if (this._largeArcFlag !== largeArcFlag) {
         this._largeArcFlag = largeArcFlag;
         if (this._bound) {
           this.dispatchEvent(Events.Types.change);
         }
       }
-    }
+    },
   },
   sweepFlag: {
-    get: function() {
+    get: function () {
       return this._sweepFlag;
     },
-    set: function(sweepFlag) {
+    set: function (sweepFlag) {
       if (this._sweepFlag !== sweepFlag) {
         this._sweepFlag = sweepFlag;
         if (this._bound) {
           this.dispatchEvent(Events.Types.change);
         }
       }
-    }
-  }
+    },
+  },
 };