gl-draw 0.15.0-beta.2 → 0.15.0-beta.20

package/dist/core/BaseObject.d.ts

@@ -3,10 +3,9 @@ import type Pencil from "./Pencil";
 import type Lead from "./Lead/Lead";
 import type MList from "./MList/MList";
 import type { PickFunctionsItem } from "./Lead/Pick";
-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 extends ResourceTracker {
+export default class BaseObject {
     objectType: string;
     objectOptions?: Record<string, any>;
     key: string;
@@ -14,8 +13,8 @@ export default class BaseObject extends ResourceTracker {
     lead: Lead;
     mList: MList;
     object3d: Object3D;
+    _original: Object3D;
     userData: Record<string, any>;
-    disposeWithMaterial: boolean;
     prefab: boolean;
     isInstantiate: boolean;
     isBloom: boolean;
@@ -71,6 +70,8 @@ export default class BaseObject extends ResourceTracker {
     onPointerEvent(type: PickFunctionsItem['type'], cb: PickFunctionsItem['cb']): void;
     enableBloom(): void;
     disableBloom(): void;
+    disposeTrack: boolean;
+    disposeMaterialIfNotUsed: boolean;
     dispose(): void;
 }
 export interface IBaseObject extends BaseObject {

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

@@ -1,7 +1,5 @@
 import { Object3D, Scene } from 'three';
 import { IBaseObject } from "../BaseObject";
-import Group from "../../objects/group";
-import BaseScene from "../../objects/scene";
 import Pencil from "../Pencil";
 import Pick from './Pick';
 import type MList from "../MList/MList";
@@ -10,18 +8,20 @@ export default class Draw<T extends {
     [key: string]: new (...args: any[]) => IBaseObject;
 } = any> extends Pick {
     objMap: Map<Object3D<import("three").Object3DEventMap>, IBaseObject>;
+    _originalMap: Map<Object3D<import("three").Object3DEventMap>, IBaseObject>;
     objects: Map<string, IBaseObject>;
-    objectsPm: Map<string, Promise<any>>;
-    scene: BaseScene;
+    objectsPm: Map<IBaseObject, Promise<any>>;
+    scene: IBaseObject;
     mList: MList;
-    group: Group;
-    prefabGroup: Group;
+    group: IBaseObject;
+    prefabGroup: IBaseObject;
     private objectNamesToFactories;
     get objectsPromise(): IterableIterator<Promise<any>>;
     constructor(pencil: Pencil, ops: {
         scene: Scene;
         mList: MList;
     });
+    private createBaseObject;
     init<K extends {
         [key: string]: new (...args: any[]) => IBaseObject;
     }>(objectFactories: K): Draw<K>;
@@ -48,6 +48,8 @@ export default class Draw<T extends {
     updateBaseObjectKey(baseObject: IBaseObject, keyOrigin: 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;
+    private handleErase;
     update(delta: number, elapsed: number): void;
     setSize(width: number, height: number): void;
     eraseAll(): void;

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

@@ -24,7 +24,6 @@ export default class Pick {
     private domElement;
     constructor(pencil: Pencil);
     private addPickListener;
-    private sortIntersections;
     private processIntersection;
     private processObjectHierarchy;
     private handleLeaveEvents;

package/dist/core/MList/MList.d.ts

@@ -4,23 +4,22 @@ import Pencil from "../Pencil";
 export default class MaterialList {
     pencil: Pencil;
     private materials;
+    private fixBaseObjects;
     private materialBaseObjectMap;
-    private fixBufferGeometry;
     constructor(pencil: Pencil);
-    add(key: string, material: Material, baseObject?: IBaseObject): void;
+    add(key: string, material: Material): void;
     get(key: string): Material | undefined;
     getKey(material: Material): string | undefined;
+    getFixBaseObject(key: string): IBaseObject | null;
     addMultiple(key: string, materialMap: Record<string, Material | null>): void;
     getMultiple(key: string): Record<string, Material> | null;
     copyMultiple(sourceKey: string, destinationKey: string): Record<string, Material>;
-    disposeMaterial(material: Material): void;
+    disposeMaterial(material?: Material): void;
     remove(key: string): void;
-    updateKey(oldKey: string, newKey: string): void;
     removeByMaterial(material: Material): void;
     proxyBaseObject(object: IBaseObject): void;
-    addByBaseObject(object: IBaseObject): void;
-    rmBaseObjectMap(object: IBaseObject, targetMaterial?: Material): void;
-    getBaseObjectByMaterial(material: Material): Set<IBaseObject> | null;
-    emitObject3dChange(): void;
+    addBaseObjectMap(object: IBaseObject): void;
+    rmBaseObjectMap(object: IBaseObject, targetMaterial?: Material, disposeMaterial?: boolean): void;
+    syncChangeMaterial(oldMaterial: Material, material: Material): void;
     dispose(): void;
 }

package/dist/core/Pencil.d.ts

@@ -39,6 +39,7 @@ interface Options {
     css3DRenderer?: boolean;
     css3DRendererParams?: Partial<CSSRendererParams>;
     WebGPUTHREE?: any;
+    mList?: boolean;
 }
 type DeepRequiredOptions = DeepRequired<Options>;
 export default class Pencil {
@@ -133,6 +134,7 @@ export default class Pencil {
         css3DRendererParams: {
             zIndex: string;
         };
+        mList: boolean;
     };
     private TweenRaf;
     private tweenUpdateRaf;

package/dist/core/ResourceTracker.d.ts

@@ -1,13 +1,11 @@
 import { Material, Object3D, Texture, BufferGeometry } from 'three';
-type Resource = Object3D | Material | Texture | BufferGeometry | ResourceTracker | HTMLVideoElement;
+import BaseObject from './BaseObject';
+type Resource = Object3D | Material | Texture | BufferGeometry | BaseObject | HTMLVideoElement;
 export default class ResourceTracker {
     resources: Set<Resource>;
-    disposeWithMaterial: boolean;
+    disposeMaterial: boolean;
     disposeVideo: boolean;
-    object3d: Object3D;
-    materialList: Record<string, Material | Material[]>;
-    disposeTrack: boolean;
-    track(resource: Resource | Resource[]): Resource | Resource[];
+    track(resource: Resource | Resource[]): Material | Texture | BaseObject | Object3D<import("three").Object3DEventMap> | BufferGeometry<import("three").NormalBufferAttributes> | HTMLVideoElement | Resource[];
     dispose(): void;
 }
 export {};