@galacean/effects-threejs 1.6.0 → 1.6.2-beta.0

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v1.6.0
+ * Version: v1.6.2-beta.0
  */
 
 'use strict';
@@ -20306,13 +20306,21 @@ var TextLayout = /** @class */ (function () {
         this.textAlign = textAlign;
         this.lineHeight = lineHeight;
     }
-    TextLayout.prototype.getOffsetY = function (style, lineCount, lineHeight) {
+    /**
+     * 获取初始的行高偏移值
+     * @param style - 字体基础数据
+     * @param lineCount - 渲染行数
+     * @param lineHeight - 渲染时的字体行高
+     * @param fontSize - 渲染时的字体大小
+     * @returns - 行高偏移值
+     */
+    TextLayout.prototype.getOffsetY = function (style, lineCount, lineHeight, fontSize) {
         var offsetResult = 0;
-        var fontSize = style.fontSize, outlineWidth = style.outlineWidth, fontScale = style.fontScale;
-        // 计算基础偏移量
-        var baseOffset = (fontSize + outlineWidth) * fontScale;
+        var outlineWidth = style.outlineWidth, fontScale = style.fontScale;
         // /3 计算Y轴偏移量，以匹配编辑器行为
         var offsetY = (lineHeight - fontSize) / 3;
+        // 计算基础偏移量
+        var baseOffset = fontSize + outlineWidth * fontScale;
         var commonCalculation = lineHeight * (lineCount - 1);
         switch (this.textBaseline) {
             case TextBaseline$1.top:
@@ -20370,7 +20378,7 @@ var TextItem = /** @class */ (function (_super) {
         _this.engine = vfxItem.composition.getEngine();
         _this.textStyle = new TextStyle(options);
         _this.textLayout = new TextLayout(options);
-        _this.text = options.text;
+        _this.text = options.text.toString();
         _this.lineCount = _this.getLineCount(options.text, true);
         // Text
         _this.mesh = new TextMesh(_this.engine, _this.renderInfo, vfxItem.composition);
@@ -20447,7 +20455,7 @@ var TextItem = /** @class */ (function (_super) {
         if (this.text === value) {
             return;
         }
-        this.text = value;
+        this.text = value.toString();
         this.lineCount = this.getLineCount(value, false);
         this.isDirty = true;
     };
@@ -20599,7 +20607,7 @@ var TextItem = /** @class */ (function (_super) {
         var fontScale = style.fontScale;
         var width = (layout.width + style.fontOffset) * fontScale;
         var height = layout.height * fontScale;
-        style.fontSize * fontScale;
+        var fontSize = style.fontSize * fontScale;
         var lineHeight = layout.lineHeight * fontScale;
         this.char = (this.text || '').split('');
         this.canvas.width = width;
@@ -20620,7 +20628,7 @@ var TextItem = /** @class */ (function (_super) {
         context.fillStyle = "rgba(".concat(style.textColor[0], ", ").concat(style.textColor[1], ", ").concat(style.textColor[2], ", ").concat(style.textColor[3], ")");
         var charsInfo = [];
         var x = 0;
-        var y = layout.getOffsetY(style, this.lineCount, lineHeight);
+        var y = layout.getOffsetY(style, this.lineCount, lineHeight, fontSize);
         var charsArray = [];
         var charOffsetX = [];
         for (var i = 0; i < this.char.length; i++) {
@@ -21790,11 +21798,13 @@ var Camera = /** @class */ (function () {
      * @param z - 当前的位置 z
      */
     Camera.prototype.getInverseVPRatio = function (z) {
-        var pos = new Vector3(0, 0, z);
+        var pos = new Vector3(this.position.x, this.position.y, z);
         var mat = this.getViewProjectionMatrix();
         var inverseVP = this.getInverseViewProjectionMatrix();
         var nz = mat.projectPoint(pos).z;
-        return inverseVP.projectPoint(new Vector3(1, 1, nz));
+        var _a = inverseVP.projectPoint(new Vector3(1, 1, nz)), xMax = _a.x, yMax = _a.y;
+        var _b = inverseVP.projectPoint(new Vector3(-1, -1, nz)), xMin = _b.x, yMin = _b.y;
+        return new Vector3((xMax - xMin) / 2, (yMax - yMin) / 2, 0);
     };
     /**
      * 设置相机的旋转四元数
@@ -27510,7 +27520,7 @@ Geometry.create = function (engine, options) {
 Mesh.create = function (engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "1.6.0";
+var version = "1.6.2-beta.0";
 logger.info('THREEJS plugin version: ' + version);
 
 exports.AbstractPlugin = AbstractPlugin;