mmainguy/immersive2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Slight simplification refactor (no functional change)

Browse Source
This commit is contained in:
Michael Mainguy 2024-05-07 19:40:16 -05:00
parent 3ade3d4d6a
commit 01874b9e9e
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/diagram/diagramManager.ts
View File

@ -1,4 +1,4 @@
import {AbstractMesh, ActionManager, InstancedMesh, Mesh, Observable, Scene, WebXRInputSource} from "@babylonjs/core"; import {AbstractMesh, ActionManager, InstancedMesh, Mesh, Observable, Scene} from "@babylonjs/core";
import {DiagramEntity, DiagramEvent, DiagramEventType} from "./types/diagramEntity"; import {DiagramEntity, DiagramEvent, DiagramEventType} from "./types/diagramEntity";
import log from "loglevel"; import log from "loglevel";
import {Controllers} from "../controllers/controllers"; import {Controllers} from "../controllers/controllers";
@ -13,7 +13,6 @@ import {buildEntityActionManager} from "./functions/buildEntityActionManager";
import {isDiagramEntity} from "./functions/isDiagramEntity"; import {isDiagramEntity} from "./functions/isDiagramEntity";
import {DefaultScene} from "../defaultScene"; import {DefaultScene} from "../defaultScene";
import {DiagramMenuManager} from "./diagramMenuManager"; import {DiagramMenuManager} from "./diagramMenuManager";
import {ClickMenu} from "../menus/clickMenu";
import {DiagramEventObserverMask} from "./types/diagramEventObserverMask"; import {DiagramEventObserverMask} from "./types/diagramEventObserverMask";
@ -68,30 +67,15 @@ export class DiagramManager {
return this._diagramMenuManager; return this._diagramMenuManager;
} }
public createClickMenu(mesh: AbstractMesh, grip: WebXRInputSource): ClickMenu {
return this._diagramMenuManager.createClickMenu(mesh, grip);
}
private notifyAll(event: DiagramEvent) {
this.onDiagramEventObservable.notifyObservers(event, DiagramEventObserverMask.ALL);
}
public get controllers(): Controllers { public get controllers(): Controllers {
return this._controllers; return this._controllers;
} }
public createCopy(mesh: AbstractMesh, copy: boolean = false): AbstractMesh { public createCopy(mesh: AbstractMesh, copy: boolean = false): AbstractMesh {
let newMesh; const newMesh = newInstanceFromMeshOrInstance(mesh);
if (!mesh.isAnInstance) {
newMesh = new InstancedMesh('id' + uuidv4(), (mesh as Mesh));
} else {
newMesh = new InstancedMesh('id' + uuidv4(), (mesh as InstancedMesh).sourceMesh);
}
newMesh.id = 'id' + uuidv4(); newMesh.id = 'id' + uuidv4();
newMesh.actionManager = this._diagramEntityActionManager; newMesh.actionManager = this._diagramEntityActionManager;
newMesh.position = mesh.absolutePosition.clone(); newMesh.position = mesh.absolutePosition.clone();
if (mesh.absoluteRotationQuaternion) { if (mesh.absoluteRotationQuaternion) {
newMesh.rotation = mesh.absoluteRotationQuaternion.toEulerAngles().clone(); newMesh.rotation = mesh.absoluteRotationQuaternion.toEulerAngles().clone();
} else { } else {
@ -118,6 +102,13 @@ export class DiagramManager {
} }
} }
function newInstanceFromMeshOrInstance(mesh: AbstractMesh): AbstractMesh {
if (!mesh.isAnInstance) {
return new InstancedMesh('id' + uuidv4(), (mesh as Mesh));
} else {
return new InstancedMesh('id' + uuidv4(), (mesh as InstancedMesh).sourceMesh);
}
}
function cleanupOrphanConnections(mesh: AbstractMesh, diagramEventObservable: Observable<DiagramEvent>) { function cleanupOrphanConnections(mesh: AbstractMesh, diagramEventObservable: Observable<DiagramEvent>) {
if (isDiagramEntity(mesh)) { if (isDiagramEntity(mesh)) {
if (mesh.metadata.template != '#connection-template') { if (mesh.metadata.template != '#connection-template') {