vis-core 0.25.2 → 0.25.4

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.25.2";
+declare const _default: "0.25.4";
 export default _default;

package/dist/vis/base/camera.d.ts

@@ -0,0 +1,24 @@
+import Pencil, { BaseObject } from 'gl-draw';
+import * as THREE from 'three';
+import Event from "./event";
+export default class Camera extends Event {
+    container: HTMLElement;
+    pencil: Pencil;
+    cameraState: Record<string, number[]>;
+    setSaveCamera(type: string): void;
+    useSaveCamera(type: string, enableTransition?: boolean): Promise<boolean>;
+    lookAt(positionX: number, positionY: number, positionZ: number, targetX: number, targetY: number, targetZ: number, enableTransition?: boolean, smoothTime?: number): Promise<void>;
+    truck(x: number, y: number, enableTransition?: boolean, smoothTime?: number): Promise<void>;
+    dollyTo(distance: number | `+=${number}` | `-=${number}` | `*=${number}` | `/=${number}`, enableTransition?: boolean, smoothTime?: number): Promise<void>;
+    absoluteAngle(targetAngle: number, sourceAngle: number): number;
+    lookAtTarget(ops: {
+        target?: THREE.Vector3;
+        distance?: number;
+        polarAngle?: number;
+        azimuthAngle?: number;
+    }, enableTransition?: boolean, smoothTime?: number): Promise<void>;
+    paddingInCssPixel(obj: BaseObject, top: number, right: number, bottom: number, left: number, enableTransition: boolean): Promise<void[]>;
+    resetCamera(enableTransition?: boolean, smoothTime?: number): Promise<void>;
+    unproject(e: MouseEvent, targetZ?: number): THREE.Vector3;
+    dispose(): void;
+}

package/dist/vis/base/index.d.ts

@@ -1,4 +1,4 @@
-import Pencil, { BaseObject, Lead } from 'gl-draw';
+import { BaseObject, Lead } from 'gl-draw';
 import leadObjs from "../all/objects";
 import MaterialList from "../all/MaterialList";
 import { Wk } from 'gl-draw/dist/plugins';
@@ -7,7 +7,7 @@ import { Node } from 'gl-draw/dist/objects';
 import Arc from "../all/objects/Arc";
 import { RoomEnvironment } from 'three/examples/jsm/environments/RoomEnvironment';
 import * as THREE from 'three';
