vis-core 0.25.1 → 0.25.3

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.25.1";
+declare const _default: "0.25.3";
 export default _default;

package/dist/vis/all/objects/index.d.ts

@@ -1,4 +1,4 @@
-import { Draw as DrawController } from 'gl-draw/dist/plugins';
+import { Lead } from 'gl-draw';
 import { Node, Line, Line2, ExtrudePolygon, Group, ConicPolygon } from 'gl-draw/dist/objects';
 import Light from './Light';
 import Point from './Point';
@@ -74,4 +74,4 @@ declare const objs: {
     Model: typeof Model;
 };
 export default objs;
-export type d = DrawController<typeof objs>;
+export type d = Lead<typeof objs>;

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

@@ -1,7 +1,8 @@
-import Pencil, { BaseObject } from 'gl-draw';
+import Pencil, { BaseObject, Lead } from 'gl-draw';
+import leadObjs from "../all/objects";
 import MaterialList from "../all/MaterialList";
-import { Wk, Draw as DrawController } from 'gl-draw/dist/plugins';
-import type { PickFunctionsItem } from 'gl-draw/dist/plugins/Draw';
+import { Wk } from 'gl-draw/dist/plugins';
+import type { PickFunctionsItem } from 'gl-draw/dist/core/Lead/Lead';
 import { Node } from 'gl-draw/dist/objects';
 import Arc from "../all/objects/Arc";
 import { RoomEnvironment } from 'three/examples/jsm/environments/RoomEnvironment';
