@galacean/effects-threejs 2.4.6 → 2.4.8

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.4.6
+ * Version: v2.4.8
  */
 
 'use strict';
@@ -20161,7 +20161,7 @@ var RuntimeClip = /*#__PURE__*/ function() {
             this.playable.play();
         }
         this.parentMixer.setClipWeight(this.playable, weight);
-        var clipTime = parseFloat(clip.toLocalTime(localTime).toFixed(3));
+        var clipTime = clip.toLocalTime(localTime);
         this.playable.setTime(clipTime);
         // 判断动画是否结束
         if (ended) {
@@ -21161,13 +21161,12 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
         _this._textures = [];
         var _props_reusable = props.reusable, reusable = _props_reusable === void 0 ? false : _props_reusable, _props_speed = props.speed, speed = _props_speed === void 0 ? 1 : _props_speed, _props_baseRenderOrder = props.baseRenderOrder, baseRenderOrder = _props_baseRenderOrder === void 0 ? 0 : _props_baseRenderOrder, renderer = props.renderer, event = props.event, width = props.width, height = props.height, handleItemMessage = props.handleItemMessage;
         _this.renderer = renderer;
-        _this._textures = scene.textureOptions;
+        _this._textures = scene.textures;
         var _scene_jsonScene_renderSettings_postProcessingEnabled;
         _this.postProcessingEnabled = (_scene_jsonScene_renderSettings_postProcessingEnabled = (_scene_jsonScene_renderSettings = scene.jsonScene.renderSettings) == null ? void 0 : _scene_jsonScene_renderSettings.postProcessingEnabled) != null ? _scene_jsonScene_renderSettings_postProcessingEnabled : false;
         _this.getEngine().renderLevel = scene.renderLevel;
         if (reusable) {
             _this.keepResource = true;
-            scene.textures = undefined;
             scene.consumed = true;
         }
         var sourceContent = scene.jsonScene.compositions[0];
@@ -21351,11 +21350,12 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
    * 前进合成到指定时间
    * @param time - 相对0时刻的时间
    */ _proto.forwardTime = function forwardTime(time) {
-        var deltaTime = time * 1000 - this.rootComposition.time * 1000;
+        var deltaTime = time * 1000 - this.time * 1000;
         var reverse = deltaTime < 0;
         var step = 15;
         var t = Math.abs(deltaTime);
         var ss = reverse ? -step : step;
+        // FIXME Update 中可能会修改合成时间，这边需要优化更新逻辑
         for(t; t > step; t -= step){
             this.update(ss);
         }
@@ -21395,13 +21395,14 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
             this.callAwake(this.rootItem);
             this.rootItem.beginPlay();
         }
-        var dt = parseFloat(this.getUpdateTime(deltaTime * this.speed).toFixed(0));
-        this.updateRootComposition(dt / 1000);
+        var previousCompositionTime = this.time;
+        this.updateCompositionTime(deltaTime * this.speed / 1000);
+        var deltaTimeInMs = (this.time - previousCompositionTime) * 1000;
         this.updateVideo();
         // 更新 model-tree-plugin
-        this.updatePluginLoaders(deltaTime);
-        this.sceneTicking.update.tick(dt);
-        this.sceneTicking.lateUpdate.tick(dt);
+        this.updatePluginLoaders(deltaTimeInMs);
+        this.sceneTicking.update.tick(deltaTimeInMs);
+        this.sceneTicking.lateUpdate.tick(deltaTimeInMs);
         this.updateCamera();
         this.prepareRender();
         if (this.isEnded && !this.isEndCalled) {
@@ -21417,14 +21418,6 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
     _proto.shouldDispose = function shouldDispose() {
         return this.isEnded && this.rootItem.endBehavior === EndBehavior.destroy && !this.reusable;
     };
-    _proto.getUpdateTime = function getUpdateTime(t) {
-        var startTimeInMs = this.startTime * 1000;
-        var now = this.rootComposition.time * 1000;
-        if (t < 0 && now + t < startTimeInMs) {
-            return startTimeInMs - now;
-        }
-        return t;
-    };
     _proto.callAwake = function callAwake(item) {
         for(var _iterator = _create_for_of_iterator_helper_loose(item.components), _step; !(_step = _iterator()).done;){
             var component = _step.value;
@@ -21469,14 +21462,18 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
     };
     /**
    * 更新主合成组件
-   */ _proto.updateRootComposition = function updateRootComposition(deltaTime) {
+   */ _proto.updateCompositionTime = function updateCompositionTime(deltaTime) {
         if (this.rootComposition.state === PlayState.Paused || !this.rootComposition.isActiveAndEnabled) {
             return;
         }
-        var localTime = parseFloat((this.time + deltaTime - this.rootItem.start).toFixed(3));
-        var isEnded = false;
+        // 相对于合成开始时间的时间
+        var localTime = this.time + deltaTime - this.startTime;
+        if (deltaTime < 0 && localTime < 0) {
+            localTime = 0;
+        }
         var duration = this.rootItem.duration;
         var endBehavior = this.rootItem.endBehavior;
+        var isEnded = false;
         if (localTime - duration > 0.001) {
             isEnded = true;
             switch(endBehavior){
@@ -21501,7 +21498,7 @@ var LateUpdateTickData = /*#__PURE__*/ function(TickData) {
                     }
             }
         }
-        this.rootComposition.time = localTime;
+        this.rootComposition.time = localTime + this.startTime;
         // end state changed, handle onEnd flags
         if (this.isEnded !== isEnded) {
             if (isEnded) {
@@ -26284,8 +26281,9 @@ var TextComponentBase = /*#__PURE__*/ function() {
         this.isDirty = true;
     };
     /**
-   * 设置字体类型
-   * @param value 字体类型
+   * 设置字体样式
+   * @param value 设置字体样式
+   * @default "normal"
    * @returns
    */ _proto.setFontStyle = function setFontStyle(value) {
         if (this.textStyle.fontStyle === value) {
@@ -27436,7 +27434,6 @@ function getStandardInteractContent(ui) {
 var currentMaskComponent;
 var componentMap = new Map();
 var itemMap = new Map();
-var refCompositions = new Map();
 /**
  * 3.1 版本数据适配
  * - 富文本插件名称的适配
@@ -27484,27 +27481,20 @@ var refCompositions = new Map();
 function version32Migration(json) {
     componentMap.clear();
     itemMap.clear();
-    refCompositions.clear();
     var compositions = json.compositions, items = json.items, components = json.components;
     // 处理旧蒙版数据
-    var mainComp = compositions[0];
     for(var _iterator = _create_for_of_iterator_helper_loose(components), _step; !(_step = _iterator()).done;){
         var component = _step.value;
         componentMap.set(component.id, component);
     }
-    for(var _iterator1 = _create_for_of_iterator_helper_loose(compositions), _step1; !(_step1 = _iterator1()).done;){
-        var comp = _step1.value;
-        if (comp.id === json.compositionId) {
-            mainComp = comp;
-        } else {
-            refCompositions.set(comp.id, comp);
-        }
-    }
-    for(var _iterator2 = _create_for_of_iterator_helper_loose(items), _step2; !(_step2 = _iterator2()).done;){
-        var item = _step2.value;
+    for(var _iterator1 = _create_for_of_iterator_helper_loose(items), _step1; !(_step1 = _iterator1()).done;){
+        var item = _step1.value;
         itemMap.set(item.id, item);
     }
-    processContent(mainComp);
+    for(var _iterator2 = _create_for_of_iterator_helper_loose(compositions), _step2; !(_step2 = _iterator2()).done;){
+        var comp = _step2.value;
+        processContent(comp);
+    }
     return json;
 }
 function version33Migration(json) {
@@ -27589,12 +27579,6 @@ function processContent(composition) {
                 processMask(component);
             }
         }
-        // 处理预合成的渲染顺序
-        if (itemProps.type === ItemType.composition) {
-            var refId = itemProps.content.options.refId;
-            var comp = refCompositions.get(refId);
-            comp && processContent(comp);
-        }
     }
 }
 function processMask(renderContent) {
@@ -28983,7 +28967,7 @@ var seed$1 = 1;
                     });
                 });
                 loadResourcePromise = /*#__PURE__*/ _async_to_generator(function() {
-                    var scene, link, jsonScene, pluginSystem, loadedImages, images, _ref, jsonScene1, pluginSystem1, _jsonScene_bins, bins, images1, fonts, _ref1, loadedBins, loadedImages1, loadedTextures, totalTime;
+                    var scene, link, _ref, jsonScene, pluginSystem, _jsonScene_bins, bins, images, fonts, _ref1, loadedBins, loadedImages, loadedTextures, totalTime;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -29014,37 +28998,23 @@ var seed$1 = 1;
                             case 3:
                                 if (!exports.Scene.isJSONObject(rawJSON)) return [
                                     3,
-                                    5
+                                    4
                                 ];
-                                // 已经加载过的 可能需要更新数据模板
                                 scene = _extends({}, rawJSON);
-                                jsonScene = scene.jsonScene, pluginSystem = scene.pluginSystem, loadedImages = scene.images;
-                                images = jsonScene.images;
-                                _this.assignImagesToAssets(images, loadedImages);
-                                return [
-                                    4,
-                                    Promise.all([
-                                        hookTimeInfo("plugin:processAssets", function() {
-                                            return _this.processPluginAssets(jsonScene, pluginSystem, options);
-                                        })
-                                    ])
-                                ];
-                            case 4:
-                                _state.sent();
                                 return [
                                     3,
-                                    10
+                                    9
                                 ];
-                            case 5:
+                            case 4:
                                 return [
                                     4,
                                     hookTimeInfo("processJSON", function() {
                                         return _this.processJSON(rawJSON);
                                     })
                                 ];
-                            case 6:
-                                _ref = _state.sent(), jsonScene1 = _ref.jsonScene, pluginSystem1 = _ref.pluginSystem;
-                                _jsonScene_bins = jsonScene1.bins, bins = _jsonScene_bins === void 0 ? [] : _jsonScene_bins, images1 = jsonScene1.images, fonts = jsonScene1.fonts;
+                            case 5:
+                                _ref = _state.sent(), jsonScene = _ref.jsonScene, pluginSystem = _ref.pluginSystem;
+                                _jsonScene_bins = jsonScene.bins, bins = _jsonScene_bins === void 0 ? [] : _jsonScene_bins, images = jsonScene.images, fonts = jsonScene.fonts;
                                 return [
                                     4,
                                     Promise.all([
@@ -29052,48 +29022,50 @@ var seed$1 = 1;
                                             return _this.processBins(bins);
                                         }),
                                         hookTimeInfo("processImages", function() {
-                                            return _this.processImages(images1, compressedTexture);
+                                            return _this.processImages(images, compressedTexture);
                                         }),
                                         hookTimeInfo("plugin:processAssets", function() {
-                                            return _this.processPluginAssets(jsonScene1, pluginSystem1, options);
+                                            return _this.processPluginAssets(jsonScene, pluginSystem, options);
                                         }),
                                         hookTimeInfo("processFontURL", function() {
                                             return _this.processFontURL(fonts);
                                         })
                                     ])
                                 ];
-                            case 7:
-                                _ref1 = _state.sent(), loadedBins = _ref1[0], loadedImages1 = _ref1[1];
+                            case 6:
+                                _ref1 = _state.sent(), loadedBins = _ref1[0], loadedImages = _ref1[1];
                                 return [
                                     4,
                                     hookTimeInfo("processTextures", function() {
-                                        return _this.processTextures(loadedImages1, loadedBins, jsonScene1);
+                                        return _this.processTextures(loadedImages, loadedBins, jsonScene);
                                     })
                                 ];
-                            case 8:
+                            case 7:
                                 loadedTextures = _state.sent();
                                 scene = {
                                     timeInfos: timeInfos,
                                     url: url,
                                     renderLevel: _this.options.renderLevel,
                                     storage: {},
-                                    pluginSystem: pluginSystem1,
-                                    jsonScene: jsonScene1,
+                                    pluginSystem: pluginSystem,
+                                    jsonScene: jsonScene,
                                     bins: loadedBins,
-                                    images: loadedImages1,
-                                    textureOptions: loadedTextures
+                                    textureOptions: loadedTextures,
+                                    textures: [],
+                                    images: loadedImages,
+                                    assets: _this.assets
                                 };
                                 // 触发插件系统 pluginSystem 的回调 prepareResource
                                 return [
                                     4,
                                     hookTimeInfo("plugin:prepareResource", function() {
-                                        return pluginSystem1.loadResources(scene, _this.options);
+                                        return pluginSystem.loadResources(scene, _this.options);
                                     })
                                 ];
-                            case 9:
+                            case 8:
                                 _state.sent();
-                                _state.label = 10;
-                            case 10:
+                                _state.label = 9;
+                            case 9:
                                 totalTime = performance.now() - startTime;
                                 logger.info("Load asset: totalTime: " + totalTime.toFixed(4) + "ms " + timeInfoMessages.join(" ") + ", url: " + assetUrl + ".");
                                 window.clearTimeout(loadTimer);
@@ -29688,16 +29660,10 @@ function createTextureOptionsBySource(image, sourceFrom, id) {
     };
     _proto.initializeTexture = function initializeTexture(scene) {
         for(var i = 0; i < scene.textureOptions.length; i++){
-            var textureOptions = scene.textureOptions[i];
-            if (_instanceof1(textureOptions, Texture)) {
-                this.engine.addInstance(textureOptions);
-            } else {
-                textureOptions = this.engine.findObject({
-                    id: scene.textureOptions[i].id
-                });
-                scene.textureOptions[i] = textureOptions;
-            }
-            textureOptions.initialize();
+            scene.textures[i] = this.engine.findObject({
+                id: scene.textureOptions[i].id
+            });
+            scene.textures[i].initialize();
         }
     };
     _proto.prepareAssets = function prepareAssets(scene, assets) {
@@ -31682,7 +31648,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.4.6";
+var version$1 = "2.4.8";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -33284,7 +33250,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.4.6";
+var version = "2.4.8";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;