@galacean/effects-threejs 2.3.0-beta.2 → 2.3.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: v2.3.0-beta.2
+ * Version: v2.3.0
  */
 
 'use strict';
@@ -25543,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;
@@ -25553,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;
             // 处理文本结束行为
@@ -25623,6 +25626,7 @@ var TextComponentBase = /*#__PURE__*/ function() {
             return;
         }
         this.text = value.toString();
+        this.lineCount = this.getLineCount(value, false);
         this.isDirty = true;
     };
     /**
@@ -25783,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();
         }
@@ -25883,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 {
@@ -32100,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.2";
+var version$1 = "2.3.0";
 logger.info("Core version: " + version$1 + ".");
 
 var _obj;
@@ -33360,6 +33361,7 @@ var ThreeRenderer = /*#__PURE__*/ function(Renderer) {
         _this.baseCompositionIndex = 0;
         var width = options.width, height = options.height, camera = options.camera;
         _this.renderer = new ThreeRenderer(context);
+        _this.assetService = new AssetService(_this.renderer.engine);
         _this.width = width;
         _this.height = height;
         _this.camera = camera;
@@ -33369,63 +33371,109 @@ var ThreeRenderer = /*#__PURE__*/ function(Renderer) {
     _proto.loadScene = function loadScene(scene, options) {
         var _this = this;
         return _async_to_generator(function() {
-            var composition, baseOrder;
+            var last, scenes, compositions, _options_autoplay, autoplay, baseOrder, _scenes, i, compositionNames, firstFrameTime, _iterator, _step, composition;
             return __generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
+                        assertExist(_this.renderer, "Renderer is not exist, maybe the Player has been disabled or in gl 'debug-disable' mode.");
+                        last = performance.now();
+                        scenes = [];
+                        compositions = [];
+                        autoplay = (_options_autoplay = options == null ? void 0 : options.autoplay) != null ? _options_autoplay : true;
                         baseOrder = _this.baseCompositionIndex;
-                        if (!isArray(scene)) return [
-                            3,
-                            2
-                        ];
-                        _this.baseCompositionIndex += scene.length;
+                        if (isArray(scene)) {
+                            (_scenes = scenes).push.apply(_scenes, [].concat(scene));
+                        } else {
+                            scenes.push(scene);
+                        }
                         return [
                             4,
-                            Promise.all(scene.map(/*#__PURE__*/ _async_to_generator(function(scn, index) {
-                                var res;
+                            Promise.all(scenes.map(/*#__PURE__*/ _async_to_generator(function(url, index) {
+                                var _this_assetService_assembleSceneLoadOptions, source, opts, assetManager, _$scene, composition;
                                 return __generator(this, function(_state) {
                                     switch(_state.label){
                                         case 0:
+                                            _this_assetService_assembleSceneLoadOptions = _this.assetService.assembleSceneLoadOptions(url, _extends({
+                                                autoplay: autoplay
+                                            }, options)), source = _this_assetService_assembleSceneLoadOptions.source, opts = _this_assetService_assembleSceneLoadOptions.options;
+                                            assetManager = new AssetManager(opts);
                                             return [
                                                 4,
-                                                _this.createComposition(scn, options)
+                                                assetManager.loadScene(source, _this.renderer, {
+                                                    env: _this.env
+                                                })
                                             ];
                                         case 1:
-                                            res = _state.sent();
-                                            res.setIndex(baseOrder + index);
+                                            _$scene = _state.sent();
+                                            _this.assetService.prepareAssets(_$scene, assetManager.getAssets());
+                                            _this.assetService.updateTextVariables(_$scene, assetManager.options.variables);
+                                            _this.assetService.initializeTexture(_$scene);
+                                            _$scene.pluginSystem.precompile(_$scene.jsonScene.compositions, _this.renderer, options);
+                                            composition = _this.createComposition(_$scene, opts);
+                                            _this.baseCompositionIndex += 1;
+                                            composition.setIndex(baseOrder + index);
+                                            compositions[index] = composition;
                                             return [
-                                                2,
-                                                res
+                                                2
                                             ];
                                     }
                                 });
                             })))
                         ];
                     case 1:
-                        composition = _state.sent();
-                        return [
-                            3,
-                            4
-                        ];
-                    case 2:
-                        _this.baseCompositionIndex += 1;
-                        return [
-                            4,
-                            _this.createComposition(scene, options)
-                        ];
-                    case 3:
-                        composition = _state.sent();
-                        composition.setIndex(baseOrder);
-                        _state.label = 4;
-                    case 4:
+                        _state.sent();
+                        for(i = 0; i < compositions.length; i++){
+                            if (autoplay) {
+                                compositions[i].play();
+                            } else {
+                                compositions[i].pause();
+                            }
+                        }
+                        compositionNames = compositions.map(function(composition) {
+                            return composition.name;
+                        });
+                        firstFrameTime = performance.now() - last;
+                        for(_iterator = _create_for_of_iterator_helper_loose(compositions); !(_step = _iterator()).done;){
+                            composition = _step.value;
+                            composition.statistic.firstFrameTime = firstFrameTime;
+                        }
+                        logger.info("First frame [" + compositionNames + "]: " + firstFrameTime.toFixed(4) + "ms.");
                         return [
                             2,
-                            composition
+                            isArray(scene) ? compositions : compositions[0]
                         ];
                 }
             });
         })();
     };
+    _proto.createComposition = function createComposition(scene, options) {
+        var _this = this;
+        if (options === void 0) options = {};
+        var composition = new ThreeComposition(_extends({}, options, {
+            width: this.width,
+            height: this.height,
+            renderer: this.renderer,
+            handleItemMessage: function(message) {
+                _this.dispatchEvent({
+                    type: "message",
+                    message: message
+                });
+            }
+        }), scene);
+        composition.on("end", function() {
+            _this.dispatchEvent({
+                type: "end",
+                composition: composition
+            });
+        });
+        this.renderer.engine.setOptions({
+            threeCamera: this.camera,
+            threeGroup: this,
+            composition: composition
+        });
+        this.compositions.push(composition);
+        return composition;
+    };
     _proto.pause = function pause() {
         this.dispatchEvent({
             type: "pause"
@@ -33439,99 +33487,6 @@ var ThreeRenderer = /*#__PURE__*/ function(Renderer) {
             composition.resume();
         });
     };
-    _proto.createComposition = function createComposition(url, options) {
-        if (options === void 0) options = {};
-        var _this = this;
-        return _async_to_generator(function() {
-            var last, opts, source, scene, engine, i, composition, firstFrameTime;
-            return __generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        last = performance.now();
-                        opts = _extends({
-                            autoplay: true
-                        }, options);
-                        source = url;
-                        if (exports.Scene.isURL(url)) {
-                            if (!exports.Scene.isJSONObject(url)) {
-                                source = url.url;
-                            }
-                            if (exports.Scene.isWithOptions(url)) {
-                                opts = _extends({}, opts, url.options || {});
-                            }
-                        }
-                        if (_this.assetManager) {
-                            _this.assetManager.updateOptions(opts);
-                        } else {
-                            _this.assetManager = new AssetManager(opts);
-                        }
-                        return [
-                            4,
-                            _this.assetManager.loadScene(source, _this.renderer, {
-                                env: _this.env
-                            })
-                        ];
-                    case 1:
-                        scene = _state.sent();
-                        engine = _this.renderer.engine;
-                        // TODO 多 json 之间目前不共用资源，如果后续需要多 json 共用，这边缓存机制需要额外处理
-                        engine.clearResources();
-                        engine.addPackageDatas(scene);
-                        for(i = 0; i < scene.textureOptions.length; i++){
-                            scene.textureOptions[i] = engine.assetLoader.loadGUID(scene.textureOptions[i].id);
-                            scene.textureOptions[i].initialize();
-                        }
-                        if (!engine.database) return [
-                            3,
-                            3
-                        ];
-                        return [
-                            4,
-                            engine.createVFXItems(scene)
-                        ];
-                    case 2:
-                        _state.sent();
-                        _state.label = 3;
-                    case 3:
-                        composition = new ThreeComposition(_extends({}, opts, {
-                            width: _this.width,
-                            height: _this.height,
-                            renderer: _this.renderer,
-                            handleItemMessage: function(message) {
-                                _this.dispatchEvent({
-                                    type: "message",
-                                    message: message
-                                });
-                            }
-                        }), scene);
-                        composition.on("end", function() {
-                            _this.dispatchEvent({
-                                type: "end",
-                                composition: composition
-                            });
-                        });
-                        _this.renderer.engine.setOptions({
-                            threeCamera: _this.camera,
-                            threeGroup: _this,
-                            composition: composition
-                        });
-                        if (opts.autoplay) {
-                            composition.play();
-                        } else {
-                            composition.pause();
-                        }
-                        firstFrameTime = performance.now() - last + composition.statistic.loadTime;
-                        composition.statistic.firstFrameTime = firstFrameTime;
-                        logger.info("First frame: [" + composition.name + "]" + firstFrameTime.toFixed(4) + "ms.");
-                        _this.compositions.push(composition);
-                        return [
-                            2,
-                            composition
-                        ];
-                }
-            });
-        })();
-    };
     /**
    *
    * @param delta
@@ -33746,7 +33701,7 @@ setMaxSpriteMeshItemCount(8);
  */ Mesh.create = function(engine, props) {
     return new ThreeMesh(engine, props);
 };
-var version = "2.3.0-beta.2";
+var version = "2.3.0";
 logger.info("THREEJS plugin version: " + version + ".");
 
 exports.AbstractPlugin = AbstractPlugin;