lythreeframe 1.2.62 → 1.2.64

package/dist/lythreeframe/Frame/Controller.d.ts

@@ -4,29 +4,25 @@ import { World } from "./World";
 import { Viewport } from "./Viewport";
 import { Pawn } from "../Object/PawnV2/Pawn";
 import { SceneComponent } from "../Object/Components/SceneComponent";
+import { Actor } from "../Object/Actor";
 import { Delegate } from "../Delegate";
 export interface HitResult {
     component: SceneComponent;
     hit: Intersection;
 }
-/** 组件交互事件基类 */
+/** 组件交互事件 */
 export interface ComponentInteractionEvent {
     component: SceneComponent;
     hit: Intersection;
-    /** 设置为 true 阻止组件自身的回调被调用 */
     handled: boolean;
-    /** 点击时是否按下 Ctrl 键 */
     ctrlKey: boolean;
-    /** 点击时是否按下 Shift 键 */
     shiftKey: boolean;
-    /** 点击时是否按下 Alt 键 */
     altKey: boolean;
 }
 /** 组件悬停事件 */
 export interface ComponentHoverEvent {
     component: SceneComponent;
     hit: Intersection | null;
-    /** 设置为 true 阻止组件自身的 onHoveringBegin/End 被调用 */
     handled: boolean;
 }
 /** 组件按下事件 */
