commit d1b4c10dd4a067dcd1c03dbbf018aaf8109551ff
author hernan <hernantorrisi@gmail.com> Wed Apr 12 05:00:51 2017 -0300
committer hernan <hernantorrisi@gmail.com> Wed Apr 12 05:00:51 2017 -0300
tree e7e439d61d45a838565be946742aeb9f50b10b92
parent a5037e3ccc8c1ac5a98168c42117734d1b467f32

velocityAtTime fix

player/index.html

diff --git a/player/index.html b/player/index.html
index e62da68..2116e64 100644
--- a/player/index.html
+++ b/player/index.html
@@ -125,7 +125,7 @@
         rendererSettings: {
             progressiveLoad:false
         },
-        path: 'exports/render/data.json'
+        path: 'exports/render/data3.json'
     };
     anim = bodymovin.loadAnimation(animData);
 

player/js/utils/expressions/ExpressionManager.js

diff --git a/player/js/utils/expressions/ExpressionManager.js b/player/js/utils/expressions/ExpressionManager.js
index 77b66ff..625b74e 100644
--- a/player/js/utils/expressions/ExpressionManager.js
+++ b/player/js/utils/expressions/ExpressionManager.js
@@ -309,7 +309,7 @@
 
     function initiateExpression(elem,data,property){
         var val = data.x;
-        var needsVelocity = val.indexOf('velocity') !== -1;
+        var needsVelocity = /velocity(?![\w\d])/.test(val);
         var _needsRandom = val.indexOf('random') !== -1;
         var elemType = elem.data.ty;
         var transform,content,effect;

player/js/utils/expressions/ExpressionPropertyDecorator.js

diff --git a/player/js/utils/expressions/ExpressionPropertyDecorator.js b/player/js/utils/expressions/ExpressionPropertyDecorator.js
index 2627f3c..b8c75bd 100644
--- a/player/js/utils/expressions/ExpressionPropertyDecorator.js
+++ b/player/js/utils/expressions/ExpressionPropertyDecorator.js
@@ -168,7 +168,10 @@
             velocity = Array.apply(null,{length:v1.length});
             var i;
             for(i=0;i<v1.length;i+=1){
-                velocity[i] = this.elem.globalData.frameRate*((v2[i] - v1[i])/delta);
+                //removing frameRate
+                //if needed, don't add it here
+                //velocity[i] = this.elem.globalData.frameRate*((v2[i] - v1[i])/delta);
+                velocity[i] = (v2[i] - v1[i])/delta;
             }
         } else {
             velocity = (v2 - v1)/delta;