@galacean/effects-plugin-model 2.8.0-alpha.0 → 2.8.0-alpha.2

package/dist/loader.mjs

@@ -3,11 +3,11 @@
  * Description: Galacean Effects player model plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 飂兮
- * Version: v2.8.0-alpha.0
+ * Version: v2.8.0-alpha.2
  */
 
 import * as EFFECTS from '@galacean/effects';
-import { math, Transform, spec, PLAYER_OPTIONS_ENV_EDITOR, glContext, Material, Mesh, Geometry, ShaderFactory, effectsClass, GLSLVersion, VFXItem, Behaviour, AbstractPlugin, registerPlugin, logger, RendererComponent, HitTestType, AnimationClip, TextureSourceType, Texture, DestroyOptions, RenderPassDestroyAttachmentType, getDefaultTextureFactory, Player, loadImage, generateGUID, addItem, removeItem, glType2VertexFormatType, Downloader, getStandardJSON, isObject } from '@galacean/effects';
+import { math, Transform, spec, PLAYER_OPTIONS_ENV_EDITOR, glContext, Material, Mesh, Geometry, ShaderFactory, effectsClass, GLSLVersion, VFXItem, AbstractPlugin, Behaviour, registerPlugin, logger, RendererComponent, HitTestType, AnimationClip, TextureSourceType, Texture, DestroyOptions, RenderPassDestroyAttachmentType, getDefaultTextureFactory, Player, loadImage, generateGUID, addItem, removeItem, glType2VertexFormatType, Downloader, getStandardJSON, isObject } from '@galacean/effects';
 
 var Vector2 = math.Vector2, Vector3 = math.Vector3, Vector4 = math.Vector4, Matrix3 = math.Matrix3, Matrix4 = math.Matrix4, Color = math.Color, Euler = math.Euler, EulerOrder = math.EulerOrder, Quaternion = math.Quaternion, Box3 = math.Box3; math.Sphere; math.Ray; var DEG2RAD = math.DEG2RAD;
 
@@ -1361,8 +1361,55 @@ function getQuadFilterVS() {
         return _this;
     }
     var _proto = ModelPlugin.prototype;
