vis-core 0.25.3 → 0.25.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/dist/index.d.ts +1 -1
  2. package/dist/index.js +36 -36
  3. package/dist/index.module.js +4422 -4377
  4. package/dist/version.d.ts +1 -1
  5. package/dist/vis/base/camera.d.ts +24 -0
  6. package/dist/vis/base/index.d.ts +4 -21
  7. package/dist/vis/map/index.d.ts +26 -7
  8. package/dist/vis/map2/city.d.ts +3 -7
  9. package/dist/vis/map2/index.d.ts +0 -1
  10. package/dist/vis/map2/map.d.ts +3 -7
  11. package/dist/vis/map2/objects/index.d.ts +3 -7
  12. package/package.json +2 -2
package/dist/version.d.ts CHANGED
@@ -1,2 +1,2 @@
1
- declare const _default: "0.25.3";
1
+ declare const _default: "0.25.5";
2
2
  export default _default;
package/dist/vis/base/camera.d.ts ADDED
@@ -0,0 +1,24 @@
1
+ import Pencil, { BaseObject } from 'gl-draw';
2
+ import * as THREE from 'three';
3
+ import Event from "./event";
4
+ export default class Camera extends Event {
5
+ container: HTMLElement;
6
+ pencil: Pencil;
7
+ cameraState: Record<string, number[]>;
8
+ setSaveCamera(type: string): void;
9
+ useSaveCamera(type: string, enableTransition?: boolean): Promise<boolean>;
10
+ lookAt(positionX: number, positionY: number, positionZ: number, targetX: number, targetY: number, targetZ: number, enableTransition?: boolean, smoothTime?: number): Promise<void>;
11
+ truck(x: number, y: number, enableTransition?: boolean, smoothTime?: number): Promise<void>;
12
+ dollyTo(distance: number | `+=${number}` | `-=${number}` | `*=${number}` | `/=${number}`, enableTransition?: boolean, smoothTime?: number): Promise<void>;
13
+ absoluteAngle(targetAngle: number, sourceAngle: number): number;
14
+ lookAtTarget(ops: {
15
+ target?: THREE.Vector3;
16
+ distance?: number;
17
+ polarAngle?: number;
18
+ azimuthAngle?: number;
19
+ }, enableTransition?: boolean, smoothTime?: number): Promise<void>;
20
+ paddingInCssPixel(obj: BaseObject, top: number, right: number, bottom: number, left: number, enableTransition: boolean): Promise<void[]>;
21
+ resetCamera(enableTransition?: boolean, smoothTime?: number): Promise<void>;
22
+ unproject(e: MouseEvent, targetZ?: number): THREE.Vector3;
23
+ dispose(): void;
24
+ }
package/dist/vis/base/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import Pencil, { BaseObject, Lead } from 'gl-draw';
1
+ import { BaseObject, Lead } from 'gl-draw';
2
2
  import leadObjs from "../all/objects";
3
3
  import MaterialList from "../all/MaterialList";
4
4
  import { Wk } from 'gl-draw/dist/plugins';
@@ -7,13 +7,14 @@ import { Node } from 'gl-draw/dist/objects';
7
7
  import Arc from "../all/objects/Arc";
8
8
  import { RoomEnvironment } from 'three/examples/jsm/environments/RoomEnvironment';
9
9
  import * as THREE from 'three';
10
- import Event from "./event";
10
+ import Camera from "./camera";
11
11
  import Editor from "../../editor";
