soonspacejs 2.6.9 → 2.6.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soonspacejs",
-  "version": "2.6.9",
+  "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": "e88a2bd8a1ed89d6cbf041ba88e4bb9ac8d5c047"
+  "gitHead": "405584a5f5ee9a5062d4ddbad58b2b91511dbe72"
 }

package/types/Animation/createPathAnimation.d.ts

@@ -0,0 +1,40 @@
+import { CreateCurveAnimationClipOptions, BonePathAnimationOptions, AnimationOperate, BonePathAnimationInfo as CreateBonePathAnimationResult } from '@three3d/animation';
+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';
+/**
+ * 动画的路径
+ */
+export type AnimationPath = IVector3[] | Curve<Vector3> | Topology;
+/**
+ * 格式化动画路径信息
+ * @param path
+ * @returns
+ */
+export declare function formatAnimationPath(path: AnimationPath): {
+    curve?: Curve<Vector3> | undefined;
+    points?: Vector3[] | undefined;
+};
+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 {
+    /**
+     * 眼睛高度
+     */
+    eyeHeight?: number;
+}
+export type CreatePathAnimationActionForCameraOptions = CreatePathAnimationActionForCameraOptions_Base & CreatePathAnimationOptions;
+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;
+};
+/**
+  * 创建骨骼路径动画
+  * @param options
+  * @returns
+  */
+export declare function createBonePathAnimation(model: Object3D, path: AnimationPath, ssp: SoonSpace, options: CreateBonePathAnimationOptions): BonePathAnimationInfo;

package/types/Controls/OrbitControls.d.ts

@@ -1,4 +1,4 @@
-import { EventDispatcher, MOUSE, OrthographicCamera, PerspectiveCamera, TOUCH, Vector3 } from 'three';
+import { EventDispatcher, OrthographicCamera, PerspectiveCamera, Vector3 } from 'three';
 import { OrbitControlsProperties } from '../Interface';
 declare class OrbitControls extends EventDispatcher implements OrbitControlsProperties {
     object: PerspectiveCamera | OrthographicCamera;
@@ -40,13 +40,13 @@ declare class OrbitControls extends EventDispatcher implements OrbitControlsProp
         BOTTOM: string;
     };
     mouseButtons: {
-        LEFT: MOUSE;
-        MIDDLE: MOUSE;
-        RIGHT: MOUSE;
+        LEFT: 0;
+        MIDDLE: 1;
+        RIGHT: 2;
     };
     touches: {
-        ONE: TOUCH;
-        TWO: TOUCH;
+        ONE: 0 | 1;
+        TWO: 2 | 3;
     };
     target0: Vector3;
     position0: Vector3;

package/types/Interface/base.d.ts

@@ -1,4 +1,4 @@
-import { Color } from 'three';
+import { ColorRepresentation } from 'three';
 interface Interpolate {
     t: number;
 }
@@ -19,7 +19,7 @@ interface IVector3 extends IVector2 {
 type Position = IVector3;
 type Rotation = IVector3;
 type Scale = IVector3;
-type IColor = string | number | Color;
+type IColor = ColorRepresentation;
 interface Level {
     max: number | null;
     min: number | null;

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,4 +1,5 @@
-import { Mesh, Clock, Scene, PerspectiveCamera, WebGLRenderer, PMREMGenerator, Vector3, AnimationMixer, Raycaster, Intersection, Object3D, AnimationAction, AnimationClip, Texture } from 'three';
+/// <reference types="stats.js" />
+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';
@@ -15,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;
 };
@@ -90,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,10 +7,12 @@
                                |_|                   |__/
 */
 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';
 import { PathAnimation, PathAnimationOptions } from './Animation/path-animation';
+import { CreatePathAnimationOptions, CreatePathAnimationActionForCameraOptions, CreateBonePathAnimationOptions, AnimationPath } from './Animation/createPathAnimation';
 import * as library from './Library';
 import { BaseObject3D, BaseObject3DInfo, Model, ModelInfo, Poi, PoiInfo, PoiNode, PoiNodeInfo, Topology, TopologyInfo, Group, GroupInfo, Canvas3D, Canvas3DInfo, PluginObject, PluginObjectInfo } from './Library';
 import Viewport from './Viewport';
@@ -29,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;
@@ -326,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
@@ -477,12 +481,12 @@ export declare class SoonSpace {
      * @param object
      * @param options
      */
-    edgeShow(object: BaseObject3D | BaseObject3D[], options?: EdgeSelectOptions): Promise<void>;
+    edgeShow(object: Object3D | Object3D[], options?: EdgeSelectOptions): Promise<void>;
     /**
      * 取消轮廓显示模型
      * @param objects
      */
-    unEdgeShow(objects?: BaseObject3D | BaseObject3D[]): Promise<void | void[]>;
+    unEdgeShow(objects?: Object3D | Object3D[]): Promise<void | void[]>;
     /**
      * 描边显示模型
      * @param object
@@ -1302,5 +1306,30 @@ export declare class SoonSpace {
      * @returns
      */
     createTopologyAnimation(target: Object3D, topology: Topology, options?: PathAnimationOptions): PathAnimation;
+    /**
+     * 创建沿路径运动的动画 action
+     *
+     * @param target
+     * @param path
+     * @param options
+     * @returns 返回 AnimationOperate，它是对 AnimationAction 的扩展
+     */
+    createPathAnimationAction(target: Object3D, path: AnimationPath, options: CreatePathAnimationOptions): AnimationOperate | undefined;
+    /**
+     * 创建相机动画
+     * @param path
+     * @param mixer
+     * @param options
+     * @returns
+     */
+    createPathAnimationActionForCamera(path: AnimationPath, options?: CreatePathAnimationActionForCameraOptions & {
+        camera?: Camera;
+    }): AnimationOperate | undefined;
+    /**
+     * 创建骨骼路径动画
+     * @param options
+     * @returns
+     */
+    createBonePathAnimation(model: Object3D, path: AnimationPath, options: CreateBonePathAnimationOptions): import("./Animation/createPathAnimation").BonePathAnimationInfo;
 }
 export default SoonSpace;