soonspacejs 2.6.10 → 2.6.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.6.10",
+  "version": "2.6.11",
   "homepage": "http://www.xwbuilders.com:8800/",
   "description": "soonspacejs 2.x",
   "module": "./dist/index.esm.js",
@@ -28,5 +28,5 @@
   "peerDependencies": {
     "three": ">=0.150.1"
   },
-  "gitHead": "7ea34202f269224509f8da784a857c8b91011e6a"
+  "gitHead": "405584a5f5ee9a5062d4ddbad58b2b91511dbe72"
 }

package/types/Animation/createPathAnimation.d.ts

@@ -1,8 +1,10 @@
 import { CreateCurveAnimationClipOptions, BonePathAnimationOptions, AnimationOperate, BonePathAnimationInfo as CreateBonePathAnimationResult } from '@three3d/animation';
-import type { AnimationMixer, Camera, Curve, Object3D } from 'three';
+import type { Camera, Curve, Object3D } from 'three';
 import { Vector3 } from 'three';
 import type { IVector3 } from '../Interface';
 import { Topology } from '../Library';
+import { VectorMembersToIVectors } from '@three3d/tools';
+import type { SoonSpace } from '../index';
 /**
  * 动画的路径
  */
@@ -16,8 +18,8 @@ export declare function formatAnimationPath(path: AnimationPath): {
     curve?: Curve<Vector3> | undefined;
     points?: Vector3[] | undefined;
 };