12
12
  export interface BaseOptions {
13
13
  container: HTMLElement;
14
14
  assetsPrefix?: string;
15
15
  css2DContainer?: HTMLElement;
16
16
  pencil?: any;
17
+ pencil2?: any;
17
18
  pencilConfig?: Record<string, any>;
18
19
  disableInitShow?: boolean;
19
20
  editor?: boolean;
@@ -22,9 +23,8 @@ export interface BaseOptions {
22
23
  tier?: number;
23
24
  [key: string]: any;
24
25
  }
25
- export default class Base extends Event {
26
+ export default class Base extends Camera {
26
27
  static VisName: string;
27
- container: HTMLElement;
28
28
  playing: boolean;
29
29
  leftTruck: boolean;
30
30
  options: BaseOptions;
@@ -33,7 +33,6 @@ export default class Base extends Event {
33
33
  settings: Record<string, any>;
34
34
  delLoadArr?: string[];
35
35
  extendsOptions: Record<string, any>;
36
- pencil: Pencil;
37
36
  leadObjs: {
38
37
  Plane: typeof import("../all/objects/Plane").default;
39
38
  CrossPlane: typeof import("../all/objects/CrossPlane").default;
@@ -75,7 +74,6 @@ export default class Base extends Event {
75
74
  visName: string;
76
75
  editor?: Editor;
77
76
  tier0: boolean;
78
- cameraState: Record<string, number[]>;
79
77
  publicDir: Record<string, string>;
80
78
  constructor(options: BaseOptions);
81
79
  setOptions(options: Record<string, any>): void;
@@ -105,8 +103,6 @@ export default class Base extends Event {
105
103
  mouseButtonsActiveStore: Record<string, any> | null;
106
104
  initSettings(): void;
107
105
  handleSetting(key: string, value: any): Promise<any>;
108
- setSaveCamera(type: string): void;
109
- useSaveCamera(type: string, enableTransition?: boolean): Promise<boolean>;
110
106
  show(): void;
111
107
  showAction(): void;
112
108
  hide(): void;
@@ -119,19 +115,6 @@ export default class Base extends Event {
119
115
  onTop?: number;
120
116
  type?: '3d' | '3dSprite';
121
117
  }): Promise<Node>;
122
- lookAt(positionX: number, positionY: number, positionZ: number, targetX: number, targetY: number, targetZ: number, enableTransition?: boolean, smoothTime?: number): Promise<void>;
123
- truck(x: number, y: number, enableTransition?: boolean, smoothTime?: number): Promise<void>;
124
- dollyTo(distance: number | `+=${number}` | `-=${number}` | `*=${number}` | `/=${number}`, enableTransition?: boolean, smoothTime?: number): Promise<void>;
125
- absoluteAngle(targetAngle: number, sourceAngle: number): number;
126
- lookAtTarget(ops: {
127
- target?: THREE.Vector3;
128
- distance?: number;
129
- polarAngle?: number;
130
- azimuthAngle?: number;
131
- }, enableTransition?: boolean, smoothTime?: number): Promise<void>;
132
- paddingInCssPixel(obj: BaseObject, top: number, right: number, bottom: number, left: number, enableTransition: boolean): Promise<void[]>;
133
- resetCamera(enableTransition?: boolean, smoothTime?: number): Promise<void>;
134
- unproject(e: MouseEvent, targetZ?: number): THREE.Vector3;
135
118
  getRoomEnvMap(): THREE.Texture;
136
119
  handlePick(objArr: PickFunctionsItem['objArr'], type: PickFunctionsItem['type'], cb: PickFunctionsItem['cb']): void;
137
120
  getScreenPosition(x: number, y: number, z: number): {
package/dist/vis/map/index.d.ts CHANGED
@@ -99,8 +99,16 @@ export default class extends Base {
99
99
  cX: number;
100
100
  cY: number;
101
101
  depth: number;
102
- cameraPositon?: THREE.Vector3;
103
- cameraTarget?: THREE.Vector3;
102
+ controls?: {
103
+ lookAt: [number, number, number, number, number, number];
104
+ polarAngle: number;
105
+ azimuthAngle: number;
106
+ };
107
+ userControls?: {
108
+ lookAt: [number, number, number, number, number, number];
109
+ polarAngle: number;
110
+ azimuthAngle: number;
111
+ };
104
112
  }[];
105
113
  get mapObj(): {
106
114
  map?: PlaneMap;
@@ -109,8 +117,16 @@ export default class extends Base {
109
117
  cX: number;
110
118
  cY: number;
111
119
  depth: number;
112
- cameraPositon?: THREE.Vector3;
113
- cameraTarget?: THREE.Vector3;
120
+ controls?: {
121
+ lookAt: [number, number, number, number, number, number];
122
+ polarAngle: number;
123
+ azimuthAngle: number;
124
+ };
125
+ userControls?: {
126
+ lookAt: [number, number, number, number, number, number];
127
+ polarAngle: number;
128
+ azimuthAngle: number;
129
+ };
114
130
  };
115
131
  get map(): PlaneMap | undefined;
116
132
  get mapInfo(): any;
@@ -176,18 +192,21 @@ export default class extends Base {
176
192
  y: number;
177
193
  } | undefined;
178
194
  booleanPointInCn(location: [number, number]): boolean;
179
- handleDrillDown({ adcode, duration, saveBackCamvasState, extrudelineBloom, }: {
195
+ handleDrillDown({ adcode, duration, handleLook, saveBackCamvasState, extrudelineBloom, }: {
180
196
  adcode: number;
181
197
  duration?: number;
198
+ handleLook?: boolean;
182
199
  saveBackCamvasState?: boolean;
183
200
  extrudelineBloom?: boolean;
184
201
  }): Promise<void>;
185
- saveBackCamvasState(index: number): void;
202
+ saveCamvasState(type: 'userControls' | 'controls', index: number): void;
186
203
  fixNear(adcode: number): void;
187
- fitTo(obj?: BaseObject, { polarAngle, azimuthAngle, enableTransition, }?: {
204
+ fitTo(obj?: BaseObject, { polarAngle, azimuthAngle, fixZ, handleStart, enableTransition, }?: {
188
205
  polarAngle?: number;
189
206
  azimuthAngle?: number;
190
207
  enableTransition?: boolean;
208
+ fixZ?: number;
209
+ handleStart?: () => void;
191
210
  }): Promise<void>;
192
211
  drawPlaneMap({ geojson, extrudeLineGeojson, bbox, depth, extrudelineBloom, adcode, }: {
193
212
  geojson: GeoJSON;
package/dist/vis/map2/city.d.ts CHANGED
@@ -1,11 +1,10 @@
1
1
  import City from "../city";
2
2
  export default class extends City {
3
3
  drawController: {
4
- Building: typeof import("../city/objects/building").default;
5
- Road: typeof import("../city/objects/road").default;
6
- Area: typeof import("../city/objects/area").default;
4
+ PlaneMap: typeof import("../map/objects/PlaneMap").default;
7
5
  CityPlane: typeof import("../city/objects/plane").default;
8
- Target: typeof import("../city/objects/target").default;
6
+ ContinentsBg: typeof import("../map/objects/ContinentsBg").default;
7
+ Mountain: typeof import("../map/objects/Mountain").default;
9
8
  Plane: typeof import("../all/objects/Plane").default;
10
9
  CrossPlane: typeof import("../all/objects/CrossPlane").default;
11
10
  PlaneShadow: typeof import("../all/objects/PlaneShadow").default;
@@ -34,9 +33,6 @@ export default class extends City {
34
33
  Point: typeof import("../all/objects/Point").default;
35
34
  Arc: typeof import("../all/objects/Arc").default;
36
35
  Model: typeof import("../all/objects/Model").default;
37
- PlaneMap: typeof import("../map/objects/PlaneMap").default;
38
- ContinentsBg: typeof import("../map/objects/ContinentsBg").default;
39
- Mountain: typeof import("../map/objects/Mountain").default;
40
36
  };
41
37
  multiplyScalar: number;
42
38
  fixNearFar(n?: number, f?: number): void;
package/dist/vis/map2/index.d.ts CHANGED
@@ -33,7 +33,6 @@ export default class extends Map {
33
33
  state: ReturnType<typeof makePromiseCreator>;
34
34
  }>;
35
35
  get cityVis(): City | undefined;
36
- get cityTarget(): import("../city/objects/target").default | undefined;
37
36
  showGroup?: 'city' | 'map';
38
37
  options: Required<MapCityOptions>;
39
38
  setOptions(options: MapCityOptions): void;
package/dist/vis/map2/map.d.ts CHANGED
@@ -7,11 +7,10 @@ export interface Map2Options extends MapOptions {
7
7
  export default class extends Map {
8
8
  options: Required<Map2Options>;
9
9
  leadObjs: {
10
- Building: typeof import("../city/objects/building").default;
11
- Road: typeof import("../city/objects/road").default;
12
- Area: typeof import("../city/objects/area").default;
10
+ PlaneMap: typeof import("../map/objects/PlaneMap").default;
13
11
  CityPlane: typeof import("../city/objects/plane").default;
14
- Target: typeof import("../city/objects/target").default;
12
+ ContinentsBg: typeof import("../map/objects/ContinentsBg").default;
13
+ Mountain: typeof import("../map/objects/Mountain").default;
15
14
  Plane: typeof import("../all/objects/Plane").default;
16
15
  CrossPlane: typeof import("../all/objects/CrossPlane").default;
17
16
  PlaneShadow: typeof import("../all/objects/PlaneShadow").default;
@@ -40,9 +39,6 @@ export default class extends Map {
40
39
  Point: typeof import("../all/objects/Point").default;
41
40
  Arc: typeof import("../all/objects/Arc").default;
42
41
  Model: typeof import("../all/objects/Model").default;
43
- PlaneMap: typeof import("../map/objects/PlaneMap").default;
44
- ContinentsBg: typeof import("../map/objects/ContinentsBg").default;
45
- Mountain: typeof import("../map/objects/Mountain").default;
46
42
  };
47
43
  lead: Lead<typeof leadObjs>;
48
44
  setOptions(options: Map2Options): void;
package/dist/vis/map2/objects/index.d.ts CHANGED
@@ -1,9 +1,8 @@
1
1
  declare const objs: {
2
- Building: typeof import("../../city/objects/building").default;
3
- Road: typeof import("../../city/objects/road").default;
4
- Area: typeof import("../../city/objects/area").default;
2
+ PlaneMap: typeof import("../../map/objects/PlaneMap").default;
5
3
  CityPlane: typeof import("../../city/objects/plane").default;
6
- Target: typeof import("../../city/objects/target").default;
4
+ ContinentsBg: typeof import("../../map/objects/ContinentsBg").default;
5
+ Mountain: typeof import("../../map/objects/Mountain").default;
7
6
  Plane: typeof import("../../all/objects/Plane").default;
8
7
  CrossPlane: typeof import("../../all/objects/CrossPlane").default;
9
8
  PlaneShadow: typeof import("../../all/objects/PlaneShadow").default;
@@ -32,8 +31,5 @@ declare const objs: {
32
31
  Point: typeof import("../../all/objects/Point").default;
33
32
  Arc: typeof import("../../all/objects/Arc").default;
34
33
  Model: typeof import("../../all/objects/Model").default;
35
- PlaneMap: typeof import("../../map/objects/PlaneMap").default;
36
- ContinentsBg: typeof import("../../map/objects/ContinentsBg").default;
37
- Mountain: typeof import("../../map/objects/Mountain").default;
38
34
  };
39
35
  export default objs;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vis-core",
3
- "version": "0.25.3",
3
+ "version": "0.25.5",
4
4
  "scripts": {
5
5
  "start": "npm run version && PORT=5173 bundler-dev",
6
6
  "build:site": "npm run version && bundler",
@@ -69,7 +69,7 @@
69
69
  "esus-lite": "^0.2.8",
70
70
  "events": "^3.3.0",
71
71
  "geojson-cn": "^0.1.30",
72
- "gl-draw": "0.13.22",
72
+ "gl-draw": "0.13.23",
73
73
  "jsrsasign": "^11.1.0",
74
74
  "lodash-es": "^4.17.21"
75
75
  },