gl-draw 0.17.0-beta.3 → 0.17.0-beta.31

package/dist/constants.d.ts

@@ -1,4 +1,3 @@
 export declare const ENTIRE_SCENE = 0;
 export declare const BLOOM_SCENE = 1;
-export declare const HIDE_SCENE = 2;
 export declare const IS_DEV: boolean;

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

@@ -6,6 +6,7 @@ export default class PointerEvent {
     onPointerEvent(type: PickFunctionsItem['type'], cb: PickFunctionsItem['cb']): void;
     onClick(cb: PickFunctionsItem['cb']): void;
     onPointerEnter(cb: PickFunctionsItem['cb']): void;
+    onPointerEnterOnStop(cb: PickFunctionsItem['cb']): void;
     onPointerLeave(cb: PickFunctionsItem['cb']): void;
     onPointerMove(cb: PickFunctionsItem['cb']): void;
     onPointerDown(cb: PickFunctionsItem['cb']): void;

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

@@ -1,4 +1,4 @@
-import { Material, Mesh, type Object3D, Points, type SpriteMaterial, Vector3 } from 'three';
+import { type Material, Mesh, type Object3D, Points, type SpriteMaterial, Vector3 } from 'three';
 import type Lead from "../Lead/Lead";
 import type MList from "../MList/MList";
 import type Pencil from "../Pencil";
@@ -30,7 +30,6 @@ export default class BaseObject extends UseMaterial {
     add(...object: Object3D[]): void;
     remove(...object: Object3D[]): void;
     get visible(): boolean;
-    get visibleWithAncestors(): boolean;
     create(): void;
     render(): void;
     update(_delta: number, _elapsed: number): void;
@@ -67,9 +66,10 @@ export default class BaseObject extends UseMaterial {
     }): Promise<this>;
     erase(): void;
     handleMaterialChange(mat: Material | null): void;
-    enableBloom(): void;
-    disableBloom(): void;
+    enableBloom(traverse?: boolean): void;
+    disableBloom(traverse?: boolean): void;
     disposeTrack: boolean;
+    private isDispose;
     dispose(): void;
 }
 export interface IBaseObject extends BaseObject {

package/dist/core/Composer.d.ts

@@ -1,14 +1,14 @@
-import { Camera, Layers, Material, Scene, Vector2, WebGLRenderer } from 'three';
+import { type Camera, Layers, type Material, type Scene, Vector2, type WebGLRenderer } from 'three';
 import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer';
 import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass';
 import { SSAOPass } from 'three/examples/jsm/postprocessing/SSAOPass';
 import { UnrealBloomPass } from 'three/examples/jsm/postprocessing/UnrealBloomPass';
 import type { IBaseObject } from './BaseObject';
-import CameraController from './Camera';
+import type CameraController from './Camera';
 import getMixPass from './pass/MixPass';
 import { OutputPass } from './pass/OutputPass';
-import RendererController from './Renderer';
-import SceneController from './Scene';
+import type RendererController from './Renderer';
+import type SceneController from './Scene';
 export interface BloomParams {
     threshold: number;
     strength: number;
@@ -70,7 +70,7 @@ export default class {
     bloomLayer: Layers;
     bloomMaterials: Record<string, Material | Material[]>;
     bloomVisible: Record<string, boolean>;
-    setBloomSelection(baseObject: IBaseObject, state: boolean): void;
+    checkBloomComposerActive(): void;
     enable(): void;
     disable(): void;
     setSize(width: number, height: number): void;

package/dist/core/Helper.d.ts

@@ -1,8 +1,8 @@
-import { Vector3, WebGLRenderer } from 'three';
+import { type Vector3, type WebGLRenderer } from 'three';
 import { ViewHelper } from 'three/examples/jsm/helpers/ViewHelper';
-import ControlsController from "./Controls";
-import SceneController from './Scene';
-import CameraController from './Camera';
+import type ControlsController from "./Controls";
+import type CameraController from './Camera';
+import type SceneController from './Scene';
 interface Options {
     sceneController: SceneController;
     cameraController: CameraController;

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

@@ -1,8 +1,8 @@
-import { IBaseObject } from "../BaseObject";
-import Pencil from "../Pencil";
+import type { IBaseObject } from "../BaseObject";
+import type Pencil from "../Pencil";
 export type PickFunctionsItem = {
     objArr: IBaseObject[] | (() => IBaseObject[]);
-    type: 'move' | 'enter' | 'leave' | 'down' | 'click' | 'downOutside';
+    type: 'move' | 'enter' | 'leave' | 'down' | 'click' | 'downOutside' | 'enterOnStop';
     cb: (data: {
         baseObject: IBaseObject;
         realBaseObject?: IBaseObject;
@@ -23,6 +23,19 @@ export default class Pick {
     private prevActiveObjects;
     private objCallbackMap;
     private pickListener;
+    /** 是否有 enterOnStop 事件注册 */
+    private hasEnterOnStopEvent;
+    /** 需要检测 cursor 的物体 Map<obj, cursorStyle> */
+    private cursorObjects;
+    private cursorListenerAdded;
+    /** 用于检测鼠标停止移动 */
+    private moveStopTimer;
+    private moveStopDelay;
+    private lastMoveEvent;
+    private lastMoveActiveObjects;
+    private lastMoveRealActiveObject;
+    /** 已经触发过 enterOnStop 的物体，用于防止重复触发 */
+    private triggeredEnterOnStopObjects;
     private domElement;
     constructor(pencil: Pencil);
     private addPickListener;
@@ -30,6 +43,25 @@ export default class Pick {
     private processObjectHierarchy;
     private handleLeaveEvents;
     private handleDownOutside;
+    /** 处理鼠标停止移动事件 */
+    private handleMoveStop;
+    /** 触发 enterOnStop 事件 */
+    private triggerEnterOnStop;
+    /** 重置鼠标样式 */
+    private resetCursor;
+    /** 添加 cursor 检测监听器 */
+    private addCursorListener;
+    /**
+     * 启用物体的 cursor 检测
+     * @param obj 要检测的 BaseObject
+     * @param cursor 鼠标样式，默认 'pointer'
+     */
+    enableCursor(obj: IBaseObject, cursor?: string): void;
+    /**
+     * 禁用物体的 cursor 检测
+     * @param obj 要移除的 BaseObject
+     */
+    disableCursor(obj: IBaseObject): void;
     handlePick(objArr: PickFunctionsItem['objArr'], t: PickFunctionsItem['type'], cb: PickFunctionsItem['cb']): number;
     removePick(key: number): void;
     handlePickNode(objArr: PickFunctionsItem['objArr'], t: PickFunctionsItem['type'], cb: PickFunctionsItem['cb']): number;

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

@@ -1,10 +1,9 @@
-import { Scene } from 'three';
-import Lead from './Lead';
-import Pencil from "../Pencil";
-import Pages from "../Pages";
+import type { Scene } from 'three';
 import type MList from "../MList/MList";
-export interface LeadParams {
-}
+import Pages from "../Pages";
+import type Pencil from "../Pencil";
+import Lead from './Lead';
+export type LeadParams = {};
 export declare const defaultDrawParams: {};
 interface Options {
     leadParams?: LeadParams;

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

@@ -8,5 +8,6 @@ declare class Pages {
     disable(layer: number): void;
     disableAll(): void;
     isEnabled(layer: number): boolean;
+    getMinDisabledLayer(): number | null;
 }
 export { Pages };

package/dist/core/Pencil.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import Stats from 'stats-gl';
-import { type Object3D, type PerspectiveCamera, Timer, Vector3 } from 'three';
+import { type Object3D, type PerspectiveCamera, Raycaster, Timer, Vector3 } from 'three';
 import CameraController, { type CameraParams } from "./Camera";
 import ComposerController, { type BloomParams, type ComposerParams, type SSAOParams } from "./Composer";
 import ControlsController, { type ControlsParams } from "./Controls";
@@ -58,7 +58,7 @@ export default class Pencil {
     mListController: MListController;
     stats?: Stats;
     private resizeObserver;
-    private raycaster;
+    raycaster: Raycaster;
     private maxBackufferArea;
     installPlugins: Map<string, any>;
     getPlugin(name: 'worker'): Wk;
@@ -144,7 +144,7 @@ export default class Pencil {
     removePage(index: number): void;
     showPage(index: number): void;
     private pageActiveIndex;
-    private pageCountIndex;
+    private pages;
     private init;
     private initComposer;
     private initCSSRenderer;

package/dist/core/pass/OutputPass.d.ts

@@ -11,9 +11,8 @@ declare class OutputPassFix extends OutputPass {
             value: number;
         };
     };
-    material: RawShaderMaterial;
+    fsQuad: FullScreenQuad | undefined;
     _fsQuad: FullScreenQuad | undefined;
 }
 import { OutputPass } from 'three/examples/jsm/postprocessing/OutputPass';
-import { RawShaderMaterial } from 'three';
 import { FullScreenQuad } from 'three/examples/jsm/postprocessing/Pass';