vis-core 0.13.11 → 0.14.0

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.13.11";
+declare const _default: "0.14.0";
 export default _default;

package/dist/vis/Base.d.ts

@@ -1,8 +1,7 @@
 import { EventEmitter } from 'events';
 import Pencil, { BaseObject } from 'gl-draw';
 import MaterialList from "./all/MaterialList";
-import { Loader } from 'gl-draw/dist/plugins';
-import { Wk } from 'gl-draw/dist/plugins';
+import { Wk, Loader, Draw as DrawController } from 'gl-draw/dist/plugins';
 import { Node } from 'gl-draw/dist/objects';
 import { RoomEnvironment } from 'three/examples/jsm/environments/RoomEnvironment';
 import * as THREE from 'three';
@@ -22,6 +21,32 @@ export default class Base {
     extendsOptions: Record<string, any>;
     pencil: Pencil;
     drawController: any;
+    allDrawController: DrawController<{
+        Plane: typeof import("./all/objects/Plane").default;
+        Ring: typeof import("./all/objects/Ring").default;
+        Sphere: typeof import("./all/objects/Sphere").default;
+        Sprite: typeof import("./all/objects/Sprite").default;
+        Tetrahedron: typeof import("./all/objects/Tetrahedron").default;
+        Torus: typeof import("./all/objects/Torus").default;
+        TorusKnot: typeof import("./all/objects/TorusKnot").default;
+        Tube: typeof import("./all/objects/Tube").default;
+        Box: typeof import("./all/objects/Box").default;
+        Capsule: typeof import("./all/objects/Capsule").default;
+        Circle: typeof import("./all/objects/Circle").default;
+        Cylinder: typeof import("./all/objects/Cylinder").default;
+        Dodecahedron: typeof import("./all/objects/Dodecahedron").default;
+        Icosahedron: typeof import("./all/objects/Icosahedron").default;
+        Lathe: typeof import("./all/objects/Lathe").default;
+        Octahedron: typeof import("./all/objects/Octahedron").default;
+        Node: typeof Node;
+        Image: typeof import("gl-draw/dist/objects").Image;
+        Line: typeof import("gl-draw/dist/objects").Line;
+        ExtrudePolygon: typeof import("gl-draw/dist/objects").ExtrudePolygon;
+        Group: typeof import("gl-draw/dist/objects").Group;
+        Light: typeof import("./map/objects").Light;
+        Point: typeof import("./all/objects/Point").default;
+        Arc: typeof import("./all/objects/Arc").default;
+    }>;
     mList: MaterialList;
     loader: Loader;
     worker: Wk;

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

@@ -37,7 +37,7 @@ export declare const objs2: {
     Lathe: typeof Lathe;
     Octahedron: typeof Octahedron;
 };
-declare const d: DrawController<{
+declare const objall: {
     Plane: typeof Plane;
     Ring: typeof Ring;
     Sphere: typeof Sphere;
@@ -62,5 +62,6 @@ declare const d: DrawController<{
     Light: typeof Light;
     Point: typeof Point;
     Arc: typeof Arc;
-}>;
-export default d;
+};
+export default objall;
+export type d = DrawController<typeof objall>;

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

@@ -3,6 +3,7 @@ import Base from "../Base";
 import * as THREE from 'three';
 import { getProjection } from 'gl-draw/dist/utils';
 import { Group } from "./objects";
+import { Draw as DrawController } from 'gl-draw/dist/plugins';
 interface CityOptions {
     adcode: number;
     jsonName: string;
@@ -30,7 +31,7 @@ interface CityOptions {
 }
 export default class extends Base {
     static VisName: string;
-    drawController: import("gl-draw/dist/plugins").Draw<{
+    drawController: DrawController<{
         Node: typeof import("gl-draw/dist/objects").Node;
         Image: typeof import("gl-draw/dist/objects").Image;
         Line: typeof import("./objects").Line;

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

@@ -21,18 +21,5 @@ export declare const objs: {
     Plane: typeof Plane;
     Target: typeof Target;
 };
-declare const _default: DrawController<{
-    Node: typeof Node;
-    Image: typeof Image;
-    Line: typeof Line;
-    ExtrudePolygon: typeof ExtrudePolygon;
-    Building: typeof Building;
-    Road: typeof Road;
-    Area: typeof Area;
-    Video: typeof Video;
-    Group: typeof Group;
-    Light: typeof Light;
-    Plane: typeof Plane;
-    Target: typeof Target;
-}>;
-export default _default;
+export default objs;
+export type d = DrawController<typeof objs>;

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

@@ -1,10 +1,11 @@
 import Base from "../Base";
+import { Draw as DrawController } from 'gl-draw/dist/plugins';
 interface EarthOptions {
     assetsPrefix?: string;
 }
 export default class extends Base {
     static VisName: string;
-    drawController: import("gl-draw/dist/plugins").Draw<{
+    drawController: DrawController<{
         Node: typeof import("gl-draw/dist/objects").Node;
         Image: typeof import("gl-draw/dist/objects").Image;
         Line: typeof import("gl-draw/dist/objects").Line;

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

@@ -4,7 +4,7 @@ import Earth from './earth';
 import Countries from './countries';
 import Light from './light';
 import China from './china';
-declare const _default: DrawController<{
+declare const objs: {
     Node: typeof Node;
     Image: typeof Image;
     Line: typeof Line;
@@ -15,5 +15,6 @@ declare const _default: DrawController<{
     Earth: typeof Earth;
     Countries: typeof Countries;
     China: typeof China;
-}>;
-export default _default;
+};
+export default objs;
+export type d = DrawController<typeof objs>;

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

@@ -1,11 +1,12 @@
 import Base from "../Base";
+import { Draw as DrawController } from 'gl-draw/dist/plugins';
 interface EarthOptions {
     assetsPrefix?: string;
 }
 export default class extends Base {
     static VisName: string;
     leftTruck: boolean;
-    drawController: import("gl-draw/dist/plugins").Draw<{
+    drawController: DrawController<{
         Node: typeof import("gl-draw/dist/objects").Node;
         Image: typeof import("gl-draw/dist/objects").Image;
         Line: typeof import("gl-draw/dist/objects").Line;

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

@@ -5,7 +5,7 @@ import Bg from './bg';
 import Label from './label';
 import Point from './point';
 import Light from "../../all/objects/Light";
-declare const _default: DrawController<{
+declare const objs: {
     Node: typeof Node;
     Image: typeof Image;
     Line: typeof Line;
@@ -17,5 +17,6 @@ declare const _default: DrawController<{
     Bg: typeof Bg;
     Label: typeof Label;
     Point: typeof Point;
-}>;
-export default _default;
+};
+export default objs;
+export type d = DrawController<typeof objs>;

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

@@ -5,6 +5,7 @@ import type { FeatureCollection, Polygon, MultiPolygon } from 'geojson';
 import { MeshLineMaterial } from 'gl-draw/dist/objects';
 import * as THREE from 'three';
 import { PlaneMap, Group, ContinentsBg } from "./objects";
+import { Draw as DrawController } from 'gl-draw/dist/plugins';
 import { LevelArr } from 'geojson-cn';
 type GeoJSON = FeatureCollection<Polygon | MultiPolygon>;
 export interface MapOptions {
@@ -45,7 +46,7 @@ export interface MapOptions {
 }
 export default class extends Base {
     static VisName: string;
-    drawController: import("gl-draw/dist/plugins").Draw<{
+    drawController: DrawController<{
         Node: typeof import("gl-draw/dist/objects").Node;
         Image: typeof import("gl-draw/dist/objects").Image;
         Line: typeof import("gl-draw/dist/objects").Line;

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

@@ -4,8 +4,7 @@ import PlaneMap from './PlaneMap';
 import ContinentsBg from './ContinentsBg';
 import Light from "../../all/objects/Light";
 import PlaneShadow from './PlaneShadow';
-export { PlaneMap, Light, ContinentsBg, Group };
-declare const _default: DrawController<{
+declare const objs: {
     Node: typeof Node;
     Image: typeof Image;
     Line: typeof Line;
@@ -16,5 +15,7 @@ declare const _default: DrawController<{
     Light: typeof Light;
     PlaneShadow: typeof PlaneShadow;
     ConicPolygon: typeof ConicPolygon;
-}>;
-export default _default;
+};
+export { PlaneMap, Light, ContinentsBg, Group };
+export default objs;
+export type d = DrawController<typeof objs>;

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

@@ -1,6 +1,6 @@
 import City from "../city";
 export default class extends City {
-    drawController: import("gl-draw/dist/plugins").Draw<{
+    drawController: {
         Node: typeof import("gl-draw/dist/objects").Node;
         Image: typeof import("gl-draw/dist/objects").Image;
         Line: typeof import("gl-draw/dist/objects").Line;
@@ -16,7 +16,7 @@ export default class extends City {
         Road: typeof import("../city/objects/road").default;
         Target: typeof import("../city/objects/target").default;
         ConicPolygon: typeof import("gl-draw/dist/objects").ConicPolygon;
-    }>;
+    };
     multiplyScalar: number;
     fixNearFar(n?: number): void;
 }

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

@@ -24,23 +24,6 @@ interface showCityOption {
 }
 export default class extends Map {
     static VisName: string;
-    drawController: import("gl-draw/dist/plugins").Draw<{
-        Node: typeof import("gl-draw/dist/objects").Node;
-        Image: typeof import("gl-draw/dist/objects").Image;
-        Line: typeof import("gl-draw/dist/objects").Line;
-        PlaneMap: typeof import("./objects").PlaneMap;
-        ContinentsBg: typeof import("../map/objects").ContinentsBg;
-        ExtrudePolygon: typeof import("gl-draw/dist/objects").ExtrudePolygon;
-        Group: typeof import("./objects").Group;
-        Light: typeof import("./objects").Light;
-        PlaneShadow: typeof import("../map/objects/PlaneShadow").default;
-        Plane: typeof import("../city/objects/plane").default;
-        Building: typeof import("../city/objects/building").default;
-        Area: typeof import("../city/objects/area").default;
-        Road: typeof import("../city/objects/road").default;
-        Target: typeof import("../city/objects/target").default;
-        ConicPolygon: typeof import("gl-draw/dist/objects").ConicPolygon;
-    }>;
     cityVisObj: Record<string, {
         city?: City;
         state: ReturnType<typeof makePromiseCreator>;

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

@@ -1,4 +1,5 @@
 import Map, { MapOptions } from "../map";
+import { Draw as DrawController } from 'gl-draw/dist/plugins';
 import type { FeatureCollection, Polygon, MultiPolygon } from 'geojson';
 type GeoJSON = FeatureCollection<Polygon | MultiPolygon>;
 export interface Map2Options extends MapOptions {
@@ -9,7 +10,7 @@ export interface Map2Options extends MapOptions {
 export default class extends Map {
     options: Required<Map2Options>;
     constructor(container: HTMLElement, options: Map2Options);
-    drawController: import("gl-draw/dist/plugins").Draw<{
+    drawController: DrawController<{
         Node: typeof import("gl-draw/dist/objects").Node;
         Image: typeof import("gl-draw/dist/objects").Image;
         Line: typeof import("gl-draw/dist/objects").Line;

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

@@ -1,4 +1,3 @@
-import { Draw as DrawController } from 'gl-draw/dist/plugins';
 import { Node, Image, Line, ExtrudePolygon, Group, ConicPolygon } from 'gl-draw/dist/objects';
 import PlaneMap from "../../map/objects/PlaneMap";
 import PlaneShadow from "../../map/objects/PlaneShadow";
@@ -9,8 +8,7 @@ import Building from "../../city/objects/building";
 import Area from "../../city/objects/area";
 import Road from "../../city/objects/road";
 import Target from "../../city/objects/target";
-export { PlaneMap, Light, Group };
-declare const _default: DrawController<{
+declare const objs: {
     Node: typeof Node;
     Image: typeof Image;
     Line: typeof Line;
@@ -26,5 +24,6 @@ declare const _default: DrawController<{
     Road: typeof Road;
     Target: typeof Target;
     ConicPolygon: typeof ConicPolygon;
-}>;
-export default _default;
+};
+export { PlaneMap, Light, Group };
+export default objs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.13.11",
+  "version": "0.14.0",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version &&PUBLIC_EXCLUDE=public/city bundler",
@@ -46,7 +46,7 @@
     "eslint-config-bundler": "^0.4.2",
     "esus": "^0.4.27",
     "fs-extra": "^11.1.1",
-    "gl-draw": "0.9.0-beta.406",
+    "gl-draw": "0.9.1",
     "idb-keyval": "^6.2.1",
     "pinia": "^2.1.7",
     "prettier-config-bundler": "^0.4.3",