@@ -33,7 +34,7 @@ export default class Base extends Event {
     delLoadArr?: string[];
     extendsOptions: Record<string, any>;
     pencil: Pencil;
-    drawController: DrawController<{
+    leadObjs: {
         Plane: typeof import("../all/objects/Plane").default;
         CrossPlane: typeof import("../all/objects/CrossPlane").default;
         PlaneShadow: typeof import("../all/objects/PlaneShadow").default;
@@ -62,7 +63,8 @@ export default class Base extends Event {
         Point: typeof import("../all/objects/Point").default;
         Arc: typeof Arc;
         Model: typeof import("../all/objects/Model").default;
-    }>;
+    };
+    lead: Lead<typeof leadObjs>;
     mList: MaterialList;
     get loader(): import("gl-draw/dist/core/Loader/Loader").default;
     get worker(): Wk;
@@ -96,7 +98,6 @@ export default class Base extends Event {
     setSceneActive(): void;
     initSceneUserData(): void;
     initBaseObjectUserData(baseObject: BaseObject): void;
-    initPencilPlugin(pencil: Pencil): void;
     addCSS3DRenderer(): void;
     initSettingsObj?: Record<string, any>;
     set verticalDragToForward(value: boolean);

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

@@ -1,9 +1,9 @@
-import { BaseObject } from 'gl-draw';
+import { BaseObject, Lead } from 'gl-draw';
 import Base, { BaseOptions } from "../base";
 import * as THREE from 'three';
 import { getProjection } from 'gl-draw/dist/utils';
 import { Group } from 'gl-draw/dist/objects';
-import { Draw as DrawController } from 'gl-draw/dist/plugins';
+import leadObjs from "./objects";
 import Building from './objects/building';
 import Road from './objects/road';
 interface CityOptions extends BaseOptions {
@@ -34,7 +34,7 @@ interface CityOptions extends BaseOptions {
 }
 export default class extends Base {
     static VisName: string;
-    drawController: DrawController<{
+    leadObjs: {
         Building: typeof Building;
         Road: typeof Road;
         Area: typeof import("./objects/area").default;
@@ -68,7 +68,8 @@ export default class extends Base {
         Point: typeof import("../all/objects/Point").default;
         Arc: typeof import("../all/objects/Arc").default;
         Model: typeof import("../all/objects/Model").default;
-    }>;
+    };
+    lead: Lead<typeof leadObjs>;
     adcode: number;
     pcenter: [number, number];
     pscale: number;

package/dist/vis/city/objects/index.d.ts

@@ -1,4 +1,4 @@
-import { Draw as DrawController } from 'gl-draw/dist/plugins';
+import { Lead } from 'gl-draw';
 import Building from './building';
 import Road from './road';
 import Area from './area';
@@ -40,4 +40,4 @@ declare const objs: {
     Model: typeof import("../../all/objects/Model").default;
 };
 export default objs;
-export type d = DrawController<typeof objs>;
+export type d = Lead<typeof objs>;

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

@@ -1,9 +1,9 @@
 import Base, { BaseOptions } from "../base";
 import * as THREE from 'three';
-import { Draw as DrawController } from 'gl-draw/dist/plugins';
+import leadObjs from "./objects";
 import { MeshLineMaterial } from 'gl-draw/dist/objects';
 import Countries from './objects/countries';
-import { BaseObject } from 'gl-draw';
+import { BaseObject, Lead } from 'gl-draw';
 interface EarthOptions extends BaseOptions {
     mapDepth?: number;
     radius?: number;
@@ -12,7 +12,7 @@ interface EarthOptions extends BaseOptions {
 }
 export default class extends Base {
     static VisName: string;
-    drawController: DrawController<{
+    leadObjs: {
         Earth: typeof import("./objects/earth").default;
         Countries: typeof Countries;
         SphereShadow: typeof import("./objects/SphereShadow").default;
@@ -44,8 +44,9 @@ export default class extends Base {
         Point: typeof import("../all/objects/Point").default;
         Arc: typeof import("../all/objects/Arc").default;
         Model: typeof import("../all/objects/Model").default;
-    }>;
+    };
     leftTruck: boolean;
+    lead: Lead<typeof leadObjs>;
     options: Required<EarthOptions>;
     extendsOptions: Record<string, any>;
     map: Countries;

package/dist/vis/earth/objects/index.d.ts

@@ -1,4 +1,4 @@
-import { Draw as DrawController } from 'gl-draw/dist/plugins';
+import { Lead } from 'gl-draw';
 import Earth from './earth';
 import Countries from './countries';
 import SphereShadow from './SphereShadow';
@@ -36,4 +36,4 @@ declare const objs: {
     Model: typeof import("../../all/objects/Model").default;
 };
 export default objs;
-export type d = DrawController<typeof objs>;
+export type d = Lead<typeof objs>;

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

@@ -1,11 +1,12 @@
 import Base, { BaseOptions } from "../base";
-import { Draw as DrawController } from 'gl-draw/dist/plugins';
+import leadObjs from "./objects";
+import { Lead } from 'gl-draw';
 interface EarthOptions extends BaseOptions {
 }
 export default class extends Base {
     static VisName: string;
     leftTruck: boolean;
-    drawController: DrawController<{
+    leadObjs: {
         Earth: typeof import("./objects/earth").default;
         Plane: typeof import("../all/objects/Plane").default;
         CrossPlane: typeof import("../all/objects/CrossPlane").default;
@@ -35,7 +36,8 @@ export default class extends Base {
         Point: typeof import("../all/objects/Point").default;
         Arc: typeof import("../all/objects/Arc").default;
         Model: typeof import("../all/objects/Model").default;
-    }>;
+    };
+    lead: Lead<typeof leadObjs>;
     options: Required<EarthOptions>;
     setOptions(options: EarthOptions): void;
     loaderAdd(): void;

package/dist/vis/earth2/objects/index.d.ts

@@ -1,4 +1,4 @@
-import { Draw as DrawController } from 'gl-draw/dist/plugins';
+import { Lead } from 'gl-draw';
 import Earth from './earth';
 declare const objs: {
     Earth: typeof Earth;
@@ -32,4 +32,4 @@ declare const objs: {
     Model: typeof import("../../all/objects/Model").default;
 };
 export default objs;
-export type d = DrawController<typeof objs>;
+export type d = Lead<typeof objs>;

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

@@ -1,12 +1,12 @@
-import { BaseObject } from 'gl-draw';
+import { BaseObject, Lead } from 'gl-draw';
 import Base, { BaseOptions } from "../base";
 import { getProjection } from 'gl-draw/dist/utils';
 import type { FeatureCollection, Polygon, MultiPolygon } from 'geojson';
 import { MeshLineMaterial, Group, ExtrudePolygon, Line } from 'gl-draw/dist/objects';
 import * as THREE from 'three';
+import leadObjs from "./objects";
 import PlaneMap from "./objects/PlaneMap";
 import ContinentsBg from "./objects/ContinentsBg";
-import { Draw as DrawController } from 'gl-draw/dist/plugins';
 import { LevelArr } from 'geojson-cn';
 type GeoJSON = FeatureCollection<Polygon | MultiPolygon>;
 export interface MapOptions extends BaseOptions {
@@ -56,7 +56,7 @@ export interface MapOptions extends BaseOptions {
 }
 export default class extends Base {
     static VisName: string;
-    drawController: DrawController<{
+    leadObjs: {
         PlaneMap: typeof PlaneMap;
         CityPlane: typeof import("../city/objects/plane").default;
         ContinentsBg: typeof ContinentsBg;
@@ -89,7 +89,8 @@ export default class extends Base {
         Point: typeof import("../all/objects/Point").default;
         Arc: typeof import("../all/objects/Arc").default;
         Model: typeof import("../all/objects/Model").default;
-    }>;
+    };
+    lead: Lead<typeof leadObjs>;
     options: Required<MapOptions>;
     mapHistory: {
         map?: PlaneMap;

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

@@ -1,4 +1,4 @@
-import { Draw as DrawController } from 'gl-draw/dist/plugins';
+import { Lead } from 'gl-draw';
 import PlaneMap from './PlaneMap';
 import CityPlane from "../../city/objects/plane";
 import ContinentsBg from './ContinentsBg';
@@ -38,4 +38,4 @@ declare const objs: {
     Model: typeof import("../../all/objects/Model").default;
 };
 export default objs;
-export type d = DrawController<typeof objs>;
+export type d = Lead<typeof objs>;

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

@@ -1,12 +1,12 @@
 import Map, { MapOptions } from "../map";
-import { Draw as DrawController } from 'gl-draw/dist/plugins';
+import leadObjs from "./objects";
+import { Lead } from 'gl-draw';
 export interface Map2Options extends MapOptions {
     cityOnMap?: boolean;
 }
 export default class extends Map {
     options: Required<Map2Options>;
-    setOptions(options: Map2Options): void;
-    drawController: DrawController<{
+    leadObjs: {
         Building: typeof import("../city/objects/building").default;
         Road: typeof import("../city/objects/road").default;
         Area: typeof import("../city/objects/area").default;
@@ -43,7 +43,9 @@ export default class extends Map {
         PlaneMap: typeof import("../map/objects/PlaneMap").default;
         ContinentsBg: typeof import("../map/objects/ContinentsBg").default;
         Mountain: typeof import("../map/objects/Mountain").default;
-    }>;
+    };
+    lead: Lead<typeof leadObjs>;
+    setOptions(options: Map2Options): void;
     initSettingsObj: {
         label: boolean;
         labelLite: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.25.1",
+  "version": "0.25.3",
   "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.2",
+    "gl-draw": "0.13.22",
     "jsrsasign": "^11.1.0",
     "lodash-es": "^4.17.21"
   },