@@ -34,13 +30,31 @@ export interface ComponentPointerDownEvent {
     component: SceneComponent;
     hit: Intersection;
     button: number;
-    /** 设置为 true 阻止默认处理 */
+    handled: boolean;
+}
+/** Actor 交互事件 */
+export interface ActorInteractionEvent {
+    actor: Actor;
+    component: SceneComponent;
+    hit: Intersection;
+    handled: boolean;
+    ctrlKey: boolean;
+    shiftKey: boolean;
+    altKey: boolean;
+}
+/** Actor 悬停事件 */
+export interface ActorHoverEvent {
+    actor: Actor;
+    component: SceneComponent;
+    hit: Intersection | null;
     handled: boolean;
 }
 export declare class Controller {
     protected _app: ThreeJsApp;
     protected _pawn: Pawn | null;
     protected raycaster: Raycaster;
+    protected hoveringComponent: SceneComponent | null;
+    protected hoveringActor: Actor | null;
     protected prepareClickComponent: SceneComponent | null;
     protected prepareClickHit: Intersection | null;
     protected prepareClickModifiers: {
@@ -48,14 +62,17 @@ export declare class Controller {
         shiftKey: boolean;
         altKey: boolean;
     };
-    protected hoveringComponent: SceneComponent | null;
     protected _pointButtonIsDown: Set<number>;
-    protected _onClickNothingDelegate: Delegate<[void]>;
     protected _onComponentClickDelegate: Delegate<[ComponentInteractionEvent]>;
     protected _onComponentDoubleClickDelegate: Delegate<[ComponentInteractionEvent]>;
     protected _onComponentHoverBeginDelegate: Delegate<[ComponentHoverEvent]>;
     protected _onComponentHoverEndDelegate: Delegate<[ComponentHoverEvent]>;
     protected _onComponentPointerDownDelegate: Delegate<[ComponentPointerDownEvent]>;
+    protected _onActorClickDelegate: Delegate<[ActorInteractionEvent]>;
+    protected _onActorDoubleClickDelegate: Delegate<[ActorInteractionEvent]>;
+    protected _onActorHoverBeginDelegate: Delegate<[ActorHoverEvent]>;
+    protected _onActorHoverEndDelegate: Delegate<[ActorHoverEvent]>;
+    protected _onClickNothingDelegate: Delegate<[void]>;
     protected pointerPosition: Vector2;
     protected pointerLeftDownPosition: Vector2;
     protected readonly _tempVec2: Vector2;
@@ -71,34 +88,39 @@ export declare class Controller {
     get world(): World;
     get viewPort(): Viewport;
     get app(): ThreeJsApp;
-    get onClickNothingDelegate(): Delegate<[void]>;
+    get pawn(): Pawn;
     get onComponentClickDelegate(): Delegate<[ComponentInteractionEvent]>;
     get onComponentDoubleClickDelegate(): Delegate<[ComponentInteractionEvent]>;
     get onComponentHoverBeginDelegate(): Delegate<[ComponentHoverEvent]>;
     get onComponentHoverEndDelegate(): Delegate<[ComponentHoverEvent]>;
     get onComponentPointerDownDelegate(): Delegate<[ComponentPointerDownEvent]>;
-    get pawn(): Pawn;
+    get onActorClickDelegate(): Delegate<[ActorInteractionEvent]>;
+    get onActorDoubleClickDelegate(): Delegate<[ActorInteractionEvent]>;
+    get onActorHoverBeginDelegate(): Delegate<[ActorHoverEvent]>;
+    get onActorHoverEndDelegate(): Delegate<[ActorHoverEvent]>;
+    get onClickNothingDelegate(): Delegate<[void]>;
     constructor(app: ThreeJsApp);
     init(): void;
     updateCamera(): void;
     tick(deltaTime: number): void;
     destroy(): void;
     protected onPointerMoveEvent(event: MouseEvent): void;
-    protected clearHoveringComponent(): void;
-    protected fireHoverEvent(component: SceneComponent, hit: Intersection | null, isBegin: boolean): void;
+    protected clearHovering(): void;
     protected onPointerUpEvent(event: MouseEvent): void;
     protected handleFirstClick(): void;
     protected handleDoubleClick(): void;
-    protected fireClickEvent(component: SceneComponent, hit: Intersection, isDoubleClick: boolean, modifiers: {
-        ctrlKey: boolean;
-        shiftKey: boolean;
-        altKey: boolean;
-    }): void;
-    protected clearClickTimer(): void;
     protected onPointerDownEvent(event: MouseEvent): void;
-    protected firePointerDownEvent(component: SceneComponent, hit: Intersection, button: number): void;
     protected onPointerEnterEvent(_event: MouseEvent): void;
     protected onPointerLeaveEvent(_event: MouseEvent): void;
+    protected fireComponentHoverBegin(component: SceneComponent, hit: Intersection): void;
+    protected fireComponentHoverEnd(component: SceneComponent): void;
+    protected fireComponentClick(component: SceneComponent, hit: Intersection, isDoubleClick: boolean): void;
+    protected firePointerDownEvent(component: SceneComponent, hit: Intersection, button: number): void;
+    protected fireActorHoverBegin(actor: Actor, component: SceneComponent, hit: Intersection): void;
+    protected fireActorHoverEnd(actor: Actor, component: SceneComponent): void;
+    protected fireActorClick(actor: Actor, component: SceneComponent, hit: Intersection, isDoubleClick: boolean): void;
+    protected fireClickEvents(component: SceneComponent, hit: Intersection, isDoubleClick: boolean): void;
+    protected clearClickTimer(): void;
     protected addCorePointerListeners(): void;
     protected removeCorePointerListeners(): void;
     getHitResultUnderCursor(): HitResult | null;

package/dist/lythreeframe/Object/Actor.d.ts

@@ -4,6 +4,7 @@ import { BaseObject } from "./BaseObject";
 import { World } from "../Frame/World";
 import { ThreeJsApp } from "../ThreeJsApp";
 import { SceneComponent } from "./Components/SceneComponent";
+import { Delegate } from "../Delegate";
 export declare class Actor extends BaseObject {
     get world(): World | null;
     get name(): string;
@@ -20,10 +21,14 @@ export declare class Actor extends BaseObject {
     protected _rootComponent: SceneComponent | null;
     protected _world: World | null;
     protected app: ThreeJsApp;
-    protected onClickedEvent: ((component?: SceneComponent) => void)[];
-    protected onDoubleClickedEvent: ((component?: SceneComponent) => void)[];
-    protected onHoverBeginEvent: ((component?: SceneComponent) => void)[];
-    protected onHoverEndEvent: ((component?: SceneComponent) => void)[];
+    protected _onHoverBeginDelegate: Delegate<[SceneComponent]>;
+    protected _onHoverEndDelegate: Delegate<[SceneComponent]>;
+    protected _onClickDelegate: Delegate<[SceneComponent]>;
+    protected _onDoubleClickDelegate: Delegate<[SceneComponent]>;
+    get onHoverBeginDelegate(): Delegate<[SceneComponent]>;
+    get onHoverEndDelegate(): Delegate<[SceneComponent]>;
+    get onClickDelegate(): Delegate<[SceneComponent]>;
+    get onDoubleClickDelegate(): Delegate<[SceneComponent]>;
     constructor(app: ThreeJsApp, uuid?: string);
     protected constructRootComponent(): SceneComponent;
     getBoundsCenterPosition(bInWorldSpace?: boolean): Vector3;
@@ -73,20 +78,8 @@ export declare class Actor extends BaseObject {
     set isHoverEnabled(bCanHorver: boolean);
     get isClickEnabled(): boolean;
     set isClickEnabled(bCanHorver: boolean);
-    addHoveringBeginEvent(newFunc: (component?: SceneComponent) => void): void;
-    removeHoveringBeginEvent(target: (component?: SceneComponent) => void): void;
-    clearHoveringBeginEvent(): void;
-    onComponentHorveringBegin(component: SceneComponent): void;
-    addHoveringEndEvent(newFunc: (component?: SceneComponent) => void): void;
-    removeHoveringEndEvent(target: (component?: SceneComponent) => void): void;
-    clearHoveringEndEvent(): void;
-    onComponentHorveringEnd(component: SceneComponent): void;
-    addClickEvent(newFunc: (component?: SceneComponent) => void): void;
-    removeClickEvent(target: (component?: SceneComponent) => void): void;
-    clearClickEvent(): void;
-    onComponentClicked(component: SceneComponent): void;
-    addDoubleClickEvent(newFunc: (component?: SceneComponent) => void): void;
-    removeDoubleClickEvent(target: (component?: SceneComponent) => void): void;
-    onComponentDoubleClicked(component: SceneComponent): void;
-    clearDoubleClickEvent(): void;
+    onActorHoverBegin(component: SceneComponent): void;
+    onActorHoverEnd(component: SceneComponent): void;
+    onActorClick(component: SceneComponent): void;
+    onActorDoubleClick(component: SceneComponent): void;
 }

package/dist/lythreeframe/Object/Components/SceneComponent.d.ts

@@ -4,11 +4,20 @@ import { Component } from "./Component";
 import { World } from "../../Frame/World";
 import { AttachmentRules } from "../../Defines";
 import { ThreeJsApp } from "../../ThreeJsApp";
+import { Delegate } from "../../Delegate";
 export declare class SceneComponent extends Component {
     set parentActor(value: Actor | null);
     get parentActor(): Actor | null;
     protected bCanHover: boolean;
     protected bCanClick: boolean;
+    protected _onHoverBeginDelegate: Delegate<[void]>;
+    protected _onHoverEndDelegate: Delegate<[void]>;
+    protected _onClickDelegate: Delegate<[void]>;
+    protected _onDoubleClickDelegate: Delegate<[void]>;
+    get onHoverBeginDelegate(): Delegate<[void]>;
+    get onHoverEndDelegate(): Delegate<[void]>;
+    get onClickDelegate(): Delegate<[void]>;
+    get onDoubleClickDelegate(): Delegate<[void]>;
     get world(): World;
     protected app: ThreeJsApp;
     constructor(app: ThreeJsApp, uuid?: string);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lythreeframe",
-  "version": "1.2.62",
+  "version": "1.2.64",
   "description": "Three.js 封装",
   "main": "dist/bundle.cjs.js",
   "module": "dist/bundle.esm.js",