@galacean/effects-plugin-model 2.0.0-alpha.23 → 2.0.0-alpha.25

package/dist/gltf/json-converter.d.ts

@@ -1,12 +1,12 @@
 import { spec, Downloader } from '@galacean/effects';
-import type { Engine, Player, Renderer, GeometryProps } from '@galacean/effects';
+import type { Engine, Renderer, GeometryProps } from '@galacean/effects';
 export declare class JSONConverter {
+    renderer: Renderer;
     newScene: spec.JSONScene;
     engine: Engine;
-    renderer: Renderer;
     downloader: Downloader;
     treeInfo: TreeInfo;
-    constructor(player: Player);
+    constructor(renderer: Renderer);
     processScene(sceneData: string | Record<string | symbol, unknown>): Promise<spec.JSONScene>;
     setImage(newScene: spec.JSONScene, oldScene: spec.JSONScene): void;
     setTexture(newScene: spec.JSONScene, oldScene: spec.JSONScene): Promise<void>;

package/dist/index.js

@@ -3,7 +3,7 @@
  * Description: Galacean Effects player model plugin
  * Author: Ant Group CO., Ltd.
  * Contributors: 飂兮
- * Version: v2.0.0-alpha.23
+ * Version: v2.0.0-alpha.25
  */
 
 'use strict';
@@ -1898,6 +1898,9 @@ var deg2rad = Math.PI / 180;
    * Y 轴上视角
    */ _this.fov = 45;
         /**
+   * 视图矩阵
+   */ _this.viewportMatrix = Matrix4.fromIdentity();
+        /**
    * 纵横比
    */ _this.aspect = 1.0;
         /**
@@ -1938,6 +1941,7 @@ var deg2rad = Math.PI / 180;
         }
         var reverse = this.clipMode === EFFECTS.spec.CameraClipMode.portrait;
         this.projectionMatrix.perspective(this.fov * deg2rad, this.aspect, this.nearPlane, this.farPlane, reverse);
+        this.projectionMatrix.premultiply(this.viewportMatrix);
         this.viewMatrix = this.matrix.invert();
     };
     /**
@@ -1946,7 +1950,7 @@ var deg2rad = Math.PI / 180;
    * @returns 投影矩阵
    */ _proto.getNewProjectionMatrix = function getNewProjectionMatrix(fov) {
         var reverse = this.clipMode === EFFECTS.spec.CameraClipMode.portrait;
-        return new Matrix4().perspective(Math.min(fov * 1.25, 140) * deg2rad, this.aspect, this.nearPlane, this.farPlane, reverse);
+        return new Matrix4().perspective(Math.min(fov * 1.25, 140) * deg2rad, this.aspect, this.nearPlane, this.farPlane, reverse).premultiply(this.viewportMatrix);
     };
     /**
    * 计算视角中的包围盒大小
@@ -2083,15 +2087,17 @@ var deg2rad = Math.PI / 180;
     };
     /**
    * 更新默认相机状态，并计算新的透视和相机矩阵
-   * @param fovy - 视角
+   * @param fov - 视角
+   * @param viewportMatrix - 视图矩阵
    * @param aspect - 纵横比
    * @param nearPlane - 近裁剪平面
    * @param farPlane - 远裁剪平面
    * @param position - 位置
    * @param rotation - 旋转
    * @param clipMode - 剪裁模式
-   */ _proto.updateDefaultCamera = function updateDefaultCamera(fovy, aspect, nearPlane, farPlane, position, rotation, clipMode) {
-        this.defaultCamera.fov = fovy;
+   */ _proto.updateDefaultCamera = function updateDefaultCamera(fov, viewportMatrix, aspect, nearPlane, farPlane, position, rotation, clipMode) {
+        this.defaultCamera.fov = fov;
+        this.defaultCamera.viewportMatrix = viewportMatrix.clone();
         this.defaultCamera.aspect = aspect;
         this.defaultCamera.nearPlane = nearPlane;
         this.defaultCamera.farPlane = farPlane;
@@ -3759,12 +3765,12 @@ var EffectsMeshProxy = /*#__PURE__*/ function() {
     /**
    * 更新默认相机状态，根据传入的相机参数
    * @param camera - 相机参数
-   */ _proto.updateDefaultCamera = function updateDefaultCamera(camera) {
+   */ _proto.updateDefaultCamera = function updateDefaultCamera(camera, viewportMatrix) {
         var effectsTransfrom = new EFFECTS.Transform(_extends({}, camera, {
             valid: true
         }));
         var newTransform = new PTransform().fromEffectsTransform(effectsTransfrom);
-        this.cameraManager.updateDefaultCamera(camera.fov, camera.aspect, camera.near, camera.far, newTransform.getPosition(), newTransform.getRotation(), camera.clipMode);
+        this.cameraManager.updateDefaultCamera(camera.fov, viewportMatrix, camera.aspect, camera.near, camera.far, newTransform.getPosition(), newTransform.getRotation(), camera.clipMode);
     };
     /**
    * 更新插件场景，需要更新内部的相关的插件对象，特别是 Mesh 对象的骨骼动画
@@ -9906,7 +9912,7 @@ exports.ModelPluginComponent = /*#__PURE__*/ function(ItemBehaviour) {
    * @param composition - 当前合成对象
    * @param sceneManager - 当前合成对象绑定的 SceneManager
    */ _proto.updateSceneCamera = function updateSceneCamera(composition) {
-        this.scene.updateDefaultCamera(composition.camera.getOptions());
+        this.scene.updateDefaultCamera(composition.camera.getOptions(), composition.camera.getViewportMatrix());
     };
     _proto.getLightItemCount = function getLightItemCount() {
         var _this_item_composition;
@@ -10661,10 +10667,10 @@ var LoaderHelper = /*#__PURE__*/ function() {
 }();
 
 var JSONConverter = /*#__PURE__*/ function() {
-    function JSONConverter(player) {
+    function JSONConverter(renderer) {
+        this.renderer = renderer;
         this.treeInfo = new TreeInfo();
-        this.engine = player.renderer.engine;
-        this.renderer = player.renderer;
+        this.engine = renderer.engine;
         this.downloader = new EFFECTS.Downloader();
     }
     var _proto = JSONConverter.prototype;
@@ -13782,7 +13788,7 @@ var GLTFHelper = /*#__PURE__*/ function() {
 
 EFFECTS.registerPlugin("tree", ModelTreePlugin, EFFECTS.VFXItem, true);
 EFFECTS.registerPlugin("model", ModelPlugin, EFFECTS.VFXItem);
-var version = "2.0.0-alpha.23";
+var version = "2.0.0-alpha.25";
 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!");