-export type CreatePathAnimationOptions = Omit<CreateCurveAnimationClipOptions, 'target' | 'curve' | 'points'>;
-export declare function createPathAnimation(target: Object3D, path: AnimationPath, mixer: AnimationMixer, options?: CreatePathAnimationOptions): AnimationOperate;
+export type CreatePathAnimationOptions = VectorMembersToIVectors<Omit<CreateCurveAnimationClipOptions, 'target' | 'curve' | 'points'>>;
+export declare function createPathAnimation(target: Object3D, path: AnimationPath, ssp: SoonSpace, options?: CreatePathAnimationOptions): AnimationOperate | undefined;
 export interface CreatePathAnimationActionForCameraOptions_Base {
     /**
      * 眼睛高度
@@ -25,8 +27,8 @@ export interface CreatePathAnimationActionForCameraOptions_Base {
     eyeHeight?: number;
 }
 export type CreatePathAnimationActionForCameraOptions = CreatePathAnimationActionForCameraOptions_Base & CreatePathAnimationOptions;
-export declare function createPathAnimationActionForCamera(camera: Camera, path: IVector3[] | Curve<Vector3> | Topology, mixer: AnimationMixer, options?: CreatePathAnimationActionForCameraOptions): AnimationOperate;
-export type CreateBonePathAnimationOptions = Omit<BonePathAnimationOptions, 'mixer' | 'model'>;
+export declare function createPathAnimationActionForCamera(camera: Camera, path: IVector3[] | Curve<Vector3> | Topology, ssp: SoonSpace, options?: CreatePathAnimationActionForCameraOptions): AnimationOperate | undefined;
+export type CreateBonePathAnimationOptions = VectorMembersToIVectors<Omit<BonePathAnimationOptions, 'mixer' | 'model'>>;
 export type BonePathAnimationInfo = Omit<CreateBonePathAnimationResult, 'action'> & {
     action: AnimationOperate;
 };
@@ -35,4 +37,4 @@ export type BonePathAnimationInfo = Omit<CreateBonePathAnimationResult, 'action'
   * @param options
   * @returns
   */
-export declare function createBonePathAnimation(model: Object3D, path: AnimationPath, mixer: AnimationMixer, options: CreateBonePathAnimationOptions): BonePathAnimationInfo;
+export declare function createBonePathAnimation(model: Object3D, path: AnimationPath, ssp: SoonSpace, options: CreateBonePathAnimationOptions): BonePathAnimationInfo;

package/types/Interface/viewport.d.ts

@@ -90,6 +90,10 @@ interface ViewportOptions {
 }
 interface ViewportState {
     useFreq: number;
+    /**
+     * 是否启用后处理
+     */
+    enabledPostprocessing: boolean;
     /**
      * 是否暂停 render
      */

package/types/Viewport/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="stats.js" />
-import { Mesh, Clock, Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Raycaster, Intersection, Object3D, AnimationAction, AnimationClip, Texture } from 'three';
+import { Mesh, Clock, Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Raycaster, Intersection, Object3D, AnimationClip, Texture } from 'three';
 import { EffectComposer } from 'postprocessing';
 import Stats from 'three/examples/jsm/libs/stats.module.js';
 import { Sky } from 'three/examples/jsm/objects/Sky.js';
@@ -16,6 +16,7 @@ import { License } from '../License';
 import Info from './Info';
 import { ViewHelper } from './ViewHelper';
 import { WaterMark } from './WaterMark';
+import { AnimationOperate } from '@three3d/animation';
 export declare const innerRenderState: {
     needsUpdate: boolean;
 };
@@ -91,7 +92,7 @@ declare class Viewport {
     /**
      ***************************** modelAnimation ***************************
      */
-    playModelAnimation(model: Model, animation: number | AnimationClip | ModelAnimationFindFunc): AnimationAction | undefined;
+    playModelAnimation(model: Model, animation: number | AnimationClip | ModelAnimationFindFunc): AnimationOperate | undefined;
     stopModelAnimation(model: Model, animation: number | AnimationClip | ModelAnimationFindFunc): void;
     /**
      ***************************** render ***************************

package/types/index.d.ts

@@ -7,7 +7,7 @@
                                |_|                   |__/
 */
 import * as THREE from 'three';
-import { Object3D, Vector3, Euler, Box3, AnimationClip, AnimationAction, Light, Texture, Mesh } from 'three';
+import { Object3D, Vector3, Euler, Box3, AnimationClip, Light, Texture, Mesh } from 'three';
 import type { Camera } from 'three';
 import * as shared from './Shared';
 import Animation from './Animation';
@@ -31,6 +31,8 @@ export interface SoonSpaceConstructor {
 export * from 'three';
 export * from './Interface';
 export * from './tools';
+import type { AnimationOperate } from '@three3d/animation';
+export * from '@three3d/animation';
 export declare class SoonSpace {
     static readonly THREE: typeof THREE;
     readonly THREE: typeof THREE;
@@ -328,7 +330,7 @@ export declare class SoonSpace {
      * @param model
      * @param animation
      */
-    playModelAnimation(model: Model, animation: number | AnimationClip | ModelAnimationFindFunc): AnimationAction | undefined;
+    playModelAnimation(model: Model, animation: number | AnimationClip | ModelAnimationFindFunc): AnimationOperate | undefined;
     /**
      * 停止播放模型动画
      * @param model
@@ -1312,7 +1314,7 @@ export declare class SoonSpace {
      * @param options
      * @returns 返回 AnimationOperate，它是对 AnimationAction 的扩展
      */
-    createPathAnimationAction(target: Object3D, path: AnimationPath, options: CreatePathAnimationOptions): import("@three3d/animation").AnimationOperate;
+    createPathAnimationAction(target: Object3D, path: AnimationPath, options: CreatePathAnimationOptions): AnimationOperate | undefined;
     /**
      * 创建相机动画
      * @param path
@@ -1322,7 +1324,7 @@ export declare class SoonSpace {
      */
     createPathAnimationActionForCamera(path: AnimationPath, options?: CreatePathAnimationActionForCameraOptions & {
         camera?: Camera;
-    }): import("@three3d/animation").AnimationOperate;
+    }): AnimationOperate | undefined;
     /**
      * 创建骨骼路径动画
      * @param options