@galacean/effects-threejs 1.1.0-alpha.1 → 1.1.0-alpha.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: v1.1.0-alpha.1
+ * Version: v1.1.0-alpha.3
  */
 
 'use strict';
@@ -14416,6 +14416,7 @@ var Transform = /** @class */ (function () {
      */
     Transform.prototype.rotateByQuat = function (quat) {
         this.quat.multiply(quat);
+        this.rotation.setFromQuaternion(this.quat);
         this.dirtyFlags.localData = true;
         this.dispatchValueChange();
     };
@@ -14914,6 +14915,7 @@ var VFXItem = /** @class */ (function () {
                 this.delaying = false;
                 this.transform.setValid(true);
                 this.createContent();
+                this._contentVisible = true;
                 this.onLifetimeBegin(this.composition, this.content);
                 this.composition.itemLifetimeEvent(this, true);
             }
@@ -14954,7 +14956,7 @@ var VFXItem = /** @class */ (function () {
                             }
                         }
                         else if (this.endBehavior === END_BEHAVIOR_DESTROY$1) {
-                            this.setVisible(false);
+                            this._contentVisible = false;
                         }
                         lifetime = Math.min(lifetime, 1);
                     }
@@ -15178,6 +15180,7 @@ var VFXItem = /** @class */ (function () {
         if (this.composition) {
             this.onItemRemoved(this.composition, this._content);
             this._content = undefined;
+            this._contentVisible = false;
         }
         this.started = false;
     };
@@ -15308,7 +15311,7 @@ var PluginSystem = /** @class */ (function () {
             .map(function (name) {
             var CTRL = pluginLoaderMap[name];
             if (!CTRL) {
-                throw new Error("plugin '".concat(name, "' not found"));
+                throw new Error("plugin '".concat(name, "' not found.") + getPluginUsageInfo(name));
             }
             var loader = new CTRL();
             loader.name = name;
@@ -15380,6 +15383,23 @@ var PluginSystem = /** @class */ (function () {
     };
     return PluginSystem;
 }());
+var pluginInfoMap = {
+    'alipay-downgrade': '@galacean/effects-plugin-alipay-downgrade',
+    'editor-gizmo': '@galacean/effects-plugin-editor-gizmo',
+    'tree': '@galacean/effects-plugin-model',
+    'model': '@galacean/effects-plugin-model',
+    'orientation-transformer': '@galacean/effects-plugin-orientation-transformer',
+    'spine': '@galacean/effects-plugin-spine',
+};
+function getPluginUsageInfo(name) {
+    var info = pluginInfoMap[name];
+    if (info) {
+        return "\nInstall Plugin: npm i ".concat(info, "@latest --save\nImport Plugin: import '").concat(info, "'");
+    }
+    else {
+        return '';
+    }
+}
 
 /**
  * 抽象插件类
@@ -17052,7 +17072,7 @@ var Mesh = /** @class */ (function () {
     function Mesh(engine, props) {
         this.engine = engine;
         this.destroyed = false;
-        this.visible = false;
+        this.visible = true;
         var material = props.material, geometry = props.geometry, _a = props.name, name = _a === void 0 ? '<unnamed>' : _a, _b = props.priority, priority = _b === void 0 ? 0 : _b, _c = props.worldMatrix, worldMatrix = _c === void 0 ? Matrix4.fromIdentity() : _c;
         this.id = 'Mesh' + seed$8++;
         this.name = name;
@@ -19279,7 +19299,7 @@ var SpriteMesh = /** @class */ (function () {
         var indexLen = 0;
         var pointCount = 0;
         if (!items.length) {
-            this.mesh.setVisible(true);
+            this.mesh.setVisible(false);
             return true;
         }
         this.items = items.slice();
@@ -19336,7 +19356,7 @@ var SpriteMesh = /** @class */ (function () {
         geometry.setIndexData(indexData);
         geometry.setAttributeData('aPoint', bundle.aPoint);
         geometry.setDrawCount(indexLen);
-        this.mesh.setVisible(!geometry.getDrawCount());
+        this.mesh.setVisible(!!geometry.getDrawCount());
         this.mesh.priority = items[0].listIndex;
         for (var i = 0; i < textures.length; i++) {
             var texture = textures[i];
@@ -19366,7 +19386,7 @@ var SpriteMesh = /** @class */ (function () {
         var uSizeStart = start + 4;
         var uQuatStart = start + 8;
         var uColorStart = start + 12;
-        if (!selfData.visible) {
+        if (!selfData.visible && !init) {
             mainDataArray[uSizeStart + 2] = -1;
             return;
         }
@@ -20465,6 +20485,7 @@ new Vector3();
 var CalculateItem = /** @class */ (function () {
     function CalculateItem(props, vfxItem) {
         var _a;
+        this.vfxItem = vfxItem;
         this.active = false;
         this.transform = vfxItem.transform;
         var scale = this.transform.scale;
@@ -20858,7 +20879,7 @@ var SpriteItem = /** @class */ (function (_super) {
         else if (init) {
             ret.texOffset = [0, 0, 1, 1];
         }
-        ret.visible = this.visible;
+        ret.visible = this.vfxItem.contentVisible;
         // 图层元素作为父节点时，除了k的大小变换，自身的尺寸也需要传递给子元素，子元素可以通过startSize读取
         ret.startSize = this.startSize;
         return ret;
@@ -20887,21 +20908,14 @@ var SpriteVFXItem = /** @class */ (function (_super) {
         this.sprite = props.content;
     };
     SpriteVFXItem.prototype.onLifetimeBegin = function (composition, content) {
-        this._contentVisible = true;
         content.active = true;
     };
     SpriteVFXItem.prototype.onItemRemoved = function (composition, content) {
-        this._contentVisible = false;
         if (content) {
             delete content.mesh;
             composition.destroyTextures(content.getTextures());
         }
     };
-    SpriteVFXItem.prototype.handleVisibleChanged = function (visible) {
-        if (this.content) {
-            this.content.visible = visible;
-        }
-    };
     SpriteVFXItem.prototype.onItemUpdate = function (dt, lifetime) {
         var _a;
         (_a = this.content) === null || _a === void 0 ? void 0 : _a.updateTime(this.time);
@@ -23539,7 +23553,7 @@ var ParticleSystem = /** @class */ (function () {
         }
         this.meshes = meshes;
         this.reusable = vfxItem.reusable;
-        this.setVisible(vfxItem.getVisible());
+        this.setVisible(vfxItem.contentVisible);
         var interaction = props.interaction;
         if (interaction) {
             this.interaction = {
@@ -24194,10 +24208,10 @@ var ParticleVFXItem = /** @class */ (function (_super) {
                 }
             }
             if (hide) {
-                this.content.setVisible(true);
+                this.content.setVisible(false);
             }
             else {
-                this.content.setVisible(false);
+                this.content.setVisible(true);
                 this.content.onUpdate(dt);
             }
         }
@@ -25913,13 +25927,11 @@ var TextItem = /** @class */ (function (_super) {
         _this.text = options.text;
         // Text
         _this.mesh = new TextMesh(_this.engine, _this.renderInfo, vfxItem.composition);
-        _this.mesh.setItems([_this]);
-        _this.updateTexture();
         return _this;
     }
     /**
      * 设置字号大小
-     * @param value 字号
+     * @param value - 字号
      * @returns
      */
     TextItem.prototype.setFontSize = function (value) {
@@ -25933,7 +25945,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置字重
-     * @param value 字重类型
+     * @param value - 字重类型
      * @returns
      */
     TextItem.prototype.setFontWeight = function (value) {
@@ -25957,7 +25969,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置文本
-     * @param value 文本内容
+     * @param value - 文本内容
      * @returns
      */
     TextItem.prototype.setText = function (value) {
@@ -25969,7 +25981,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置文本水平布局
-     * @param value 布局选项
+     * @param value - 布局选项
      * @returns
      */
     TextItem.prototype.setTextAlign = function (value) {
@@ -25981,7 +25993,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置文本垂直布局
-     * @param value 布局选项
+     * @param value - 布局选项
      * @returns
      */
     TextItem.prototype.setTextBaseline = function (value) {
@@ -25993,7 +26005,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置文本颜色
-     * @param value 颜色内容
+     * @param value - 颜色内容
      * @returns
      */
     TextItem.prototype.setTextColor = function (value) {
@@ -26005,7 +26017,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置文本字体
-     * @param value 文本字体
+     * @param value - 文本字体
      * @returns
      */
     TextItem.prototype.setFontFamily = function (value) {
@@ -26017,7 +26029,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置外描边文本颜色
-     * @param value 颜色内容
+     * @param value - 颜色内容
      * @returns
      */
     TextItem.prototype.setOutlineColor = function (value) {
@@ -26029,7 +26041,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置外描边文本宽度
-     * @param value 外描边宽度
+     * @param value - 外描边宽度
      * @returns
      */
     TextItem.prototype.setOutlineWidth = function (value) {
@@ -26041,7 +26053,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置阴影模糊
-     * @param value 阴影模糊强度
+     * @param value - 阴影模糊强度
      * @returns
      */
     TextItem.prototype.setShadowBlur = function (value) {
@@ -26053,7 +26065,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置阴影颜色
-     * @param value 阴影颜色
+     * @param value - 阴影颜色
      * @returns
      */
     TextItem.prototype.setShadowColor = function (value) {
@@ -26065,7 +26077,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置阴影水平偏移距离
-     * @param value 水平偏移距离
+     * @param value - 水平偏移距离
      * @returns
      */
     TextItem.prototype.setShadowOffsetX = function (value) {
@@ -26077,7 +26089,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置阴影水平偏移距离
-     * @param value 水平偏移距离
+     * @param value - 水平偏移距离
      * @returns
      */
     TextItem.prototype.setShadowOffsetY = function (value) {
@@ -26089,7 +26101,7 @@ var TextItem = /** @class */ (function (_super) {
     };
     /**
      * 设置字体清晰度
-     * @param value 字体清晰度
+     * @param value - 字体清晰度
      * @returns
      */
     TextItem.prototype.setFontScale = function (value) {
@@ -26116,7 +26128,7 @@ var TextItem = /** @class */ (function (_super) {
         var height = layout.height * fontScale;
         var fontSize = style.fontSize * fontScale;
         var lineHeight = layout.lineHeight * fontScale;
-        this.char = this.text.split('');
+        this.char = (this.text || '').split('');
         this.canvas.width = width;
         this.canvas.height = height;
         context.clearRect(0, 0, width, this.canvas.height);
@@ -26246,23 +26258,22 @@ var TextVFXItem = /** @class */ (function (_super) {
         this.textContext = props.content;
     };
     TextVFXItem.prototype.onLifetimeBegin = function (composition, content) {
-        this._contentVisible = true;
+        var _a;
         content.active = true;
+        (_a = this.content) === null || _a === void 0 ? void 0 : _a.mesh.setItems([this.content]);
+        this.content.updateTexture();
     };
     TextVFXItem.prototype.onItemRemoved = function (composition, content) {
-        this._contentVisible = false;
         if (content) {
             delete content.mesh;
             composition.destroyTextures(content.getTextures());
         }
     };
-    TextVFXItem.prototype.handleVisibleChanged = function (visible) {
-        if (this.content) {
-            this.content.visible = visible;
-        }
-    };
     TextVFXItem.prototype.onItemUpdate = function (dt, lifetime) {
         var _a;
+        if (!this.content) {
+            return;
+        }
         (_a = this.content) === null || _a === void 0 ? void 0 : _a.updateTime(this.time);
     };
     TextVFXItem.prototype.getCurrentPosition = function () {
@@ -26317,6 +26328,7 @@ var TextVFXItem = /** @class */ (function (_super) {
     };
     TextVFXItem.prototype.createWireframeMesh = function (item, color) {
         var spMesh = new TextMesh(this.composition.getEngine(), __assign$1({ wireframe: true }, item.renderInfo), this.composition);
+        spMesh.mesh.setVisible(true);
         spMesh.setItems([item]);
         spMesh.mesh.material.setVector3('uFrameColor', Vector3.fromArray(color));
         spMesh.mesh.priority = 999;
@@ -26332,7 +26344,7 @@ var TextLoader = /** @class */ (function (_super) {
         _this.name = 'text';
         _this.addItems = [];
         _this.removeItems = [];
-        _this.meshes = []; // meshSplits对应的mesh数组 每次diff后更新
+        _this.meshes = [];
         return _this;
     }
     TextLoader.prototype.onCompositionDestroyed = function (composition) {
@@ -26351,12 +26363,19 @@ var TextLoader = /** @class */ (function (_super) {
     };
     TextLoader.prototype.onCompositionUpdate = function (composition, dt) {
         this.addItems.forEach(function (item) {
-            var _a;
+            var _a, _b, _c;
+            if (!item.contentVisible) {
+                (_a = item.content.mesh) === null || _a === void 0 ? void 0 : _a.mesh.setVisible(false);
+                return;
+            }
+            else {
+                (_b = item.content.mesh) === null || _b === void 0 ? void 0 : _b.mesh.setVisible(true);
+            }
             item.content.updateTexture();
             if (!item.content.ended && item.content.mesh) {
                 item.content.mesh.updateItem(item.content);
+                (_c = item.content.mesh) === null || _c === void 0 ? void 0 : _c.applyChange();
             }
-            (_a = item.content.mesh) === null || _a === void 0 ? void 0 : _a.applyChange();
         });
     };
     TextLoader.prototype.onCompositionItemLifeBegin = function (composition, item) {
@@ -26375,6 +26394,7 @@ var TextLoader = /** @class */ (function (_super) {
     };
     TextLoader.prototype.onCompositionItemRemoved = function (composition, item) {
         var _a;
+        // FIXME: 此处判断有问题，item 应该先判断
         if (item instanceof TextVFXItem && item) {
             addItem(this.removeItems, item);
             if (this.addItems.includes(item)) {
@@ -30928,23 +30948,41 @@ var Composition = /** @class */ (function () {
         this.content.translateByPixel(x, y);
     };
     /**
-     * 设置合成在 3D 坐标轴上相对移动
+     * 设置合成在 3D 坐标轴上相对当前的位移
      */
     Composition.prototype.translate = function (x, y, z) {
         this.content.translate(x, y, z);
     };
     /**
-     * 设置合成在 3D 坐标轴上相对旋转（角度）
+     * 设置合成在 3D 坐标轴上相对原点的位移
+     */
+    Composition.prototype.setPosition = function (x, y, z) {
+        this.content.setPosition(x, y, z);
+    };
+    /**
+     * 设置合成在 3D 坐标轴上相对当前的旋转（角度）
      */
     Composition.prototype.rotate = function (x, y, z) {
         this.content.rotate(x, y, z);
     };
     /**
-     * 设置合成在 3D 坐标轴上相对缩放
+     * 设置合成在 3D 坐标轴上的相对原点的旋转（角度）
+     */
+    Composition.prototype.setRotation = function (x, y, z) {
+        this.content.setRotation(x, y, z);
+    };
+    /**
+     * 设置合成在 3D 坐标轴上相对当前的缩放
      */
     Composition.prototype.scale = function (x, y, z) {
         this.content.scale(x, y, z);
     };
+    /**
+     * 设置合成在 3D 坐标轴上的缩放
+     */
+    Composition.prototype.setScale = function (x, y, z) {
+        this.content.setScale(x, y, z);
+    };
     /**
      * 卸载贴图纹理方法，减少内存
      */
@@ -32542,7 +32580,7 @@ var ThreeMesh = /** @class */ (function (_super) {
      * @param val - 可见性开关
      */
     ThreeMesh.prototype.setVisible = function (val) {
-        this.mesh.visible = !val;
+        this.mesh.visible = val;
     };
     /**
      * 获取 mesh 的可见性
@@ -32550,7 +32588,7 @@ var ThreeMesh = /** @class */ (function (_super) {
      * @returns
      */
     ThreeMesh.prototype.getVisible = function () {
-        return !this.mesh.visible;
+        return this.mesh.visible;
     };
     /**
      * 获取 mesh 中的首个 geometry
@@ -32739,9 +32777,9 @@ Geometry.create = function (engine, options) {
 Mesh.create = function (engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "1.1.0-alpha.1";
+var version = "1.1.0-alpha.3";
 console.info({
-    content: '[Galacean Effects THREEJS] version: ' + "1.1.0-alpha.1",
+    content: '[Galacean Effects THREEJS] version: ' + "1.1.0-alpha.3",
     type: LOG_TYPE,
 });