gl-draw 0.16.0-beta.8 → 0.16.0

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

@@ -7,6 +7,9 @@ export { CSS2DObject } from 'three/examples/jsm/renderers/CSS2DRenderer';
 export { CSS3DObject, CSS3DSprite, } from 'three/examples/jsm/renderers/CSS3DRenderer';
 export default class BaseObject extends UseMaterial {
     key: string;
+    keyType?: string;
+    keyUId?: string;
+    keyName?: string;
     objectType: string;
     objectOptions?: Record<string, any>;
     pencil: Pencil;
@@ -55,6 +58,7 @@ export default class BaseObject extends UseMaterial {
     traverse(fn: (o: IBaseObject) => void): void;
     instantiate(ops?: {
         key?: string;
+        uId?: string;
         target?: IBaseObject;
         create?: ((...args: any[]) => any) | boolean;
         recursive?: boolean;

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

@@ -4,19 +4,21 @@ import type MList from "../MList/MList";
 import type Pencil from "../Pencil";
 import Pick from './Pick';
 type KeyOf<T extends object> = Extract<keyof T, string>;
-export default class Draw<T extends {
-    [key: string]: new (...args: any[]) => IBaseObject;
-} = any> extends Pick {
+type ObjectFactory<T extends IBaseObject = IBaseObject> = new (...args: any[]) => T;
+type ObjectFactoryMap = {
+    [key: string]: ObjectFactory;
+};
+export default class Draw<T extends ObjectFactoryMap = any> extends Pick {
     objMap: Map<Object3D<import("three").Object3DEventMap>, IBaseObject>;
     objects: Map<string, IBaseObject>;
-    objectsPm: Map<IBaseObject, Promise<any>>;
+    objectsPm: Map<IBaseObject, Promise<void>>;
     objectWrapChindIdMap: Map<IBaseObject, number>;
     scene: IBaseObject;
     mList: MList;
     group: IBaseObject;
     prefabGroup: IBaseObject;
     private objectNamesToFactories;
-    get objectsPromise(): IterableIterator<Promise<any>>;
+    get objectsPromise(): IterableIterator<Promise<void>>;
     constructor(pencil: Pencil, ops: {
         scene: Scene;
         mList: MList;
@@ -27,9 +29,7 @@ export default class Draw<T extends {
         target?: IBaseObject | null;
         mList?: boolean;
     }): BaseObject;
-    init<K extends {
-        [key: string]: new (...args: any[]) => IBaseObject;
-    }>(objectFactories: K): Draw<K>;
+    init<K extends ObjectFactoryMap>(objectFactories: K): Draw<K>;
     getObject<Y extends KeyOf<T>>(nameOrigin: Y, options?: {
         key: string;
     }): InstanceType<T[Y]> | undefined;
@@ -37,22 +37,28 @@ export default class Draw<T extends {
         key: string;
     }): InstanceType<T[Y]>[];
     draw<Y extends KeyOf<T>, U extends KeyOf<T> | `${KeyOf<T>}#${string}` | IBaseObject | null>(nameOrigin: Y, options?: ConstructorParameters<T[Y]>[0] extends undefined ? {
+        keyType?: string;
         key?: string;
+        uId?: string;
         target?: U;
         onTop?: number;
         create?: ((...args: any[]) => any) | boolean;
         prefab?: boolean;
-        objectType?: string;
     } : ConstructorParameters<T[Y]>[0] & {
+        keyType?: string;
         key?: string;
+        uId?: string;
         target?: U;
         onTop?: number;
         create?: ((...args: any[]) => any) | boolean;
         prefab?: boolean;
-        objectType?: string;
     }, target?: U): Promise<InstanceType<T[Y]>>;
     private setBaseObjectKey;
-    updateBaseObjectKey(baseObject: IBaseObject, keyOrigin: string): string;
+    updateBaseObjectKey(baseObject: IBaseObject, ops: {
+        type?: string;
+        key?: string;
+        uId?: string;
+    }): string;
     private addBaseObject;
     erase(...args: (KeyOf<T> | `${KeyOf<T>}#${string}` | InstanceType<T[keyof T]>)[]): void;
     eraseWithoutMaterial(...args: (KeyOf<T> | `${KeyOf<T>}#${string}` | InstanceType<T[keyof T]>)[]): void;