Quadratic Curve updates

* Quadratic Bezier Interpolation has been added to the Math.Interpolation functions
* A new Quadratic Bezier Curve class has been added, expanding the available Curve types
* Path.quadraticBezierTo allows you to add a Quadratic Bezier Curve into your Path.

Author: photonstorm

CHANGELOG.md

@@ -15,6 +15,9 @@
 * The SceneManager has a new method: `remove` which allows you to remove and destroy a Scene, freeing up the Scene key for use by future scenes and potentially clearing the Scene from active memory for gc.
 * SceneManager.moveAbove will move a Scene to be directly above another Scene in the Scenes list. This is also exposed in the ScenePlugin.
 * SceneManager.moveBelow will move a Scene to be directly below another Scene in the Scenes list. This is also exposed in the ScenePlugin.
+* Quadratic Bezier Interpolation has been added to the Math.Interpolation functions (thanks @RiCoTeRoX)
+* A new Quadratic Bezier Curve class has been added, expanding the available Curve types (thanks @RiCoTeRoX)
+* Path.quadraticBezierTo allows you to add a Quadratic Bezier Curve into your Path.
 
 ### Bug Fixes
 

src/curves/QuadraticBezier.js src/curves/QuadraticBezierCurve.jssrc/curves/QuadraticBezier.js renamed to src/curves/QuadraticBezierCurve.js