-    _proto.precompile = function precompile(compositions, renderer) {
-        var isWebGL2 = renderer.engine.gpuCapability.level === 2;
+    _proto.processAssets = function processAssets(scene, options) {
+        return _async_to_generator(function() {
+            return __generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        return [
+                            4,
+                            CompositionCache.loadStaticResources()
+                        ];
+                    case 1:
+                        _state.sent();
+                        return [
+                            2
+                        ];
+                }
+            });
+        })();
+    };
+    /**
+   * 整个 load 阶段都不会创建 GL 相关的对象，只创建 JS 对象
+   * @param scene - 场景
+   * @param options - 加载选项
+   */ _proto.prepareResource = function prepareResource(scene, options, engine) {
+        var _options_pluginData;
+        if (options.pluginData !== undefined) {
+            var keyList = [
+                "compatibleMode",
+                "renderSkybox",
+                "visBoundingBox",
+                "autoAdjustScene",
+                "enableDynamicSort",
+                "renderMode3D",
+                "renderMode3DUVGridSize"
+            ];
+            var pluginData = options.pluginData;
+            keyList.forEach(function(key) {
+                return scene.storage[key] = pluginData[key];
+            });
+        }
+        var _options_env;
+        //
+        var runtimeEnv = (_options_env = options.env) != null ? _options_env : "";
+        scene.storage["runtimeEnv"] = runtimeEnv;
+        var _options_pluginData_compatibleMode;
+        var compatibleMode = (_options_pluginData_compatibleMode = (_options_pluginData = options.pluginData) == null ? void 0 : _options_pluginData["compatibleMode"]) != null ? _options_pluginData_compatibleMode : "gltf";
+        //
+        PluginHelper.preprocessScene(scene, runtimeEnv, compatibleMode);
+        // Add PBR and Unlit shader data
+        var isWebGL2 = engine.gpuCapability.level === 2;
         var pbrShaderCode = fetchPBRShaderCode();
         var unlitShaderCode = fetchUnlitShaderCode();
         var pbrShaderData = {
@@ -1383,25 +1430,14 @@ function getQuadFilterVS() {
             // @ts-expect-error
             glslVersion: isWebGL2 ? GLSLVersion.GLSL3 : GLSLVersion.GLSL1
         };
-        renderer.engine.addEffectsObjectData(pbrShaderData);
-        renderer.engine.addEffectsObjectData(unlitShaderData);
-        return Promise.resolve();
+        engine.addEffectsObjectData(pbrShaderData);
+        engine.addEffectsObjectData(unlitShaderData);
     };
     /**
    * 创建 3D 场景管理器和缓存器
    * @param composition - 合成
    * @param scene - 场景
    */ _proto.onCompositionConstructed = function onCompositionConstructed(composition, scene) {
-        this.sceneParams = scene.storage;
-        var engine = composition.renderer.engine;
-        this.cache = new CompositionCache(engine);
-        this.cache.setup(false);
-    };
-    /**
-   * 每次播放都会执行，包括重播，所以这里执行“小的销毁”和新的初始化
-   * @param composition - 合成
-   * @param renderFrame - 渲染帧
-   */ _proto.onCompositionReset = function onCompositionReset(composition, renderFrame) {
         var props = {
             id: "ModelPluginItem",
             name: "ModelPluginItem",
@@ -1410,72 +1446,14 @@ function getQuadFilterVS() {
         };
         var item = new VFXItem(composition.getEngine(), props);
         composition.addItem(item);
-        //
-        var comp = item.addComponent(ModelPluginComponent);
-        comp.fromData({
-            cache: this.cache
-        });
-        comp.initial(this.sceneParams);
-    };
-    /**
-   * 合成销毁，同时销毁 3D 场景对象和缓存
-   * @param composition - 合成
-   */ _proto.onCompositionDestroyed = function onCompositionDestroyed(composition) {
-        this.cache.dispose();
-        // @ts-expect-error
-        this.cache = null;
-        // @ts-expect-error
-        this.sceneParams = null;
-    };
-    /**
-   * 整个 load 阶段都不会创建 GL 相关的对象，只创建 JS 对象
-   * @param scene - 场景
-   * @param options - 加载选项
-   */ ModelPlugin.prepareResource = function prepareResource(scene, options) {
-        return _async_to_generator(function() {
-            var _options_pluginData, keyList, pluginData, _options_env, runtimeEnv, _options_pluginData_compatibleMode, compatibleMode;
-            return __generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        if (options.pluginData !== undefined) {
-                            keyList = [
-                                "compatibleMode",
-                                "renderSkybox",
-                                "visBoundingBox",
-                                "autoAdjustScene",
-                                "enableDynamicSort",
-                                "renderMode3D",
-                                "renderMode3DUVGridSize"
-                            ];
-                            pluginData = options.pluginData;
-                            keyList.forEach(function(key) {
-                                return scene.storage[key] = pluginData[key];
-                            });
-                        }
-                        //
-                        runtimeEnv = (_options_env = options.env) != null ? _options_env : "";
-                        scene.storage["runtimeEnv"] = runtimeEnv;
-                        compatibleMode = (_options_pluginData_compatibleMode = (_options_pluginData = options.pluginData) == null ? void 0 : _options_pluginData["compatibleMode"]) != null ? _options_pluginData_compatibleMode : "gltf";
-                        //
-                        PluginHelper.preprocessScene(scene, runtimeEnv, compatibleMode);
-                        return [
-                            4,
-                            CompositionCache.loadStaticResources()
-                        ];
-                    case 1:
-                        _state.sent();
-                        return [
-                            2
-                        ];
-                }
-            });
-        })();
+        var modelPluginComponent = item.addComponent(ModelPluginComponent);
+        modelPluginComponent.sceneParams = scene.storage;
     };
     return ModelPlugin;
 }(AbstractPlugin);
 var ModelPluginComponent = /*#__PURE__*/ function(Behaviour) {
     _inherits(ModelPluginComponent, Behaviour);
-    function ModelPluginComponent(engine, options) {
+    function ModelPluginComponent(engine) {
         var _this;
         _this = Behaviour.call(this, engine) || this;
         _this.runtimeEnv = PLAYER_OPTIONS_ENV_EDITOR;
@@ -1495,12 +1473,15 @@ var ModelPluginComponent = /*#__PURE__*/ function(Behaviour) {
    * UV 渲染模式中，指定棋盘格的大小，相对于大小为 1 的纹理
    * 取值范围(0, 1)
    */ _this.renderMode3DUVGridSize = 1 / 16;
-        if (options) {
-            _this.fromData(options);
-        }
         return _this;
     }
     var _proto = ModelPluginComponent.prototype;
+    _proto.onAwake = function onAwake() {
+        this.cache = new CompositionCache(this.engine);
+        this.cache.setup(false);
+        this.scene = new PSceneManager(this.engine);
+        this.initial(this.sceneParams);
+    };
     /**
    * 组件后更新，合成相机和场景管理器更新
    * @param dt - 更新间隔
@@ -1556,20 +1537,11 @@ var ModelPluginComponent = /*#__PURE__*/ function(Behaviour) {
         this.scene.dispose();
         // @ts-expect-error
         this.scene = null;
+        this.cache.dispose();
         // @ts-expect-error
         this.cache = null;
     };
     /**
-   * 反序列化，创建场景管理器
-   * @param date - 组件参数
-   */ _proto.fromData = function fromData(data) {
-        Behaviour.prototype.fromData.call(this, data);
-        //
-        var options = data;
-        this.cache = options.cache;
-        this.scene = new PSceneManager(this.engine);
-    };
-    /**
    * 组件初始化，初始化场景管理器并更新合成相机
    * @param sceneParams - 场景参数
    */ _proto.initial = function initial(sceneParams) {
@@ -2093,10 +2065,10 @@ var CameraGestureHandlerImp = /*#__PURE__*/ function() {
     return CameraGestureHandlerImp;
 }();
 
-registerPlugin("model", ModelPlugin, VFXItem);
+registerPlugin("model", ModelPlugin);
 /**
  * 插件版本号
- */ var version = "2.8.0-alpha.0";
+ */ var version = "2.8.0-alpha.2";
 logger.info("Plugin model version: " + version + ".");
 if (version !== EFFECTS.version) {
     console.error("注意：请统一 Model 插件与 Player 版本，不统一的版本混用会有不可预知的后果！", "\nAttention: Please ensure the Model plugin is synchronized with the Player version. Mixing and matching incompatible versions may result in unpredictable consequences!");
@@ -3258,8 +3230,7 @@ var normal = new Vector3();
                 geometries: DestroyOptions.destroy
             },
             depthStencilAttachment: RenderPassDestroyAttachmentType.force,
-            colorAttachment: RenderPassDestroyAttachmentType.force,
-            semantics: DestroyOptions.destroy
+            colorAttachment: RenderPassDestroyAttachmentType.force
         });
     };
     /**