1 files changed, 105 insertions, 58 deletions

diff --git a/node_modules/montage/ui/flow-bezier-spline.js b/node_modules/montage/ui/flow-bezier-spline.js
index 5f2a9e76..3475be8b 100755
--- a/node_modules/montage/ui/flow-bezier-spline.js
+++ b/node_modules/montage/ui/flow-bezier-spline.js
@@ -1,6 +1,14 @@
 var Montage = require("montage").Montage,

     FlowBezierSpline = exports.FlowBezierSpline = Montage.create(Montage, {

 

+    init: {

+        value: function() {

+            this._densities = [];

+            this._densitySummation = [];

+            return this;

+        }

+    },

+

     knots: {

         get: function () {

             if (!this._knots) {

@@ -37,17 +45,20 @@ var Montage = require("montage").Montage,
         }

     },

 

+    _densities: {

+        enumerable: false,

+        value: null

+    },

+

     densities: {

         get: function () {

-            if (!this._densities) {

-                this._densities = [];

-            }

             return this._densities;

         },

         set: function (value) {

             this._densities = value;

             this._densitiesLength = this._densities.length;

-            this._densitySummation = null;

+            this._densitySummation.wipe();

+            this._maxTime = null;

         }

     },

 

@@ -75,7 +86,7 @@ var Montage = require("montage").Montage,
     parameters: {

         get: function () {

             if (!this._parameters) {

-                this._parameters = [];

+                this._parameters = {};

             }

             return this._parameters;

         },

@@ -122,9 +133,14 @@ var Montage = require("montage").Montage,
         }

     },

 

+    _maxTime: {

+        enumerable: false,

+        value: null

+    },

+

     maxTime: {

         get: function () {

-            if (!this._densitySummation) {

+            if ((this._densitySummation === null) || this._densitySummation.length) {

                 this._computeDensitySummation();

             }

             return this._densitySummation[this._densitySummation.length - 1];

@@ -132,41 +148,55 @@ var Montage = require("montage").Montage,
         set: function () {}

     },

 

+    _densitySummation: {

+        enumerable: false,

+        value: null

+    },

+

     _computeDensitySummation: {

         enumerable: false,

         value: function () {

-            var length = this.densities.length - 1,

+            var densities = this.densities, length = densities.length - 1,

                 sum = 0,

-                i;

+                i,

+                densitySummation = this._densitySummation;

 

-            this._densitySummation = [];

+            densitySummation.wipe();

             for (i = 0; i < length; i++) {

-                sum += (this._densities[i] + this._densities[i + 1]) / 2;

-                this._densitySummation[i] = sum;

+                sum += (densities[i] + densities[i + 1]) / 2;

+                densitySummation[i] = sum;

             }

         }

     },

 

     getPositionAtTime: {

-        value: function (time) {

+        value: function (time, position, parameters) {

             var p0, p1, p2, p3,

                 a, b, c,

                 t, y,

                 start,

-                parameters = {},

-                i, j;

+                _parameters = this._parameters,

+                i, j,

+                parameterKeys,

+                parameterKeyCount,

+                jParameter,

+                jParameterData,

+                densitySummation = this._densitySummation;

+

+            position.length = 0;

+            parameters.wipe();

 

             if ((time >= 0) && (time < this.maxTime)) {

-                if (this._previousIndex && (time >= this._densitySummation[this._previousIndex - 1])) {

+                if (this._previousIndex && (time >= densitySummation[this._previousIndex - 1])) {

                     i = this._previousIndex;

                 } else {

                     i = 0;

                 }

-                while (time >= this._densitySummation[i]) {

+                while (time >= densitySummation[i]) {

                     i++;

                 }

                 this._previousIndex = i;

-                start = i ? this._densitySummation[i - 1] : 0;

+                start = i ? densitySummation[i - 1] : 0;

                 p0 = this._knots[i],

                 p1 = this._nextHandlers[i],

                 p2 = this._previousHandlers[i + 1],

@@ -181,24 +211,29 @@ var Montage = require("montage").Montage,
                 }

                 y = 1 - t;

                 // TODO: Redo this and create getParametersAtTime or getPositionAndParametersAtTime

-                for (j in this._parameters) {

-                    if (this._parameters.hasOwnProperty(j)) {

-                        if ((typeof this._parameters[j].data[i] !== "undefined") && (typeof this._parameters[j].data[i + 1] !== "undefined")) {

-                            parameters[j] = (this._parameters[j].data[i] * y + this._parameters[j].data[i + 1] * t) + this._parameters[j].units;

-                        } else {                        

-                            parameters[j] = this._parameters[j].data[this._parameters[j].data.length - 1] + this._parameters[j].units;

-                        }

+

+                parameterKeys = Object.keys(_parameters);

+                parameterKeyCount = parameterKeys.length;

+

+                for (j = 0; j < parameterKeyCount; j++) {

+                    jParameter = _parameters[parameterKeys[j]];

+                    jParameterData = jParameter.data;

+                    if ((typeof jParameterData[i] !== "undefined") && (typeof jParameterData[i + 1] !== "undefined")) {

+                        parameters[parameterKeys[j]] = (jParameterData[i] * y + jParameterData[i + 1] * t).toFixed(5) + jParameter.units;

+                    } else {

+                        parameters[parameterKeys[j]] = jParameterData[jParameterData.length - 1].toFixed(5) + jParameter.units;

                     }

+

                 }

-                return [

-                    p0[0]*(y*y*y)+p1[0]*(y*y*t*3)+p2[0]*(y*t*t*3)+p3[0]*(t*t*t),

-                    p0[1]*(y*y*y)+p1[1]*(y*y*t*3)+p2[1]*(y*t*t*3)+p3[1]*(t*t*t),

-                    p0[2]*(y*y*y)+p1[2]*(y*y*t*3)+p2[2]*(y*t*t*3)+p3[2]*(t*t*t),

-                    parameters

-                ];

-            } else {

-                return null;

+

+                position.push(p0[0]*(y*y*y)+p1[0]*(y*y*t*3)+p2[0]*(y*t*t*3)+p3[0]*(t*t*t));

+                position.push(p0[1]*(y*y*y)+p1[1]*(y*y*t*3)+p2[1]*(y*t*t*3)+p3[1]*(t*t*t));

+                position.push(p0[2]*(y*y*y)+p1[2]*(y*y*t*3)+p2[2]*(y*t*t*3)+p3[2]*(t*t*t));

+                position.push(parameters);

+

             }

+

+            return position;

         }

     },

 

@@ -223,9 +258,10 @@ var Montage = require("montage").Montage,
 

     transform: {

         value: function (matrix) {

-            var spline = Montage.create(FlowBezierSpline);

+            var spline = Montage.create(FlowBezierSpline).init();

 

             spline._densities = this._densities;

+            spline._densitySummation = this._densitySummation;

             spline._knots = this.transformVectorArray(this.knots, matrix);

             spline._previousHandlers = this.transformVectorArray(this.previousHandlers, matrix);

             spline._nextHandlers = this.transformVectorArray(this.nextHandlers, matrix);

@@ -267,7 +303,7 @@ var Montage = require("montage").Montage,
     cubicRealRoots: {

         enumerable: false,