fixes #1179 Duik new version support with new expressions
diff --git a/player/index.html b/player/index.html
index a94028b..8b0b4eb 100644
--- a/player/index.html
+++ b/player/index.html
@@ -194,7 +194,7 @@
container: elem,
renderer: 'svg',
loop: false,
- autoplay: false,
+ autoplay: true,
rendererSettings: {
progressiveLoad:false,
imagePreserveAspectRatio: 'xMidYMid meet'
@@ -203,9 +203,6 @@
};
anim = lottie.loadAnimation(animData);
anim.setSubframe(false);
- anim.addEventListener('DOMLoaded', function(){
- anim.goToAndStop(10, true);
- })
</script>
</body>
diff --git a/player/js/elements/canvasElements/CVShapeElement.js b/player/js/elements/canvasElements/CVShapeElement.js
index 299481d..91cb8d1 100644
--- a/player/js/elements/canvasElements/CVShapeElement.js
+++ b/player/js/elements/canvasElements/CVShapeElement.js
@@ -25,7 +25,8 @@
var styleElem = {
data: data,
type: data.ty,
- elements: []
+ elements: [],
+ closed: data.hd === true
};
var elementData = {};
if(data.ty == 'fl' || data.ty == 'st'){
@@ -318,7 +319,7 @@
};
CVShapeElement.prototype.renderPath = function(pathData,itemData,groupTransform){
var len, i, j,jLen;
- var redraw = groupTransform._matMdf || itemData.sh._mdf || this._isFirstFrame;
+ var redraw = pathData.hd !== true && (groupTransform._matMdf || itemData.sh._mdf || this._isFirstFrame);
if(redraw) {
var paths = itemData.sh.paths, groupTransformMat = groupTransform.mat;
jLen = pathData._render === false ? 0 : paths._length;
diff --git a/player/js/elements/helpers/shapes/SVGElementsRenderer.js b/player/js/elements/helpers/shapes/SVGElementsRenderer.js
index 3f2f1b1..0c7ea2a 100644
--- a/player/js/elements/helpers/shapes/SVGElementsRenderer.js
+++ b/player/js/elements/helpers/shapes/SVGElementsRenderer.js
@@ -78,7 +78,7 @@
} else {
pathStringTransformed = itemData.caches[l];
}
- itemData.styles[l].d += pathStringTransformed;
+ itemData.styles[l].d += styleData.hd === true ? '' : pathStringTransformed;
itemData.styles[l]._mdf = redraw || itemData.styles[l]._mdf;
}
}
diff --git a/player/js/elements/helpers/shapes/SVGStyleData.js b/player/js/elements/helpers/shapes/SVGStyleData.js
index 63b9761..e69a647 100644
--- a/player/js/elements/helpers/shapes/SVGStyleData.js
+++ b/player/js/elements/helpers/shapes/SVGStyleData.js
@@ -4,7 +4,7 @@
this.d = '';
this.lvl = level;
this._mdf = false;
- this.closed = false;
+ this.closed = data.hd === true;
this.pElem = createNS('path');
this.msElem = null;
}
diff --git a/player/js/elements/svgElements/SVGShapeElement.js b/player/js/elements/svgElements/SVGShapeElement.js
index 57eadb4..a58728e 100644
--- a/player/js/elements/svgElements/SVGShapeElement.js
+++ b/player/js/elements/svgElements/SVGShapeElement.js
@@ -292,7 +292,7 @@
var animatedContent;
for(i = 0; i < len; i += 1) {
animatedContent = this.animatedContents[i];
- if(this._isFirstFrame || animatedContent.element._isAnimated) {
+ if((this._isFirstFrame || animatedContent.element._isAnimated) && animatedContent.data !== true) {
animatedContent.fn(animatedContent.data, animatedContent.element, this._isFirstFrame);
}
}
diff --git a/player/js/utils/expressions/CompInterface.js b/player/js/utils/expressions/CompInterface.js
index 73dc835..f328ccc 100644
--- a/player/js/utils/expressions/CompInterface.js
+++ b/player/js/utils/expressions/CompInterface.js
@@ -8,7 +8,8 @@
}
i += 1;
}
- return {active:false};
+ return null;
+ //return {active:false};
}
Object.defineProperty(_thisLayerFunction, "_name", { value:comp.data.nm });
_thisLayerFunction.layer = _thisLayerFunction;
diff --git a/player/js/utils/expressions/ExpressionManager.js b/player/js/utils/expressions/ExpressionManager.js
index 18560e8..8edafd3 100644
--- a/player/js/utils/expressions/ExpressionManager.js
+++ b/player/js/utils/expressions/ExpressionManager.js
@@ -322,8 +322,8 @@
path.setPathData(!!closed, len);
var arrPlaceholder = [0,0], inVertexPoint, outVertexPoint;
for(i = 0; i < len; i += 1) {
- inVertexPoint = inTangents ? inTangents[i] : arrPlaceholder;
- outVertexPoint = outTangents ? outTangents[i] : arrPlaceholder;
+ inVertexPoint = (inTangents && inTangents[i]) ? inTangents[i] : arrPlaceholder;
+ outVertexPoint = (outTangents && outTangents[i]) ? outTangents[i] : arrPlaceholder;
path.setTripleAt(points[i][0],points[i][1],outVertexPoint[0] + points[i][0],outVertexPoint[1] + points[i][1],inVertexPoint[0] + points[i][0],inVertexPoint[1] + points[i][1],i,true);
}
return path;
@@ -356,6 +356,8 @@
var expression_function = eval('[function _expression_function(){' + val+';scoped_bm_rt=$bm_rt}' + ']')[0];
var numKeys = property.kf ? data.k.length : 0;
+ var active = !this.data || this.data.hd !== true;
+
var wiggle = function wiggle(freq,amp){
var i,j, len = this.pv.length ? this.pv.length : 1;
var addedAmps = createTypedArray('float32', len);
