@galacean/effects-plugin-model 2.3.0-alpha.2 → 2.3.0-beta.1

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player model plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 飂兮
- * Version: v2.3.0-alpha.2
+ * Version: v2.3.0-beta.1
  */
 
 'use strict';
@@ -2139,11 +2139,10 @@ exports.ModelCameraComponent = /*#__PURE__*/ function(Behaviour) {
         this.content.matrix = this.transform.getWorldMatrix();
         var composition = this.item.composition;
         if (composition) {
-            composition.camera.position = this.transform.position.clone();
-            composition.camera.setQuat(this.transform.quat);
             composition.camera.near = this.content.nearPlane;
             composition.camera.far = this.content.farPlane;
             composition.camera.fov = this.content.fov;
+            composition.camera.setTransform(this.transform);
         }
     };
     /**
@@ -3513,86 +3512,6 @@ var normal = new Vector3();
         }
     };
     /**
-   * 设置 3D 元素参数，在播放器创建 3D 元素前
-   * @param scene - 场景
-   * @param cache - 缓存
-   * @param composition - 合成
-   * @returns
-   */ PluginHelper.setupItem3DOptions = function setupItem3DOptions(scene, cache, composition) {
-        var _this = this;
-        if (scene === undefined || scene.bins.length <= 0) {
-            return;
-        }
-        var jsonScene = scene.jsonScene;
-        var compIndexSet = new Set();
-        if (jsonScene.compositionId === undefined) {
-            compIndexSet.add(0);
-        }
-        jsonScene.compositions.forEach(function(comp, index) {
-            if (comp.id === jsonScene.compositionId || composition.refCompositionProps.has(comp.id)) {
-                compIndexSet.add(index);
-            }
-        });
-        compIndexSet.forEach(function(compIndex) {
-            var sceneComp = jsonScene.compositions[compIndex];
-            sceneComp.items.forEach(function(data) {
-                var itemId = data.id;
-                var item = composition.getEngine().jsonSceneData[itemId];
-                if (item.type === EFFECTS.spec.ItemType.mesh) {
-                    var meshItem = item;
-                    var skin = meshItem.content.options.skin;
-                    var primitives = meshItem.content.options.primitives;
-                    primitives.forEach(function(prim, primId) {
-                        if (_instanceof1(prim.geometry, EFFECTS.Geometry)) {
-                            // 可能已经创建，直接返回
-                            return;
-                        }
-                        var name = "Geom_C" + compIndex + "_I" + itemId + "_P" + primId;
-                        var riGeometry = cache.getOrCreateGeometry(name, prim.geometry, scene.bins);
-                        var studioPrim = prim;
-                        studioPrim.geometry = riGeometry;
-                        var material = prim.material;
-                        if (material.type === EFFECTS.spec.MaterialType.pbr) {
-                            var studioMat = studioPrim.material;
-                            studioMat.baseColorTexture = _this.getTextureObj(composition.textures, material.baseColorTexture);
-                            studioMat.metallicRoughnessTexture = _this.getTextureObj(composition.textures, material.metallicRoughnessTexture);
-                            studioMat.normalTexture = _this.getTextureObj(composition.textures, material.normalTexture);
-                            studioMat.occlusionTexture = _this.getTextureObj(composition.textures, material.occlusionTexture);
-                            studioMat.emissiveTexture = _this.getTextureObj(composition.textures, material.emissiveTexture);
-                        } else {
-                            var studioMat1 = studioPrim.material;
-                            studioMat1.baseColorTexture = _this.getTextureObj(composition.textures, material.baseColorTexture);
-                        }
-                    });
-                    if (skin !== undefined && skin.inverseBindMatrices !== undefined) {
-                        var studioSkin = skin;
-                        var inverseBindMatrices = typedArrayFromBinary(scene.bins, skin.inverseBindMatrices);
-                        if (_instanceof1(inverseBindMatrices, Float32Array)) {
-                            studioSkin.inverseBindMatrices = inverseBindMatrices;
-                        } else {
-                            console.error("setupItem3DOptions: Invalid inverseBindMatrices type, " + inverseBindMatrices + ".");
-                        }
-                    }
-                } else if (item.type === EFFECTS.spec.ItemType.skybox) {
-                    var skybox = item;
-                    var studioSkybox = item;
-                    var options = skybox.content.options;
-                    var studioOptions = studioSkybox.content.options;
-                    var specularImage = _this.getTextureObj(composition.textures, options.specularImage);
-                    if (specularImage === undefined) {
-                        console.error("setupItem3DOptions: skybox specualrImage is undefined, " + CheckerHelper.stringify(options) + ".");
-                    }
-                    studioOptions.specularImage = specularImage;
-                    //
-                    var diffuseImage = _this.getTextureObj(composition.textures, options.diffuseImage);
-                    if (diffuseImage !== undefined) {
-                        studioOptions.diffuseImage = diffuseImage;
-                    }
-                }
-            });
-        });
-    };
-    /**
    * 创建几何体，根据几何参数描述 JSON 和数据数组
    * @param engine - 引擎
    * @param geomJson - 几何参数描述 JSON
@@ -9329,6 +9248,32 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
         return _this;
     }
     var _proto = ModelPlugin.prototype;
+    _proto.precompile = function precompile(compositions, renderer) {
+        var isWebGL2 = renderer.engine.gpuCapability.level === 2;
+        var pbrShaderCode = fetchPBRShaderCode();
+        var unlitShaderCode = fetchUnlitShaderCode();
+        var pbrShaderData = {
+            id: PBRShaderGUID,
+            name: "PBR Shader",
+            dataType: EFFECTS.spec.DataType.Shader,
+            fragment: pbrShaderCode.fragmentShaderCode,
+            vertex: pbrShaderCode.vertexShaderCode,
+            // @ts-expect-error
+            glslVersion: isWebGL2 ? EFFECTS.GLSLVersion.GLSL3 : EFFECTS.GLSLVersion.GLSL1
+        };
+        var unlitShaderData = {
+            id: UnlitShaderGUID,
+            name: "Unlit Shader",
+            dataType: EFFECTS.spec.DataType.Shader,
+            fragment: unlitShaderCode.fragmentShaderCode,
+            vertex: unlitShaderCode.vertexShaderCode,
+            // @ts-expect-error
+            glslVersion: isWebGL2 ? EFFECTS.GLSLVersion.GLSL3 : EFFECTS.GLSLVersion.GLSL1
+        };
+        renderer.engine.addEffectsObjectData(pbrShaderData);
+        renderer.engine.addEffectsObjectData(unlitShaderData);
+        return Promise.resolve();
+    };
     /**
    * 创建 3D 场景管理器和缓存器
    * @param composition - 合成
@@ -9338,8 +9283,6 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
         var engine = composition.renderer.engine;
         this.cache = new CompositionCache(engine);
         this.cache.setup(false);
-    // FIXME: 先注释元素参数的配置
-    //PluginHelper.setupItem3DOptions(scene, this.cache, composition);
     };
     /**
    * 每次播放都会执行，包括重播，所以这里执行“小的销毁”和新的初始化
@@ -9415,32 +9358,6 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
             });
         })();
     };
-    ModelPlugin.precompile = function precompile(compositions, renderer) {
-        var isWebGL2 = renderer.engine.gpuCapability.level === 2;
-        var pbrShaderCode = fetchPBRShaderCode();
-        var unlitShaderCode = fetchUnlitShaderCode();
-        var pbrShaderData = {
-            id: PBRShaderGUID,
-            name: "PBR Shader",
-            dataType: EFFECTS.spec.DataType.Shader,
-            fragment: pbrShaderCode.fragmentShaderCode,
-            vertex: pbrShaderCode.vertexShaderCode,
-            // @ts-expect-error
-            glslVersion: isWebGL2 ? EFFECTS.GLSLVersion.GLSL3 : EFFECTS.GLSLVersion.GLSL1
-        };
-        var unlitShaderData = {
-            id: UnlitShaderGUID,
-            name: "Unlit Shader",
-            dataType: EFFECTS.spec.DataType.Shader,
-            fragment: unlitShaderCode.fragmentShaderCode,
-            vertex: unlitShaderCode.vertexShaderCode,
-            // @ts-expect-error
-            glslVersion: isWebGL2 ? EFFECTS.GLSLVersion.GLSL3 : EFFECTS.GLSLVersion.GLSL1
-        };
-        renderer.engine.addEffectsObjectData(pbrShaderData);
-        renderer.engine.addEffectsObjectData(unlitShaderData);
-        return Promise.resolve();
-    };
     return ModelPlugin;
 }(EFFECTS.AbstractPlugin);
 exports.ModelPluginComponent = /*#__PURE__*/ function(Behaviour) {
@@ -13295,7 +13212,7 @@ var GLTFHelper = /*#__PURE__*/ function() {
 EFFECTS.registerPlugin("model", ModelPlugin, EFFECTS.VFXItem);
 /**
  * 插件版本号
- */ var version = "2.3.0-alpha.2";
+ */ var version = "2.3.0-beta.1";
 EFFECTS.logger.info("Plugin model version: " + version + ".");
 if (version !== EFFECTS__namespace.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!");