@galacean/effects-threejs 2.3.0-beta.1 → 2.3.0-beta.3

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects runtime threejs plugin for the web
  * Author: Ant Group CO., Ltd.
  * Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
- * Version: v2.3.0-beta.1
+ * Version: v2.3.0-beta.3
  */
 
 'use strict';
@@ -16854,7 +16854,10 @@ exports.CameraController = /*#__PURE__*/ function(Behaviour) {
             camera.far = this.options.far;
             camera.fov = this.options.fov;
             camera.clipMode = this.options.clipMode;
-            camera.setTransform(this.transform);
+            camera.transform.parentTransform = this.transform.parentTransform;
+            camera.position = this.transform.position;
+            // TODO 修正 GE 四元数旋转共轭问题
+            camera.setQuat(this.transform.getQuaternion().clone().conjugate());
         }
     };
     _proto.fromData = function fromData(data) {
@@ -25540,9 +25543,12 @@ var TextComponentBase = /*#__PURE__*/ function() {
         this.textStyle = new TextStyle(options);
         this.textLayout = new TextLayout(options);
         this.text = options.text.toString();
+        this.lineCount = this.getLineCount(options.text, true);
     };
-    _proto.getLineCount = function getLineCount(text, context) {
+    _proto.getLineCount = function getLineCount(text, init) {
+        var context = this.context;
         var _this_textLayout = this.textLayout, letterSpace = _this_textLayout.letterSpace, overflow = _this_textLayout.overflow;
+        var fontScale = init ? this.textStyle.fontSize / 10 : 1 / this.textStyle.fontScale;
         var width = this.textLayout.width + this.textStyle.fontOffset;
         var lineCount = 1;
         var x = 0;
@@ -25550,7 +25556,7 @@ var TextComponentBase = /*#__PURE__*/ function() {
             var _context_measureText;
             var str = text[i];
             var _context_measureText_width;
-            var textMetrics = (_context_measureText_width = context == null ? void 0 : (_context_measureText = context.measureText(str)) == null ? void 0 : _context_measureText.width) != null ? _context_measureText_width : 0;
+            var textMetrics = ((_context_measureText_width = context == null ? void 0 : (_context_measureText = context.measureText(str)) == null ? void 0 : _context_measureText.width) != null ? _context_measureText_width : 0) * fontScale;
             // 和浏览器行为保持一致
             x += letterSpace;
             // 处理文本结束行为
@@ -25620,6 +25626,7 @@ var TextComponentBase = /*#__PURE__*/ function() {
             return;
         }
         this.text = value.toString();
+        this.lineCount = this.getLineCount(value, false);
         this.isDirty = true;
     };
     /**
@@ -25780,35 +25787,32 @@ var TextComponentBase = /*#__PURE__*/ function() {
         var layout = this.textLayout;
         var fontScale = style.fontScale;
         var width = (layout.width + style.fontOffset) * fontScale;
+        var finalHeight = layout.lineHeight * this.lineCount;
         var fontSize = style.fontSize * fontScale;
         var lineHeight = layout.lineHeight * fontScale;
         style.fontDesc = this.getFontDesc(fontSize);
         this.char = (this.text || "").split("");
         this.canvas.width = width;
-        var height = this.canvas.height;
-        context.font = style.fontDesc;
-        this.lineCount = this.getLineCount(this.text, context);
-        var finalHeight = layout.lineHeight * this.lineCount;
         if (layout.autoWidth) {
             this.canvas.height = finalHeight * fontScale;
             this.item.transform.size.set(1, finalHeight / layout.height);
         } else {
             this.canvas.height = layout.height * fontScale;
         }
+        var height = this.canvas.height;
+        // fix bug 1/255
+        context.fillStyle = "rgba(255, 255, 255, 0.0039)";
+        if (!flipY) {
+            context.translate(0, height);
+            context.scale(1, -1);
+        }
         // canvas size 变化后重新刷新 context
         if (this.maxLineWidth > width && layout.overflow === TextOverflow.display) {
             context.font = this.getFontDesc(fontSize * width / this.maxLineWidth);
         } else {
             context.font = style.fontDesc;
         }
-        // fix bug 1/255
-        context.fillStyle = "rgba(255, 255, 255, 0.0039)";
         context.clearRect(0, 0, width, height);
-        if (!flipY) {
-            context.translate(0, height);
-            context.scale(1, -1);
-        }
-        context.fillRect(0, 0, width, height);
         if (style.hasShadow) {
             this.setupShadow();
         }
@@ -25880,9 +25884,9 @@ var TextComponentBase = /*#__PURE__*/ function() {
         this.material.setTexture("_MainTex", texture);
         this.isDirty = false;
     };
-    _proto.getFontDesc = function getFontDesc(fontSize) {
-        var _this_textStyle = this.textStyle, fontFamily = _this_textStyle.fontFamily, textWeight = _this_textStyle.textWeight, fontStyle = _this_textStyle.fontStyle;
-        var fontDesc = "" + fontSize.toString() + "px ";
+    _proto.getFontDesc = function getFontDesc(size) {
+        var _this_textStyle = this.textStyle, fontSize = _this_textStyle.fontSize, fontScale = _this_textStyle.fontScale, fontFamily = _this_textStyle.fontFamily, textWeight = _this_textStyle.textWeight, fontStyle = _this_textStyle.fontStyle;
+        var fontDesc = "" + (size || fontSize * fontScale).toString() + "px ";
         if (!DEFAULT_FONTS.includes(fontFamily)) {
             fontDesc += '"' + fontFamily + '"';
         } else {
@@ -28817,12 +28821,14 @@ var tmpScale = new Vector3(1, 1, 1);
     function Camera(name, options) {
         if (options === void 0) options = {};
         this.name = name;
+        this./**
+   * @internal
+   */ transform = new Transform();
         this.viewportMatrix = Matrix4.fromIdentity();
         this.viewMatrix = Matrix4.fromIdentity();
         this.projectionMatrix = Matrix4.fromIdentity();
         this.viewProjectionMatrix = Matrix4.fromIdentity();
         this.inverseViewMatrix = Matrix4.fromIdentity();
-        this.transform = new Transform();
         this.dirty = true;
         var _options_near = options.near, near = _options_near === void 0 ? 0.1 : _options_near, _options_far = options.far, far = _options_far === void 0 ? 20 : _options_far, _options_fov = options.fov, fov = _options_fov === void 0 ? 60 : _options_fov, _options_aspect = options.aspect, aspect = _options_aspect === void 0 ? 1 : _options_aspect, _options_clipMode = options.clipMode, clipMode = _options_clipMode === void 0 ? CameraClipMode.portrait : _options_clipMode, _options_position = options.position, position = _options_position === void 0 ? [
             0,
@@ -28936,7 +28942,10 @@ var tmpScale = new Vector3(1, 1, 1);
    * 设置相机的旋转四元数
    * @param value - 旋转四元数
    */ _proto.setQuat = function setQuat(value) {
-        this.transform.setQuaternion(value.x, value.y, value.z, value.w);
+        if (!this.transform.getQuaternion().equals(value)) {
+            this.transform.setQuaternion(value.x, value.y, value.z, value.w);
+            this.dirty = true;
+        }
     };
     /**
    * 获取相机旋转对应的四元数
@@ -28974,7 +28983,7 @@ var tmpScale = new Vector3(1, 1, 1);
             var _this_options = this.options, fov = _this_options.fov, aspect = _this_options.aspect, near = _this_options.near, far = _this_options.far, clipMode = _this_options.clipMode;
             this.projectionMatrix.perspective(fov * DEG2RAD, aspect, near, far, clipMode === CameraClipMode.portrait);
             this.projectionMatrix.premultiply(this.viewportMatrix);
-            this.inverseViewMatrix.compose(this.position, this.getQuat().conjugate(), tmpScale);
+            this.inverseViewMatrix.compose(this.position, this.getQuat(), tmpScale);
             var _this_transform_getParentMatrix;
             this.inverseViewMatrix.premultiply((_this_transform_getParentMatrix = this.transform.getParentMatrix()) != null ? _this_transform_getParentMatrix : Matrix4.IDENTITY);
             this.viewMatrix.copyFrom(this.inverseViewMatrix).invert();
@@ -32092,7 +32101,7 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem);
 registerPlugin("particle", ParticleLoader, exports.VFXItem);
 registerPlugin("cal", CalculateLoader, exports.VFXItem);
 registerPlugin("interact", InteractLoader, exports.VFXItem);
-var version$1 = "2.3.0-beta.1";
+var version$1 = "2.3.0-beta.3";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -33738,7 +33747,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.3.0-beta.1";
+var version = "2.3.0-beta.3";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;