@@ -4,10 +4,9 @@
  * @license      {@link https://github.com/photonstorm/phaser/blob/master/license.txt|MIT License}
  */
 
-
 var Class = require('../utils/Class');
-var QuadraticBezierInter = require('../math/interpolation/QuadraticBezierInterpolation');
 var Curve = require('./Curve');
+var QuadraticBezierInterpolation = require('../math/interpolation/QuadraticBezierInterpolation');
 var Vector2 = require('../math/Vector2');
 
 /**
@@ -18,12 +17,11 @@ var Vector2 = require('../math/Vector2');
  * @extends Phaser.Curves.Curve
  * @memberOf Phaser.Curves
  * @constructor
- * @since 3.0.0
+ * @since 3.2.0
  *
  * @param {Phaser.Math.Vector2|Phaser.Math.Vector2[]} p0 - Start point, or an array of point pairs.
  * @param {Phaser.Math.Vector2} p1 - Control Point 1.
  * @param {Phaser.Math.Vector2} p2 - Control Point 2.
- * @param {Phaser.Math.Vector2} p3 - End Point.
  */
 var QuadraticBezier = new Class({
 
@@ -47,7 +45,7 @@ var QuadraticBezier = new Class({
          *
          * @name Phaser.Curves.QuadraticBezier#p0
          * @type {Phaser.Math.Vector2}
-         * @since 3.0.0
+         * @since 3.2.0
          */
         this.p0 = p0;
 
@@ -56,7 +54,7 @@ var QuadraticBezier = new Class({
          *
          * @name Phaser.Curves.QuadraticBezier#p1
          * @type {Phaser.Math.Vector2}
-         * @since 3.0.0
+         * @since 3.2.0
          */
         this.p1 = p1;
 
@@ -65,7 +63,7 @@ var QuadraticBezier = new Class({
          *
          * @name Phaser.Curves.QuadraticBezier#p2
          * @type {Phaser.Math.Vector2}
-         * @since 3.0.0
+         * @since 3.2.0
          */
         this.p2 = p2;
     },
@@ -74,7 +72,7 @@ var QuadraticBezier = new Class({
      * [description]
      *
      * @method Phaser.Curves.QuadraticBezier#getStartPoint
-     * @since 3.0.0
+     * @since 3.2.0
      *
      * @param {Phaser.Math.Vector2} out - [description]
      *
@@ -91,11 +89,11 @@ var QuadraticBezier = new Class({
      * [description]
      *
      * @method Phaser.Curves.QuadraticBezier#getResolution
-     * @since 3.0.0
+     * @since 3.2.0
      *
-     * @param {[type]} divisions - [description]
+     * @param {number} divisions - [description]
      *
-     * @return {[type]} [description]
+     * @return {number} [description]
      */
     getResolution: function (divisions)
     {
@@ -106,12 +104,12 @@ var QuadraticBezier = new Class({
      * [description]
      *
      * @method Phaser.Curves.QuadraticBezier#getPoint
-     * @since 3.0.0
+     * @since 3.2.0
      *
-     * @param {[type]} t - [description]
-     * @param {[type]} out - [description]
+     * @param {number} t - [description]
+     * @param {Phaser.Math.Vector2} [out] - [description]
      *
-     * @return {[type]} [description]
+     * @return {Phaser.Math.Vector2} [description]
      */
     getPoint: function (t, out)
     {
@@ -121,14 +119,17 @@ var QuadraticBezier = new Class({
         var p1 = this.p1;
         var p2 = this.p2;
 
-        return out.set(QuadraticBezierInter(t, p0.x, p1.x, p2.x), QuadraticBezierInter(t, p0.y, p1.y, p2.y));
+        return out.set(
+            QuadraticBezierInterpolation(t, p0.x, p1.x, p2.x),
+            QuadraticBezierInterpolation(t, p0.y, p1.y, p2.y)
+        );
     },
 
     /**
      * [description]
      *
      * @method Phaser.Curves.QuadraticBezier#draw
-     * @since 3.0.0
+     * @since 3.2.0
      *
      * @param {Phaser.GameObjects.Graphics} graphics - [description]
      * @param {integer} [pointsTotal=32] - [description]
@@ -159,7 +160,7 @@ var QuadraticBezier = new Class({
      * [description]
      *
      * @method Phaser.Curves.QuadraticBezier#toJSON
-     * @since 3.0.0
+     * @since 3.2.0
      *
      * @return {object} [description]
      */

src/curves/index.js

@@ -15,6 +15,6 @@ module.exports = {
     Curve: require('./Curve'),
     Ellipse: require('./EllipseCurve'),
     Line: require('./LineCurve'),
-    Spline: require('./SplineCurve'),
-    QuadraticBezier: require('./QuadraticBezier')
+    QuadraticBezier: require('./QuadraticBezierCurve'),
+    Spline: require('./SplineCurve')
 };

src/curves/path/Path.js

@@ -12,6 +12,7 @@ var EllipseCurve = require('../EllipseCurve');
 var GameObjectFactory = require('../../gameobjects/GameObjectFactory');
 var LineCurve = require('../LineCurve');
 var MovePathTo = require('./MoveTo');
+var QuadraticBezierCurve = require('../QuadraticBezierCurve');
 var Rectangle = require('../../geom/rectangle/Rectangle');
 var SplineCurve = require('../SplineCurve');
 var Vector2 = require('../../math/Vector2');
@@ -140,8 +141,8 @@ var Path = new Class({
      * @since 3.0.0
      *
      * @param {number} radius - [description]
-     * @param {boolean} [clockwise] - [description]
-     * @param {number} [rotation] - [description]
+     * @param {boolean} [clockwise=false] - [description]
+     * @param {number} [rotation=0] - [description]
      *
      * @return {Phaser.Curves.Path} [description]
      */
@@ -185,10 +186,10 @@ var Path = new Class({
      *
      * @param {number} x - [description]
      * @param {number} y - [description]
-     * @param {Phaser.Math.Vector2} control1X - {Phaser.Math[description]
-     * @param {Phaser.Math.Vector2} control1Y - {Phaser.Math[description]
-     * @param {Phaser.Math.Vector2} control2X - {Phaser.Math[description]
-     * @param {Phaser.Math.Vector2} control2Y - {Phaser.Math[description]
+     * @param {Phaser.Math.Vector2} control1X - [description]
+     * @param {Phaser.Math.Vector2} control1Y - [description]
+     * @param {Phaser.Math.Vector2} control2X - [description]
+     * @param {Phaser.Math.Vector2} control2Y - [description]
      *
      * @return {Phaser.Curves.Path} [description]
      */
@@ -216,17 +217,41 @@ var Path = new Class({
         return this.add(new CubicBezierCurve(p0, p1, p2, p3));
     },
 
+    //  Creates a quadratic bezier curve starting at the previous end point and ending at p2, using p1 as a control point
+
     /**
      * [description]
      *
-     * @method Phaser.Curves.Path#destroy
-     * @since 3.0.0
+     * @method Phaser.Curves.Path#quadraticBezierTo
+     * @since 3.2.0
+     *
+     * @param {number|Phaser.Math.Vector2[]} x - [description]
+     * @param {number} [y] - [description]
+     * @param {number} [controlX] - [description]
+     * @param {number} [controlY] - [description]
+     *
+     * @return {Phaser.Curves.Path} [description]
      */
-    destroy: function ()
+    quadraticBezierTo: function (x, y, controlX, controlY)
     {
-        this.curves.length = 0;
-        this.cacheLengths.length = 0;
-        this.startPoint = undefined;
+        var p0 = this.getEndPoint();
+        var p1;
+        var p2;
+
+        //  Assume they're all vec2s
+        if (x instanceof Vector2)
+        {
+            p1 = x;
+            p2 = y;
+            p3 = controlX;
+        }
+        else
+        {
+            p1 = new Vector2(controlX, controlY);
+            p2 = new Vector2(x, y);
+        }
+
+        return this.add(new QuadraticBezierCurve(p0, p1, p2));
     },
 
     /**
@@ -331,6 +356,10 @@ var Path = new Class({
                 case 'CubicBezierCurve':
                     this.add(CubicBezierCurve.fromJSON(curve));
                     break;
+
+                case 'QuadraticBezierCurve':
+                    this.add(QuadraticBezierCurve.fromJSON(curve));
+                    break;
             }
         }
 
@@ -425,9 +454,9 @@ var Path = new Class({
      * @method Phaser.Curves.Path#getEndPoint
      * @since 3.0.0
      *
-     * @param {Phaser.Math.Vector2} [out] - {Phaser.Math[description]
+     * @param {Phaser.Math.Vector2} [out] - [description]
      *
-     * @return {Phaser.Math.Vector2} {Phaser.Math[description]
+     * @return {Phaser.Math.Vector2} [description]
      */
     getEndPoint: function (out)
     {
@@ -476,7 +505,7 @@ var Path = new Class({
      * @since 3.0.0
      *
      * @param {number} t - [description]
-     * @param {Phaser.Math.Vector2} [out] - {Phaser.Math[description]
+     * @param {Phaser.Math.Vector2} [out] - [description]
      *
      * @return {Phaser.Math.Vector2|null} [description]
      */
@@ -568,9 +597,9 @@ var Path = new Class({
      * @method Phaser.Curves.Path#getRandomPoint
      * @since 3.0.0
      *
-     * @param {Phaser.Math.Vector2} [out] - {Phaser.Math[description]
+     * @param {Phaser.Math.Vector2} [out] - [description]
      *
-     * @return {Phaser.Math.Vector2} {Phaser.Math[description]
+     * @return {Phaser.Math.Vector2} [description]
      */
     getRandomPoint: function (out)
     {
@@ -614,9 +643,9 @@ var Path = new Class({
      * @method Phaser.Curves.Path#getStartPoint
      * @since 3.0.0
      *
-     * @param {Phaser.Math.Vector2} [out] - {Phaser.Math[description]
+     * @param {Phaser.Math.Vector2} [out] - [description]
      *
-     * @return {Phaser.Math.Vector2} {Phaser.Math[description]
+     * @return {Phaser.Math.Vector2} [description]
      */
     getStartPoint: function (out)
     {
@@ -633,7 +662,7 @@ var Path = new Class({
      * @method Phaser.Curves.Path#lineTo
      * @since 3.0.0
      *
-     * @param {number|Phaser.Math.Vector2} x - {Phaser.Math[description]
+     * @param {number|Phaser.Math.Vector2} x - [description]
      * @param {number} [y] - [description]
      *
      * @return {Phaser.Curves.Path} [description]
@@ -728,6 +757,19 @@ var Path = new Class({
         this.cacheLengths = [];
 
         this.getCurveLengths();
+    },
+
+    /**
+     * [description]
+     *
+     * @method Phaser.Curves.Path#destroy
+     * @since 3.0.0
+     */
+    destroy: function ()
+    {
+        this.curves.length = 0;
+        this.cacheLengths.length = 0;
+        this.startPoint = undefined;
     }
 
 });

src/math/interpolation/QuadraticBezierInterpolation.js

@@ -31,7 +31,7 @@ function P2 (t, p)
  * [description]
  *
  * @function Phaser.Math.Interpolation.QuadraticBezier
- * @since 3.0.0
+ * @since 3.2.0
  *
  * @param {float} t - [description]
  * @param {number} p0 - [description]