gl-draw 0.17.0-beta.4 → 0.17.0-beta.41

package/dist/cartographicToCartesian.js

@@ -0,0 +1 @@
+"use strict";var U=Math.pow;const o=require("three"),R=t=>t instanceof o.Vector3?t:new o.Vector3(...t),w=t=>t instanceof o.Vector2?t:new o.Vector2(...t),e={a:6378137,b:6356752314245179e-9,f:1/298.257223563};function x(t,p,u=0,n=1/e.a,h=!1){const s=o.MathUtils.degToRad(t),r=o.MathUtils.degToRad(p),c=Math.cos(r),i=Math.sin(r),d=Math.cos(s),T=Math.sin(s);let q,M,l;if(h){const a=(e.a+u)*n;q=a*c*T,M=a*i,l=a*c*d}else{const g=e.a,a=e.b,V=g*g,S=a*a,b=(V-S)/V,f=g/Math.sqrt(1-b*i*i);q=(f+u)*c*T*n,M=(f*(1-b)+u)*i*n,l=(f+u)*c*d*n}return new o.Vector3(q,M,l)}function y(t,p=1/e.a,u=!1){const n=t.x/p,h=t.y/p,s=t.z/p;if(u){const f=Math.sqrt(n*n+h*h+s*s),L=Math.atan2(n,s),C=Math.asin(h/f),D=f-e.a;return{longitude:o.MathUtils.radToDeg(L),latitude:o.MathUtils.radToDeg(C),height:D}}const r=e.a,c=e.b,i=r*r,d=c*c,T=(i-d)/i,q=(i-d)/d,M=Math.sqrt(n*n+s*s),l=Math.atan2(h*r,M*c),g=Math.atan2(n,s),a=Math.atan2(h+q*c*U(Math.sin(l),3),M-T*r*U(Math.cos(l),3)),V=Math.sin(a),S=r/Math.sqrt(1-T*V*V),b=M/Math.cos(a)-S;return{longitude:o.MathUtils.radToDeg(g),latitude:o.MathUtils.radToDeg(a),height:b}}exports.WGS84=e;exports.cartesianToCartographic=y;exports.cartographicToCartesian=x;exports.parseVector2=w;exports.parseVector3=R;

package/dist/cartographicToCartesian.module.js

