text font fixes
diff --git a/player/index.html b/player/index.html
index 26360a0..0143f8b 100644
--- a/player/index.html
+++ b/player/index.html
@@ -92,12 +92,12 @@
var count = 0;
var animData = {
container: document.getElementById('bodymovin'),
- renderer: 'svg',
+ renderer: 'html',
loop: false,
prerender: false,
autoplay: true,
- //path: 'exports/render/data.json'
- path: 'exports/render/data_glyphs.json'
+ path: 'exports/render/data.json'
+ //path: 'exports/render/data_glyphs.json'
};
var anim;
diff --git a/player/js/elements/svgElements/SVGTextElement.js b/player/js/elements/svgElements/SVGTextElement.js
index 34925ce..1f39e9c 100644
--- a/player/js/elements/svgElements/SVGTextElement.js
+++ b/player/js/elements/svgElements/SVGTextElement.js
@@ -27,7 +27,6 @@
this.innerElem.setAttribute('font-size', documentData.s);
var fontData = this.globalData.fontManager.getFontByName(documentData.f);
if(fontData.fClass){
- console.log(this.innerElem);
this.innerElem.setAttribute('class',fontData.fClass);
} else {
this.innerElem.setAttribute('font-family', fontData.fFamily);
@@ -70,6 +69,24 @@
yPos += firstLine ? 1 : 0;
firstLine = false;
}
+ matrixHelper.reset();
+ if(this.globalData.fontManager.chars) {
+ matrixHelper.scale(documentData.s / 100, documentData.s / 100);
+ }
+ if (singleShape) {
+ if(documentData.ps){
+ matrixHelper.translate(documentData.ps[0],documentData.ps[1] + documentData.ascent,0);
+ }
+ switch(documentData.j){
+ case 1:
+ matrixHelper.translate(documentData.justifyOffset + (boxWidth - lineWidths[letters[i].line]),0,0);
+ break;
+ case 2:
+ matrixHelper.translate(documentData.justifyOffset + (boxWidth - lineWidths[letters[i].line])/2,0,0);
+ break;
+ }
+ matrixHelper.translate(xPos, yPos, 0);
+ }
if(this.globalData.fontManager.chars){
var charData = this.globalData.fontManager.getCharData(documentData.t.charAt(i), fontData.fStyle, this.globalData.fontManager.getFontByName(documentData.f).fFamily);
var shapeData;
@@ -78,25 +95,10 @@
} else {
shapeData = null;
}
- matrixHelper.reset();
if(shapeData && shapeData.shapes){
shapes = shapeData.shapes[0].it;
- matrixHelper.scale(documentData.s/100,documentData.s/100);
if(!singleShape){
shapeStr = '';
- }else{
- if(documentData.ps){
- matrixHelper.translate(documentData.ps[0],documentData.ps[1] + documentData.ascent,0);
- }
- switch(documentData.j){
- case 1:
- matrixHelper.translate(documentData.justifyOffset + (boxWidth - lineWidths[letters[i].line]),0,0);
- break;
- case 2:
- matrixHelper.translate(documentData.justifyOffset + (boxWidth - lineWidths[letters[i].line])/2,0,0);
- break;
- }
- matrixHelper.translate(xPos,yPos,0);
}
shapeStr += this.createPathShape(matrixHelper,shapes);
if(!singleShape){
@@ -112,7 +114,7 @@
tSpan.setAttributeNS("http://www.w3.org/XML/1998/namespace", "xml:space","preserve");
this.innerElem.appendChild(tSpan);
if(singleShape){
- //tSpan.setAttribute('transform','translate('+xPos+','+yPos+')');
+ tSpan.setAttribute('transform',matrixHelper.to2dCSS());
}
}
if(singleShape) {
diff --git a/player/js/renderers/HybridRenderer.js b/player/js/renderers/HybridRenderer.js
index 54b9f67..8d8bcab 100644
--- a/player/js/renderers/HybridRenderer.js
+++ b/player/js/renderers/HybridRenderer.js
@@ -196,8 +196,8 @@
resizerElem.style.overflow = 'hidden';
var svg = document.createElementNS(svgNS,'svg');
- svg.setAttribute('width','300');
- svg.setAttribute('height','300');
+ svg.setAttribute('width','1');
+ svg.setAttribute('height','1');
styleDiv(svg);
this.animationItem.resizerElem.appendChild(svg);
var defs = document.createElementNS(svgNS,'defs');
diff --git a/player/js/utils/DataManager.js b/player/js/utils/DataManager.js
index 3c166a8..b4c7088 100644
--- a/player/js/utils/DataManager.js
+++ b/player/js/utils/DataManager.js
@@ -153,7 +153,6 @@
}else{
tCanvasHelper.font = documentData.s + 'px '+ fontData.fFamily;
cLength = tCanvasHelper.measureText(documentData.t.charAt(i)).width;
- console.log(cLength);
}
if(lineWidth + cLength > boxWidth){
i = lastSpaceIndex;