-import Event from "./event";
+import Camera from "./camera";
 import Editor from "../../editor";
 export interface BaseOptions {
     container: HTMLElement;
@@ -22,9 +22,8 @@ export interface BaseOptions {
     tier?: number;
     [key: string]: any;
 }
-export default class Base extends Event {
+export default class Base extends Camera {
     static VisName: string;
-    container: HTMLElement;
     playing: boolean;
     leftTruck: boolean;
     options: BaseOptions;
@@ -33,7 +32,6 @@ export default class Base extends Event {
     settings: Record<string, any>;
     delLoadArr?: string[];
     extendsOptions: Record<string, any>;
-    pencil: Pencil;
     leadObjs: {
         Plane: typeof import("../all/objects/Plane").default;
         CrossPlane: typeof import("../all/objects/CrossPlane").default;
@@ -75,7 +73,6 @@ export default class Base extends Event {
     visName: string;
     editor?: Editor;
     tier0: boolean;
-    cameraState: Record<string, number[]>;
     publicDir: Record<string, string>;
     constructor(options: BaseOptions);
     setOptions(options: Record<string, any>): void;
@@ -105,8 +102,6 @@ export default class Base extends Event {
     mouseButtonsActiveStore: Record<string, any> | null;
     initSettings(): void;
     handleSetting(key: string, value: any): Promise<any>;
-    setSaveCamera(type: string): void;
-    useSaveCamera(type: string, enableTransition?: boolean): Promise<boolean>;
     show(): void;
     showAction(): void;
     hide(): void;
@@ -119,19 +114,6 @@ export default class Base extends Event {
         onTop?: number;
         type?: '3d' | '3dSprite';
     }): Promise<Node>;
-    lookAt(positionX: number, positionY: number, positionZ: number, targetX: number, targetY: number, targetZ: number, enableTransition?: boolean, smoothTime?: number): Promise<void>;
-    truck(x: number, y: number, enableTransition?: boolean, smoothTime?: number): Promise<void>;
-    dollyTo(distance: number | `+=${number}` | `-=${number}` | `*=${number}` | `/=${number}`, enableTransition?: boolean, smoothTime?: number): Promise<void>;
-    absoluteAngle(targetAngle: number, sourceAngle: number): number;
-    lookAtTarget(ops: {
-        target?: THREE.Vector3;
-        distance?: number;
-        polarAngle?: number;
-        azimuthAngle?: number;
-    }, enableTransition?: boolean, smoothTime?: number): Promise<void>;
-    paddingInCssPixel(obj: BaseObject, top: number, right: number, bottom: number, left: number, enableTransition: boolean): Promise<void[]>;
-    resetCamera(enableTransition?: boolean, smoothTime?: number): Promise<void>;
-    unproject(e: MouseEvent, targetZ?: number): THREE.Vector3;
     getRoomEnvMap(): THREE.Texture;
     handlePick(objArr: PickFunctionsItem['objArr'], type: PickFunctionsItem['type'], cb: PickFunctionsItem['cb']): void;
     getScreenPosition(x: number, y: number, z: number): {

package/dist/vis/map/index.d.ts

@@ -99,8 +99,16 @@ export default class extends Base {
         cX: number;
         cY: number;
         depth: number;
-        cameraPositon?: THREE.Vector3;
-        cameraTarget?: THREE.Vector3;
+        controls?: {
+            lookAt: [number, number, number, number, number, number];
+            polarAngle: number;
+            azimuthAngle: number;
+        };
+        userControls?: {
+            lookAt: [number, number, number, number, number, number];
+            polarAngle: number;
+            azimuthAngle: number;
+        };
     }[];
     get mapObj(): {
         map?: PlaneMap;
@@ -109,8 +117,16 @@ export default class extends Base {
         cX: number;
         cY: number;
         depth: number;
-        cameraPositon?: THREE.Vector3;
-        cameraTarget?: THREE.Vector3;
+        controls?: {
+            lookAt: [number, number, number, number, number, number];
+            polarAngle: number;
+            azimuthAngle: number;
+        };
+        userControls?: {
+            lookAt: [number, number, number, number, number, number];
+            polarAngle: number;
+            azimuthAngle: number;
+        };
     };
     get map(): PlaneMap | undefined;
     get mapInfo(): any;
@@ -182,12 +198,14 @@ export default class extends Base {
         saveBackCamvasState?: boolean;
         extrudelineBloom?: boolean;
     }): Promise<void>;
-    saveBackCamvasState(index: number): void;
+    saveCamvasState(type: 'userControls' | 'controls', index: number): void;
     fixNear(adcode: number): void;
-    fitTo(obj?: BaseObject, { polarAngle, azimuthAngle, enableTransition, }?: {
+    fitTo(obj?: BaseObject, { polarAngle, azimuthAngle, fixZ, handleStart, enableTransition, }?: {
         polarAngle?: number;
         azimuthAngle?: number;
         enableTransition?: boolean;
+        fixZ?: number;
+        handleStart?: () => void;
     }): Promise<void>;
     drawPlaneMap({ geojson, extrudeLineGeojson, bbox, depth, extrudelineBloom, adcode, }: {
         geojson: GeoJSON;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.25.2",
+  "version": "0.25.4",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && bundler",
@@ -69,7 +69,7 @@
     "esus-lite": "^0.2.8",
     "events": "^3.3.0",
     "geojson-cn": "^0.1.30",
-    "gl-draw": "0.13.22",
+    "gl-draw": "0.13.23",
     "jsrsasign": "^11.1.0",
     "lodash-es": "^4.17.21"
   },