gl-draw 0.13.2 → 0.13.4

package/dist/core/BaseObject.d.ts

@@ -1,7 +1,7 @@
 import * as THREE from 'three';
 import type Pencil from "./Pencil";
-import type Draw from "../plugins/Draw";
-import type { PickFunctionsItem } from "../plugins/Draw";
+import type Draw from "./Lead/Lead";
+import type { PickFunctionsItem } from "./Lead/Lead";
 export { CSS3DObject, CSS3DSprite, } from 'three/examples/jsm/renderers/CSS3DRenderer';
 export { CSS2DObject } from 'three/examples/jsm/renderers/CSS2DRenderer';
 export default class BaseObject {

package/dist/core/Camera.d.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { EventEmitter } from 'events';
+import Pages from "./Pages";
 export interface CameraParams {
     fov: number;
     near: number;
@@ -16,32 +16,25 @@ interface Options {
     width: number;
     height: number;
 }
-export default class {
-    event: EventEmitter;
-    cameraArr: THREE.PerspectiveCamera[];
-    cameraActiveIndex: number;
+export default class extends Pages<THREE.PerspectiveCamera> {
     get camera(): THREE.PerspectiveCamera;
-    customCamera: boolean;
     width: number;
     height: number;
     constructor(options: Options);
-    addPerspectiveCamera(cameraParams: {
+    addPerspectiveCamera(cameraParams?: {
         fov: number;
         aspect?: number;
         near: number;
         far: number;
         up: THREE.Vector3;
-    }): THREE.PerspectiveCamera;
-    removeCamera(index: number): void;
-    setCameraActive(index: number): void;
+    }, index?: number): THREE.PerspectiveCamera;
     setSize(width: number, height: number): void;
-    cloneCamera(): THREE.PerspectiveCamera;
+    cloneCamera(index?: number): THREE.PerspectiveCamera;
     sync(camera: THREE.PerspectiveCamera | {
         fov: number;
         viewMatrix: any;
         inverseViewMatrix: any;
         type?: string;
     }): void;
-    dispose(): void;
 }
 export {};

package/dist/core/Composer.d.ts

@@ -1,5 +1,4 @@
 import * as THREE from 'three';
-import GUI from 'lil-gui';
 import CameraController from './Camera';
 import SceneController from './Scene';
 import RendererController from './Renderer';
@@ -66,9 +65,7 @@ export default class {
     addOutputPass(): void;
     setPremultiplieAlpha(premultiplieAlpha: boolean): void;
     addSSAOPass(params: SSAOParams): void;
-    addSSAOGui(gui: GUI): void;
     addBloomPass(params: BloomParams): void;
-    addBloomGui(gui: GUI): void;
     bloomSelection: Set<THREE.Object3D<THREE.Object3DEventMap>>;
     bloomLayer: THREE.Layers;
     bloomMaterials: Record<string, THREE.Material | THREE.Material[]>;

package/dist/core/Controls.d.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import CameraControls from './CameraControls';
-import { EventEmitter } from 'events';
+import Pages from "./Pages";
 export interface ControlsParams {
     domElement: HTMLElement;
 }
@@ -8,20 +8,16 @@ export declare const defaultControlsParams: {};
 interface Options {
     controlsParams: ControlsParams;
 }
-export default class {
-    event: EventEmitter;
+export default class extends Pages<CameraControls> {
     options: Options;
-    cameraControlsArr: CameraControls[];
-    cameraControlsActiveIndex: number;
     get cameraControls(): CameraControls;
     autoRotateSpeed: number;
     constructor(options: Options);
-    addCameraControls(camera: THREE.PerspectiveCamera | THREE.OrthographicCamera, interactiveArea?: DOMRect): CameraControls;
-    removeCameraControls(index: number): void;
-    setCameraControlsActive(index: number): void;
+    addCameraControls(camera: THREE.PerspectiveCamera | THREE.OrthographicCamera, index?: number): CameraControls;
+    setPageActive(index: number): void;
+    removePage(index: number): void;
     enable(): void;
     disable(): void;
     update(delta: number): void;
-    dispose(): void;
 }
 export {};

package/dist/{plugins/Draw.d.ts → core/Lead/Lead.d.ts}

@@ -1,7 +1,7 @@
 import * as THREE from 'three';
-import { IBaseObject } from "../core/BaseObject";
-import Group from "../objects/group";
-import Pencil from "../core/Pencil";
+import { IBaseObject } from "../BaseObject";
+import Group from "../../objects/group";
+import Pencil from "../Pencil";
 type KeyOf<T extends object> = Extract<keyof T, string>;
 export type PickFunctionsItem = {
     objArr: IBaseObject[] | (() => IBaseObject[]);
@@ -10,9 +10,7 @@ export type PickFunctionsItem = {
 };
 export default class Draw<T extends {
     [key: string]: new (...args: any[]) => IBaseObject;
-}> {
-    pluginName: string;
-    pencil: Pencil;
+} = any> {
     objMap: Map<THREE.Object3D<THREE.Object3DEventMap>, IBaseObject>;
     targetNullMap: Map<THREE.Object3D<THREE.Object3DEventMap>, IBaseObject>;
     objects: Map<string, IBaseObject>;
@@ -20,13 +18,14 @@ export default class Draw<T extends {
     prefabGroupMap: Map<THREE.Scene, Group>;
     get group(): Group | undefined;
     get prefabGroup(): Group | undefined;
-    private objects_;
+    pencil: Pencil;
+    get scene(): THREE.Scene;
     private objectNamesToFactories;
     get objectsPromise(): Promise<any>[];
-    constructor(objects: T);
-    scene: THREE.Scene | undefined;
-    install(pencil: Pencil): void;
-    initObjectFactories(): void;
+    constructor(pencil: Pencil, objectFactories: T);
+    init<K extends {
+        [key: string]: new (...args: any[]) => IBaseObject;
+    }>(objectFactories: K): Draw<K>;
     getObject<Y extends KeyOf<T>>(nameOrigin: Y, options?: {
         key: string;
     }): InstanceType<T[Y]> | undefined;
@@ -53,6 +52,7 @@ export default class Draw<T extends {
     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;
     private removeBaseObject;
     update(delta: number, elapsed: number): void;
     setSize(width: number, height: number): void;

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

@@ -0,0 +1,18 @@
+import Lead from './Lead';
+import Pencil from "../Pencil";
+import Pages from "../Pages";
+export interface LeadParams {
+}
+export declare const defaultDrawParams: {};
+interface Options {
+    leadParams?: LeadParams;
+    pencil: Pencil;
+}
+export default class extends Pages<Lead> {
+    options: Options;
+    get lead(): Lead<any>;
+    constructor(options: Options);
+    addLead(_: any, index?: number): Lead<any>;
+    removePage(index: number): void;
+}
+export {};

package/dist/core/Loader/Loader.d.ts

@@ -41,7 +41,6 @@ export interface Options {
     scene: THREE.Scene | null;
 }
 export default class Loader {
-    pluginName: string;
     loadingManager: THREE.LoadingManager;
     textureLoader?: TextureLoader;
     videoTextureLoader?: TextureLoader;

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

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import Loader from './Loader';
-import { EventEmitter } from 'events';
+import Pages from "../Pages";
 export interface LoaderParams {
     anisotropy: number;
     prefix?: string;
@@ -12,16 +12,11 @@ export declare const defaultLoaderParams: {
 interface Options {
     loaderParams: LoaderParams;
 }
-export default class {
-    event: EventEmitter;
+export default class extends Pages<Loader> {
     options: Options;
-    loaderArr: Loader[];
-    loaderActiveIndex: number;
     get loader(): Loader;
     constructor(options: Options);
-    addLoader(scene: THREE.Scene): Loader;
-    removeLoader(index: number): void;
-    setLoaderActive(index: number): void;
-    dispose(): void;
+    addLoader(scene: THREE.Scene, index?: number): Loader;
+    removePage(index: number): void;
 }
 export {};

package/dist/core/Pages/Pages.d.ts

@@ -0,0 +1,12 @@
+declare class Pages {
+    mask: number;
+    constructor();
+    set(layer: number): void;
+    enable(layer: number): void;
+    enableAll(): void;
+    toggle(layer: number): void;
+    disable(layer: number): void;
+    disableAll(): void;
+    isEnabled(layer: number): boolean;
+}
+export { Pages };

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

@@ -0,0 +1,12 @@
+import { Pages } from './Pages';
+import { EventEmitter } from 'events';
+export default class<T = any> {
+    event: EventEmitter;
+    controllerMap: Map<T, Pages>;
+    activeIndex: number;
+    controller: T;
+    addController(c: T, index?: number): T;
+    removePage(index: number, cb?: (c: T) => void): void;
+    setPageActive(index: number, cb?: (c: T, r: boolean) => void): void;
+    dispose(): void;
+}

package/dist/core/Pencil.d.ts

@@ -2,7 +2,6 @@ import * as THREE from 'three';
 import { Timer } from 'three/examples/jsm/misc/Timer';
 import { EventEmitter } from 'events';
 import Stats from 'stats-gl';
-import GUI from 'lil-gui';
 import RendererController, { RendererParams } from "./Renderer";
 import CameraController, { CameraParams } from "./Camera";
 import SceneController, { SceneParams } from "./Scene";
@@ -12,14 +11,14 @@ import TransformController from "./TransformControls";
 import CSSRendererController, { CSSRendererParams } from "./CSSRenderer";
 import ComposerController, { BloomParams, SSAOParams, ComposerParams } from "./Composer";
 import LoaderController, { LoaderParams } from "./Loader";
-import type { Draw, Wk } from "../plugins";
+import LeadController from "./Lead";
+import type { Wk } from "../plugins";
 type DeepRequired<T> = T extends Function | HTMLElement ? T : T extends object ? {
     [P in keyof T]-?: DeepRequired<T[P]>;
 } : T;
 interface Options {
     container: HTMLElement;
     stats?: boolean;
-    gui?: boolean;
     helper?: boolean;
     viewHelper?: boolean;
     controls?: Partial<ControlsParams>;
@@ -55,13 +54,12 @@ export default class Pencil {
     sceneController: SceneController;
     helperController?: HelperController;
     loaderController: LoaderController;
+    leadController: LeadController;
     stats?: Stats;
-    gui?: GUI;
     private resizeObserver;
     private raycaster;
     private maxBackufferArea;
     installPlugins: Map<string, any>;
-    getPlugin(name: 'draw'): Draw<any>;
     getPlugin(name: 'worker'): Wk;
     get renderer(): THREE.WebGLRenderer;
     get maxAnisotropy(): number;
@@ -73,12 +71,12 @@ export default class Pencil {
     get camera(): THREE.PerspectiveCamera;
     get scene(): THREE.Scene;
     get loader(): import("./Loader/Loader").default;
+    get lead(): import("..").Lead<any>;
     event: EventEmitter;
     timer: Timer;
     userData: Record<string, any>;
     static options: {
         stats: boolean;
-        gui: boolean;
         helper: boolean;
         viewHelper: boolean;
         controls: boolean;
@@ -135,13 +133,14 @@ export default class Pencil {
     };
     constructor(options: Options);
     use(plugin: any, ...args: any[]): void;
-    pageActiveIndex: number;
-    addPage({ sceneOptions, cameraOptions, }: {
+    addPage({ sceneOptions, cameraOptions, }?: {
         sceneOptions?: SceneParams;
-        cameraOptions: CameraParams;
+        cameraOptions?: CameraParams;
     }): number;
     removePage(index: number): void;
     showPage(index: number): void;
+    pageActiveIndex: number;
+    private pageCountIndex;
     private init;
     private initComposer;
     private initCSSRenderer;
@@ -163,6 +162,7 @@ export default class Pencil {
     start(): void;
     stop(): void;
     autoRotate(speed: number): void;
+    private pipCameraControls?;
     showPipViewport(state: typeof ComposerController.prototype.pipViewportState): void;
     dispose(): void;
 }

package/dist/core/Scene.d.ts

@@ -1,5 +1,5 @@
 import * as THREE from 'three';
-import { EventEmitter } from 'events';
+import Pages from "./Pages";
 export interface SceneParams {
     background: THREE.Scene['background'];
 }
@@ -8,17 +8,11 @@ export declare const defaultSceneParams: {
 };
 interface Options {
 }
-export default class {
+export default class extends Pages<THREE.Scene> {
     options: Options;
-    event: EventEmitter;
-    sceneArr: THREE.Scene[];
-    sceneActiveIndex: number;
     get scene(): THREE.Scene;
-    overrideMaterial: boolean;
     constructor(options: Options);
-    addScene(sceneParams?: SceneParams): THREE.Scene;
-    removeScene(index: number): void;
-    setSceneActive(index: number): void;
-    dispose(): void;
+    addScene(sceneParams?: SceneParams, index?: number): THREE.Scene;
+    removePage(index: number): void;
 }
 export {};

package/dist/index.d.ts

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