@@ -0,0 +1,49 @@
+var x = Math.pow;
+import { Vector3 as D, Vector2 as R, MathUtils as l } from "three";
+const C = (t) => t instanceof D ? t : new D(...t), N = (t) => t instanceof R ? t : new R(...t), r = {
+  a: 6378137,
+  // 赤道半径
+  b: 6356752314245179e-9,
+  // 极半径
+  f: 1 / 298.257223563
+  // 扁率
+};
+function W(t, p, d = 0, n = 1 / r.a, i = !1) {
+  const a = l.degToRad(t), c = l.degToRad(p), s = Math.cos(c), e = Math.sin(c), M = Math.cos(a), b = Math.sin(a);
+  let q, h, u;
+  if (i) {
+    const o = (r.a + d) * n;
+    q = o * s * b, h = o * e, u = o * s * M;
+  } else {
+    const f = r.a, o = r.b, T = f * f, S = o * o, L = (T - S) / T, g = f / Math.sqrt(1 - L * e * e);
+    q = (g + d) * s * b * n, h = (g * (1 - L) + d) * e * n, u = (g + d) * s * M * n;
+  }
+  return new D(q, h, u);
+}
+function G(t, p = 1 / r.a, d = !1) {
+  const n = t.x / p, i = t.y / p, a = t.z / p;
+  if (d) {
+    const g = Math.sqrt(n * n + i * i + a * a), V = Math.atan2(n, a), w = Math.asin(i / g), y = g - r.a;
+    return {
+      longitude: l.radToDeg(V),
+      latitude: l.radToDeg(w),
+      height: y
+    };
+  }
+  const c = r.a, s = r.b, e = c * c, M = s * s, b = (e - M) / e, q = (e - M) / M, h = Math.sqrt(n * n + a * a), u = Math.atan2(i * c, h * s), f = Math.atan2(n, a), o = Math.atan2(
+    i + q * s * x(Math.sin(u), 3),
+    h - b * c * x(Math.cos(u), 3)
+  ), T = Math.sin(o), S = c / Math.sqrt(1 - b * T * T), L = h / Math.cos(o) - S;
+  return {
+    longitude: l.radToDeg(f),
+    latitude: l.radToDeg(o),
+    height: L
+  };
+}
+export {
+  r as W,
+  N as a,
+  G as b,
+  W as c,
+  C as p
+};

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,13 +30,24 @@ export default class BaseObject extends UseMaterial {
     add(...object: Object3D[]): void;
     remove(...object: Object3D[]): void;
     get visible(): boolean;
-    get visibleWithAncestors(): boolean;
+    /**
+     * 检查是否实际可见（自己和所有祖先都 visible）
+     */
+    isActuallyVisible(): boolean;
     create(): void;
     render(): void;
     update(_delta: number, _elapsed: number): void;
     resize(_width: number, _height: number): void;
     show(): this;
     hide(): this;
+    /**
+     * 递归禁用 layers（不管子级自己的 visible 状态，全部 disable）
+     */
+    protected _disableLayersRecursive(): void;
+    /**
+     * 递归启用 layers（只有自己 visible=true 时才 enable 并继续递归）
+     */
+    protected _enableLayersRecursive(): void;
     createGroup(): this;
     createMesh(...args: ConstructorParameters<typeof Mesh>): this;
     createPoints(...args: ConstructorParameters<typeof Points>): this;
@@ -67,9 +78,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/CSSRenderer/CollisionManager.d.ts

@@ -0,0 +1,98 @@
+import type { Camera } from 'three';
+import type Node from "../../objects/node";
+interface CollisionManagerOptions {
+    /** 标签之间的最小间距（像素） */
+    padding?: number;
+    /** 是否启用碰撞检测 */
+    enabled?: boolean;
+    /** 更新节流时间（毫秒） */
+    throttleTime?: number;
+    /** 视口边距，标签超出视口多少像素后隐藏 */
+    viewportMargin?: number;
+}
+/**
+ * 标签碰撞检测管理器
+ * 参考 Mapbox symbol-placement 实现
+ *
+ * 使用方式：
+ * ```ts
+ * const manager = new CollisionManager({ padding: 4 });
+ * manager.add(node, { priority: 10 });
+ * manager.update(camera); // 在渲染循环中调用
+ * ```
+ */
+export declare class CollisionManager {
+    private labels;
+    private options;
+    private lastUpdateTime;
+    private camera?;
+    private animationFrameId?;
+    private isUpdating;
+    constructor(options?: CollisionManagerOptions);
+    /**
+     * 添加标签到碰撞检测系统
+     * @param node Node 实例
+     * @param options 配置项，priority 越大越优先显示，不传则使用 node.options.priority
+     */
+    add(node: Node, options?: {
+        priority?: number;
+    }): void;
+    /**
+     * 移除标签
+     */
+    remove(node: Node): void;
+    /**
+     * 更新标签优先级
+     */
+    setPriority(node: Node, priority: number): void;
+    /**
+     * 批量添加标签
+     */
+    addBatch(nodes: Node[], priorityFn?: (node: Node, index: number) => number): void;
+    /**
+     * 启用/禁用碰撞检测
+     */
+    setEnabled(enabled: boolean): void;
+    /**
+     * 更新碰撞检测（在渲染循环中调用）
+     */
+    update(camera: Camera): void;
+    /**
+     * 强制立即更新
+     */
+    forceUpdate(): void;
+    private performCollisionDetection;
+    /**
+     * 检测矩形是否与已占用区域碰撞
+     */
+    private checkCollision;
+    /**
+     * 检测两个矩形是否相交（包含 padding）
+     */
+    private rectsIntersect;
+    /**
+     * 设置节点可见性
+     */
+    private setNodeVisibility;
+    /**
+     * 获取当前可见的标签数量
+     */
+    getVisibleCount(): number;
+    /**
+     * 获取所有标签数量
+     */
+    getTotalCount(): number;
+    /**
+     * 调试执行碰撞检测（带详细日志）
+     */
+    debugRun(): void;
+    /**
+     * 清空所有标签
+     */
+    clear(): void;
+    /**
+     * 销毁管理器
+     */
+    dispose(): void;
+}
+export default CollisionManager;

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

@@ -1,19 +1,31 @@
 import { CSS2DRenderer } from 'three@latest/examples/jsm/renderers/CSS2DRenderer';
 import { CSS3DRenderer } from 'three@latest/examples/jsm/renderers/CSS3DRenderer';
 import type { PerspectiveCamera, Scene } from 'three';
+import { CollisionManager } from './CollisionManager';
 export interface CSSRendererParams {
-    zIndex: string;
+    zIndex?: string;
     container?: HTMLElement;
+    /** 碰撞检测配置 */
+    collision?: {
+        /** 是否启用碰撞检测，默认 true */
+        enabled?: boolean;
+        /** 标签之间的最小间距（像素），默认 4 */
+        padding?: number;
+        /** 更新节流时间（毫秒），默认 16 */
+        throttleTime?: number;
+        /** 视口边距，默认 50 */
+        viewportMargin?: number;
+    };
 }
-export declare const defaultCSSRendererParams: {
-    zIndex: string;
-};
+export declare const defaultCSSRendererParams: CSSRendererParams;
 export default class {
     css2Drenderer?: CSS2DRenderer;
     css3Drenderer?: CSS3DRenderer;
     container: HTMLElement;
-    constructor(container: HTMLElement);
-    addRenderer(type: 'css2d' | 'css3d', cssRendererParams: CSSRendererParams): void;
+    /** 标签碰撞检测管理器 */
+    collisionManager: CollisionManager;
+    constructor(container: HTMLElement, options?: CSSRendererParams);
+    addRenderer(type: 'css2d' | 'css3d', options?: CSSRendererParams): void;
     setSize(width: number, height: number): void;
     render(scene: Scene, camera: PerspectiveCamera): void;
     dispose(): void;

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;
@@ -126,11 +126,25 @@ export default class Pencil {
         };
         css2DRenderer: boolean;
         css2DRendererParams: {
-            zIndex: string;
+            zIndex?: string;
+            container?: HTMLElement;
+            collision?: {
+                enabled?: boolean;
+                padding?: number;
+                throttleTime?: number;
+                viewportMargin?: number;
+            };
         };
         css3DRenderer: boolean;
         css3DRendererParams: {
-            zIndex: string;
+            zIndex?: string;
+            container?: HTMLElement;
+            collision?: {
+                enabled?: boolean;
+                padding?: number;
+                throttleTime?: number;
+                viewportMargin?: number;
+            };
         };
     };
     private TweenRaf;
@@ -144,7 +158,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';