gl-draw 0.13.23 → 0.14.0

package/dist/core/BaseObject.d.ts

@@ -1,20 +1,21 @@
 import * as THREE from 'three';
 import type Pencil from "./Pencil";
-import type Draw from "./Lead/Lead";
+import type Lead from "./Lead/Lead";
 import type { PickFunctionsItem } from "./Lead/Lead";
+import ResourceTracker from "./ResourceTracker";
 export { CSS3DObject, CSS3DSprite, } from 'three/examples/jsm/renderers/CSS3DRenderer';
 export { CSS2DObject } from 'three/examples/jsm/renderers/CSS2DRenderer';
-export default class BaseObject {
+export default class BaseObject extends ResourceTracker {
     objectType: string;
     objectOptions?: Record<string, any>;
     key: string;
     pencil: Pencil;
-    drawController: Draw<any>;
+    lead: Lead;
     object3d: THREE.Object3D;
     userData: Record<string, any>;
     prefab: boolean;
     isInstantiate: boolean;
-    get parent(): IBaseObject | THREE.Scene | null;
+    get parent(): IBaseObject | null;
     get children(): IBaseObject[];
     get position(): THREE.Vector3;
     get rotation(): THREE.Euler;
@@ -23,12 +24,6 @@ export default class BaseObject {
     get remove(): (...object: THREE.Object3D[]) => THREE.Object3D<THREE.Object3DEventMap>;
     get visible(): boolean;
     get visibleWithAncestors(): boolean;
-    pm: {
-        promise: Promise<any>;
-        pending: boolean;
-        resolve: (value?: any) => void;
-        reject: (reason?: any) => void;
-    };
     create(): void;
     render(): void;
     update(delta: number, elapsed: number): void;

package/dist/core/Lead/Lead.d.ts

@@ -1,6 +1,7 @@
 import * as THREE from 'three';
 import { IBaseObject } from "../BaseObject";
 import Group from "../../objects/group";
+import Scene from "../../objects/scene";
 import Pencil from "../Pencil";
 type KeyOf<T extends object> = Extract<keyof T, string>;
 export type PickFunctionsItem = {
@@ -12,17 +13,17 @@ export default class Draw<T extends {
     [key: string]: new (...args: any[]) => IBaseObject;
 } = any> {
     objMap: Map<THREE.Object3D<THREE.Object3DEventMap>, IBaseObject>;
-    targetNullMap: Map<THREE.Object3D<THREE.Object3DEventMap>, IBaseObject>;
     objects: Map<string, IBaseObject>;
-    groupMap: Map<THREE.Scene, Group>;
-    prefabGroupMap: Map<THREE.Scene, Group>;
-    get group(): Group | undefined;
-    get prefabGroup(): Group | undefined;
+    objectsPm: Map<string, Promise<any>>;
     pencil: Pencil;
-    get scene(): THREE.Scene;
+    scene: Scene;
+    group: Group;
+    prefabGroup: Group;
     private objectNamesToFactories;
-    get objectsPromise(): Promise<any>[];
-    constructor(pencil: Pencil, objectFactories: T);
+    get objectsPromise(): IterableIterator<Promise<any>>;
+    constructor(pencil: Pencil, ops: {
+        scene: THREE.Scene;
+    });
     init<K extends {
         [key: string]: new (...args: any[]) => IBaseObject;
     }>(objectFactories: K): Draw<K>;
@@ -35,7 +36,6 @@ export default class Draw<T extends {
     instantiate(obj: IBaseObject, { create, }?: {
         create?: ((...args: any[]) => any) | boolean;
     }): Promise<InstanceType<T[Extract<keyof T, string>]>>;
-    initGroup(): Promise<void>;
     draw<Y extends KeyOf<T>, U extends KeyOf<T> | `${KeyOf<T>}#${string}` | IBaseObject | null>(nameOrigin: Y, options?: ConstructorParameters<T[Y]>[0] extends undefined ? {
         key?: string;
         target?: U;
@@ -53,7 +53,6 @@ export default class Draw<T extends {
     erase(...args: (KeyOf<T> | `${KeyOf<T>}#${string}` | InstanceType<T[keyof T]>)[]): void;
     eraseWithoutMaterial(...args: (KeyOf<T> | `${KeyOf<T>}#${string}` | InstanceType<T[keyof T]>)[]): void;
     private handleErase;
-    private removeBaseObject;
     update(delta: number, elapsed: number): void;
     setSize(width: number, height: number): void;
     eraseAll(): void;

package/dist/core/Lead/index.d.ts

@@ -1,3 +1,4 @@
+import * as THREE from 'three';
 import Lead from './Lead';
 import Pencil from "../Pencil";
 import Pages from "../Pages";
@@ -12,7 +13,7 @@ export default class extends Pages<Lead> {
     options: Options;
     get lead(): Lead<any>;
     constructor(options: Options);
-    addLead(_: any, index?: number): Lead<any>;
+    addLead(scene: THREE.Scene, index?: number): Lead<any>;
     removePage(index: number): void;
     setPageActive(index: number): void;
 }

package/dist/core/ResourceTracker.d.ts

@@ -0,0 +1,12 @@
+import * as THREE from 'three';
+type Resource = THREE.Object3D | THREE.Material | THREE.Texture | THREE.BufferGeometry | ResourceTracker;
+export default class ResourceTracker {
+    resources: Set<Resource>;
+    disposeWithMaterial: boolean;
+    object3d: THREE.Object3D;
+    materialList: Record<string, THREE.Material | THREE.Material[]>;
+    disposeTrack: boolean;
+    track(resource: Resource | Resource[]): Resource | Resource[];
+    dispose(): void;
+}
+export {};

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export { default, default as Pencil } from "./core/Pencil";
 export { default as BaseObject } from "./core/BaseObject";
+export { default as ResourceTracker } from "./core/ResourceTracker";
 export type { default as Lead } from "./core/Lead/Lead";
 export declare const cameraControlsAction: Readonly<{
     readonly NONE: 0;