@galacean/effects-threejs 2.0.0-alpha.18 → 2.0.0-alpha.19

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.0.0-alpha.18
+ * Version: v2.0.0-alpha.19
  */
 
 'use strict';
@@ -288,12 +288,12 @@ function addItem(arr, value) {
         arr[index] = currentItem;
     }
 }
-function enlargeBuffer(typeArray, length, increase, maxSize) {
+function enlargeBuffer(typeArray, length, maxSize, increase) {
     if (increase === void 0) increase = 1;
     var buffer = typeArray.buffer;
     if (buffer.byteLength < typeArray.BYTES_PER_ELEMENT * length) {
         var size = Math.ceil(length * increase);
-        if (!isNaN(maxSize)) {
+        if (!Number.isNaN(maxSize)) {
             size = Math.min(size, maxSize);
         }
         var nbuffer = new ArrayBuffer(typeArray.BYTES_PER_ELEMENT * size);
@@ -814,6 +814,17 @@ function base64ToFile(base64, filename, contentType) {
     });
     return file;
 }
+function applyMixins(derivedCtrl, baseCtrls) {
+    baseCtrls.forEach(function(baseCtrl) {
+        Object.getOwnPropertyNames(baseCtrl.prototype).forEach(function(name) {
+            var propertyDescriptor = Object.getOwnPropertyDescriptor(baseCtrl.prototype, name);
+            if (!propertyDescriptor) {
+                throw new Error("Cannot find property descriptor of class " + baseCtrl);
+            }
+            Object.defineProperty(derivedCtrl.prototype, name, propertyDescriptor);
+        });
+    });
+}
 
 function _defineProperties(target, props) {
     for(var i = 0; i < props.length; i++){
@@ -9963,6 +9974,9 @@ var StaticValue = /*#__PURE__*/ function(ValueGetter) {
         this.value = func(val);
         return this;
     };
+    _proto.getMaxTime = function getMaxTime() {
+        return 0;
+    };
     return StaticValue;
 }(ValueGetter);
 var RandomSetValue = /*#__PURE__*/ function(ValueGetter) {
@@ -17267,7 +17281,10 @@ function randomArrItem(arr, keepArr) {
  */ var ParticleBehaviourPlayable = /*#__PURE__*/ function(Playable) {
     _inherits(ParticleBehaviourPlayable, Playable);
     function ParticleBehaviourPlayable() {
-        return Playable.apply(this, arguments);
+        var _this;
+        _this = Playable.apply(this, arguments) || this;
+        _this.lastTime = 0;
+        return _this;
     }
     var _proto = ParticleBehaviourPlayable.prototype;
     _proto.start = function start(context) {
@@ -17291,8 +17308,14 @@ function randomArrItem(arr, keepArr) {
             // TODO: [1.31] @十弦 验证 https://github.com/galacean/effects-runtime/commit/3e7d73d37b7d98c2a25e4544e80e928b17801ccd#diff-fae062f28caf3771cfedd3a20dc22f9749bd054c7541bf2fd50a9a5e413153d4
             // particleSystem.setParentTransform(parentItem.transform);
             particleSystem.setVisible(true);
-            particleSystem.onUpdate(context.deltaTime);
+            var deltaTime = context.deltaTime;
+            // 直接用 this.lastTime - this.time 获取 deltaTime 会有精度问题
+            if (this.lastTime === this.time) {
+                deltaTime = 0;
+            }
+            particleSystem.onUpdate(deltaTime);
         }
+        this.lastTime = this.time;
     };
     return ParticleBehaviourPlayable;
 }(Playable);
@@ -17873,7 +17896,7 @@ var ParticleMesh = /*#__PURE__*/ function() {
             }));
             if (increaseBuffer) {
                 var baseIndexData = geometry.getIndexData();
-                var idx = enlargeBuffer(baseIndexData, particleCount * 6, inc, maxCount * 6);
+                var idx = enlargeBuffer(baseIndexData, particleCount * 6, maxCount * 6, inc);
                 idx.set(indexData, index * 6);
                 geometry.setIndexData(idx);
                 this.maxParticleBufferCount = idx.length / 6;
@@ -17885,7 +17908,7 @@ var ParticleMesh = /*#__PURE__*/ function() {
                 var attrSize = geometry.getAttributeStride(name) / Float32Array.BYTES_PER_ELEMENT;
                 if (increaseBuffer) {
                     var baseData = geometry.getAttributeData(name);
-                    var geoData = enlargeBuffer(baseData, vertexCount * attrSize, inc, maxCount * 4 * attrSize);
+                    var geoData = enlargeBuffer(baseData, vertexCount * attrSize, maxCount * 4 * attrSize, inc);
                     geoData.set(data, data.length * index);
                     geometry.setAttributeData(name, geoData);
                 } else {
@@ -18539,6 +18562,7 @@ exports.AnimationClip = /*#__PURE__*/ function(EffectsObject) {
     function AnimationClip() {
         var _this;
         _this = EffectsObject.apply(this, arguments) || this;
+        _this.duration = 0;
         _this.positionCurves = [];
         _this.rotationCurves = [];
         _this.scaleCurves = [];
@@ -18583,6 +18607,7 @@ exports.AnimationClip = /*#__PURE__*/ function(EffectsObject) {
                 path: positionCurveData.path,
                 keyFrames: createValueGetter(positionCurveData.keyFrames)
             };
+            this.duration = Math.max(this.duration, curve.keyFrames.getMaxTime());
             this.positionCurves.push(curve);
         }
         for(var _iterator1 = _create_for_of_iterator_helper_loose(data.rotationCurves), _step1; !(_step1 = _iterator1()).done;){
@@ -18591,6 +18616,7 @@ exports.AnimationClip = /*#__PURE__*/ function(EffectsObject) {
                 path: rotationCurveData.path,
                 keyFrames: createValueGetter(rotationCurveData.keyFrames)
             };
+            this.duration = Math.max(this.duration, curve1.keyFrames.getMaxTime());
             this.rotationCurves.push(curve1);
         }
         for(var _iterator2 = _create_for_of_iterator_helper_loose(data.scaleCurves), _step2; !(_step2 = _iterator2()).done;){
@@ -18599,6 +18625,7 @@ exports.AnimationClip = /*#__PURE__*/ function(EffectsObject) {
                 path: scaleCurvesData.path,
                 keyFrames: createValueGetter(scaleCurvesData.keyFrames)
             };
+            this.duration = Math.max(this.duration, curve2.keyFrames.getMaxTime());
             this.scaleCurves.push(curve2);
         }
         for(var _iterator3 = _create_for_of_iterator_helper_loose(data.floatCurves), _step3; !(_step3 = _iterator3()).done;){
@@ -18609,6 +18636,7 @@ exports.AnimationClip = /*#__PURE__*/ function(EffectsObject) {
                 property: floatCurveData.property,
                 className: floatCurveData.className
             };
+            this.duration = Math.max(this.duration, curve3.keyFrames.getMaxTime());
             this.floatCurves.push(curve3);
         }
     };
@@ -18784,6 +18812,9 @@ var RuntimeClip = /*#__PURE__*/ function() {
         this.playable = clipPlayable;
         this.parentMixer = parentMixer;
         this.track = track;
+        if (_instanceof1(this.track.binding, exports.VFXItem)) {
+            this.particleSystem = this.track.binding.getComponent(exports.ParticleSystem);
+        }
     }
     var _proto = RuntimeClip.prototype;
     _proto.evaluateAt = function evaluateAt(localTime) {
@@ -18793,8 +18824,7 @@ var RuntimeClip = /*#__PURE__*/ function() {
         var started = false;
         var boundItem = this.track.binding;
         if (localTime > clip.start + clip.duration + 0.001 && clip.endBehaviour === ItemEndBehavior.destroy) {
-            var _boundItem_getComponent;
-            if (exports.VFXItem.isParticle(boundItem) && !((_boundItem_getComponent = boundItem.getComponent(exports.ParticleSystem)) == null ? void 0 : _boundItem_getComponent.destroyed)) {
+            if (exports.VFXItem.isParticle(boundItem) && this.particleSystem && !this.particleSystem.destroyed) {
                 weight = 1.0;
             } else {
                 weight = 0.0;
@@ -19568,14 +19598,41 @@ exports.TextComponent = /*#__PURE__*/ function(SpriteComponent) {
             return _possible_constructor_return(_this);
         }
         var options = props.options;
-        _this.textStyle = new TextStyle(options);
-        _this.textLayout = new TextLayout(options);
-        _this.text = options.text;
-        // Text
+        _this.updateWithOptions(options);
         _this.updateTexture();
         return _this;
     }
     var _proto = TextComponent.prototype;
+    _proto.update = function update(dt) {
+        SpriteComponent.prototype.update.call(this, dt);
+        this.updateTexture();
+    };
+    _proto.fromData = function fromData(data) {
+        SpriteComponent.prototype.fromData.call(this, data);
+        var options = data.options;
+        this.updateWithOptions(options);
+        // Text
+        this.updateTexture();
+    };
+    _proto.updateWithOptions = function updateWithOptions(options) {
+    // OVERRIDE by mixins
+    };
+    _proto.updateTexture = function updateTexture(flipY) {
+    // OVERRIDE by mixins
+    };
+    return TextComponent;
+}(exports.SpriteComponent);
+exports.TextComponent = __decorate([
+    effectsClass(DataType.TextComponent)
+], exports.TextComponent);
+var TextComponentBase = /*#__PURE__*/ function() {
+    function TextComponentBase() {}
+    var _proto = TextComponentBase.prototype;
+    _proto.updateWithOptions = function updateWithOptions(options) {
+        this.textStyle = new TextStyle(options);
+        this.textLayout = new TextLayout(options);
+        this.text = options.text;
+    };
     /**
    * 设置字号大小
    * @param value - 字号
@@ -19745,14 +19802,11 @@ exports.TextComponent = /*#__PURE__*/ function(SpriteComponent) {
         this.textStyle.fontScale = value;
         this.isDirty = true;
     };
-    _proto.update = function update(dt) {
-        SpriteComponent.prototype.update.call(this, dt);
-        this.updateTexture();
-    };
     /**
    * 更新文本
    * @returns
-   */ _proto.updateTexture = function updateTexture() {
+   */ _proto.updateTexture = function updateTexture(flipY) {
+        if (flipY === void 0) flipY = true;
         if (!this.isDirty || !this.context || !this.canvas) {
             return;
         }
@@ -19770,6 +19824,10 @@ exports.TextComponent = /*#__PURE__*/ function(SpriteComponent) {
         context.clearRect(0, 0, width, 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);
+        }
         context.fillRect(0, 0, width, this.canvas.height);
         style.fontDesc = this.getFontDesc();
         context.font = style.fontDesc;
@@ -19782,7 +19840,7 @@ exports.TextComponent = /*#__PURE__*/ function(SpriteComponent) {
         // 文本颜色
         context.fillStyle = "rgba(" + style.textColor[0] + ", " + style.textColor[1] + ", " + style.textColor[2] + ", " + style.textColor[3] + ")";
         var charsInfo = [];
-        // /3 为了和编辑器行为保持一致
+        // /3 是为了和编辑器行为保持一致
         var offsetY = (lineHeight - fontSize) / 3;
         var x = 0;
         var y = layout.getOffsetY(style) + offsetY;
@@ -19836,7 +19894,7 @@ exports.TextComponent = /*#__PURE__*/ function(SpriteComponent) {
             width: imageData.width,
             height: imageData.height
         }, {
-            flipY: true,
+            flipY: flipY,
             magFilter: glContext.LINEAR,
             minFilter: glContext.LINEAR,
             wrapS: glContext.CLAMP_TO_EDGE,
@@ -19844,50 +19902,47 @@ exports.TextComponent = /*#__PURE__*/ function(SpriteComponent) {
         }));
         this.isDirty = false;
     };
-    _proto.fromData = function fromData(data) {
-        SpriteComponent.prototype.fromData.call(this, data);
-        var options = data.options;
-        this.textStyle = new TextStyle(options);
-        this.textLayout = new TextLayout(options);
-        this.text = options.text;
-        // Text
-        this.updateTexture();
-    };
     _proto.getFontDesc = function getFontDesc() {
-        var textStyle = this.textStyle;
-        var fontDesc = "" + (textStyle.fontSize * textStyle.fontScale).toString() + "px ";
-        if (!DEFAULT_FONTS.includes(textStyle.fontFamily)) {
-            fontDesc += '"' + textStyle.fontFamily + '"';
+        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 = "" + (fontSize * fontScale).toString() + "px ";
+        if (!DEFAULT_FONTS.includes(fontFamily)) {
+            fontDesc += '"' + fontFamily + '"';
         } else {
-            fontDesc += textStyle.fontFamily;
+            fontDesc += fontFamily;
         }
-        if (textStyle.textWeight !== TextWeight.normal) {
-            fontDesc = textStyle.textWeight + " " + fontDesc;
+        if (textWeight !== TextWeight.normal) {
+            fontDesc = textWeight + " " + fontDesc;
         }
-        if (textStyle.fontStyle !== FontStyle.normal) {
-            fontDesc = textStyle.fontStyle + " " + fontDesc;
+        if (fontStyle !== FontStyle.normal) {
+            fontDesc = fontStyle + " " + fontDesc;
         }
         return fontDesc;
     };
     _proto.setupOutline = function setupOutline() {
         var context = this.context;
-        var style = this.textStyle;
-        context.strokeStyle = "rgba(" + style.outlineColor[0] * 255 + ", " + style.outlineColor[1] * 255 + ", " + style.outlineColor[2] * 255 + ", " + style.outlineColor[3] + ")";
-        context.lineWidth = style.outlineWidth * 2;
+        var _this_textStyle = this.textStyle, outlineColor = _this_textStyle.outlineColor, outlineWidth = _this_textStyle.outlineWidth;
+        var r = outlineColor[0], g = outlineColor[1], b = outlineColor[2], a = outlineColor[3];
+        if (context) {
+            context.strokeStyle = "rgba(" + r * 255 + ", " + g * 255 + ", " + b * 255 + ", " + a + ")";
+            context.lineWidth = outlineWidth * 2;
+        }
     };
     _proto.setupShadow = function setupShadow() {
         var context = this.context;
-        var style = this.textStyle;
-        context.shadowColor = "rgba(" + style.shadowColor[0] * 255 + ", " + style.shadowColor[1] * 255 + ", " + style.shadowColor[2] * 255 + ", " + style.shadowColor[3] + ")";
-        context.shadowBlur = style.shadowBlur;
-        context.shadowOffsetX = style.shadowOffsetX;
-        context.shadowOffsetY = -style.shadowOffsetY;
+        var _this_textStyle = this.textStyle, outlineColor = _this_textStyle.outlineColor, shadowBlur = _this_textStyle.shadowBlur, shadowOffsetX = _this_textStyle.shadowOffsetX, shadowOffsetY = _this_textStyle.shadowOffsetY;
+        var r = outlineColor[0], g = outlineColor[1], b = outlineColor[2], a = outlineColor[3];
+        if (context) {
+            context.shadowColor = "rgba(" + r * 255 + ", " + g * 255 + ", " + b * 255 + ", " + a + ")";
+            context.shadowBlur = shadowBlur;
+            context.shadowOffsetX = shadowOffsetX;
+            context.shadowOffsetY = -shadowOffsetY;
+        }
     };
-    return TextComponent;
-}(exports.SpriteComponent);
-exports.TextComponent = __decorate([
-    effectsClass(DataType.TextComponent)
-], exports.TextComponent);
+    return TextComponentBase;
+}();
+applyMixins(exports.TextComponent, [
+    TextComponentBase
+]);
 
 // TODO: 注册必须用
 var TextLoader = /*#__PURE__*/ function(AbstractPlugin) {
@@ -20116,8 +20171,8 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
    * @param classConstructor - 要添加的组件类型
    */ _proto.addComponent = function addComponent(classConstructor) {
         var newComponent = new classConstructor(this.engine);
-        newComponent.item = this;
         this.components.push(newComponent);
+        newComponent.item = this;
         newComponent.onAttached();
         return newComponent;
     };
@@ -20372,6 +20427,7 @@ exports.VFXItem = /*#__PURE__*/ function(EffectsObject) {
         }
         for(var _iterator = _create_for_of_iterator_helper_loose(this.components), _step; !(_step = _iterator()).done;){
             var component = _step.value;
+            component.item = this;
             component.onAttached();
         }
         // renderOrder 在 component 初始化后设置。确保能拿到 rendererComponent。
@@ -23325,12 +23381,13 @@ var seed$1 = 1;
                                 ];
                             case 8:
                                 _ref1 = _state.sent(), loadedBins = _ref1[0], loadedImages = _ref1[1];
-                                for(i2 = 0; i2 < images1.length; i2++){
-                                    // FIXME: 2024.05.29 如果 renderer 为空，这里会抛异常
-                                    imageAsset = new ImageAsset(renderer.engine);
-                                    imageAsset.data = loadedImages[i2];
-                                    imageAsset.setInstanceId(images1[i2].id);
-                                    renderer == null ? void 0 : renderer.engine.addInstance(imageAsset);
+                                if (renderer) {
+                                    for(i2 = 0; i2 < images1.length; i2++){
+                                        imageAsset = new ImageAsset(renderer.engine);
+                                        imageAsset.data = loadedImages[i2];
+                                        imageAsset.setInstanceId(images1[i2].id);
+                                        renderer.engine.addInstance(imageAsset);
+                                    }
                                 }
                                 return [
                                     4,
@@ -25580,6 +25637,8 @@ registerPlugin("sprite", SpriteLoader, exports.VFXItem, true);
 registerPlugin("particle", ParticleLoader, exports.VFXItem, true);
 registerPlugin("cal", CalculateLoader, exports.VFXItem, true);
 registerPlugin("interact", InteractLoader, exports.VFXItem, true);
+var version$1 = "2.0.0-alpha.19";
+logger.info("Core version: " + version$1 + ".");
 
 var _obj;
 /**
@@ -27166,7 +27225,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.0.0-alpha.18";
+var version = "2.0.0-alpha.19";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;
@@ -27259,6 +27318,7 @@ exports.SpriteLoader = SpriteLoader;
 exports.StaticValue = StaticValue;
 exports.TEMPLATE_USE_OFFSCREEN_CANVAS = TEMPLATE_USE_OFFSCREEN_CANVAS;
 exports.TEXTURE_UNIFORM_MAP = TEXTURE_UNIFORM_MAP;
+exports.TextComponentBase = TextComponentBase;
 exports.TextLayout = TextLayout;
 exports.TextLoader = TextLoader;
 exports.TextStyle = TextStyle;
@@ -27279,6 +27339,7 @@ exports.ValueGetter = ValueGetter;
 exports.addByOrder = addByOrder;
 exports.addItem = addItem;
 exports.addItemWithOrder = addItemWithOrder;
+exports.applyMixins = applyMixins;
 exports.assertExist = assertExist;
 exports.asserts = asserts;
 exports.base64ToFile = base64ToFile;