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

cleaned up a bit.

Browse Source
This commit is contained in:
Michael Mainguy 2023-08-22 14:51:36 -05:00
parent 1963d6e064
commit ad75d5b7f3
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/controllers/base.ts
View File

@ -32,6 +32,7 @@ export class Base {
private logger: log.Logger; private logger: log.Logger;
private lastPosition: Vector3 = null; private lastPosition: Vector3 = null;
protected controllers: Controllers; protected controllers: Controllers;
constructor(controller: WebXRInputSource, constructor(controller: WebXRInputSource,
scene: Scene, scene: Scene,
xr: WebXRDefaultExperience, xr: WebXRDefaultExperience,
@ -40,10 +41,7 @@ export class Base {
this.logger = log.getLogger('Base'); this.logger = log.getLogger('Base');
this.controller = controller; this.controller = controller;
this.controllers = controllers; this.controllers = controllers;
this.scene = scene; this.scene = scene;
this.scene.onBeforeRenderObservable.add(() => { this.scene.onBeforeRenderObservable.add(() => {
if (this?.grabbedMesh?.physicsBody) { if (this?.grabbedMesh?.physicsBody) {
const hk = (this.scene.getPhysicsEngine().getPhysicsPlugin() as HavokPlugin); const hk = (this.scene.getPhysicsEngine().getPhysicsPlugin() as HavokPlugin);
@ -55,7 +53,6 @@ export class Base {
hk.sync(this.grabbedMesh.physicsBody); hk.sync(this.grabbedMesh.physicsBody);
} else { } else {
this.logger.error("parent not found for " + this.grabbedMeshParentId); this.logger.error("parent not found for " + this.grabbedMeshParentId);
} }
} else { } else {
@ -68,14 +65,6 @@ export class Base {
this.diagramManager = diagramManager; this.diagramManager = diagramManager;
this.controller.onMotionControllerInitObservable.add((init) => { this.controller.onMotionControllerInitObservable.add((init) => {
if (init.components['xr-standard-trigger']) {
init.components['xr-standard-trigger']
.onButtonStateChangedObservable
.add(() => {
});
}
if (init.components['xr-standard-squeeze']) { if (init.components['xr-standard-squeeze']) {
this.initGrip(init.components['xr-standard-squeeze']) this.initGrip(init.components['xr-standard-squeeze'])
} }
@ -87,7 +76,7 @@ export class Base {
this.controller?.motionController?.pulse(.25, 30); this.controller?.motionController?.pulse(.25, 30);
} }
} }
}) });
} }
public disable() { public disable() {
@ -99,6 +88,7 @@ export class Base {
this.controller.motionController.rootMesh.setEnabled(true); this.controller.motionController.rootMesh.setEnabled(true);
this.controller.pointer.setEnabled(true); this.controller.pointer.setEnabled(true);
} }
private setupTransformNode(mesh: TransformNode) { private setupTransformNode(mesh: TransformNode) {
const transformNode = new TransformNode("grabAnchor, this.scene"); const transformNode = new TransformNode("grabAnchor, this.scene");
transformNode.id = "grabAnchor"; transformNode.id = "grabAnchor";
@ -122,10 +112,8 @@ export class Base {
mesh && mesh.setParent(this.controller.motionController.rootMesh); mesh && mesh.setParent(this.controller.motionController.rootMesh);
this.grabbedMesh = mesh; this.grabbedMesh = mesh;
} else { } else {
return; return;
} }
} else { } else {
if (template == '#connection-template') { if (template == '#connection-template') {
return; return;
@ -216,8 +204,8 @@ export class Base {
this.reparent(mesh); this.reparent(mesh);
if (!mesh.physicsBody) { if (!mesh.physicsBody) {
mesh.position = this.diagramManager.config.snapGridVal(mesh.position); mesh.position = this.diagramManager.config.snapGridVal(mesh.position, this.diagramManager.config.current.gridSnap);
mesh.rotation = this.diagramManager.config.snapRotateVal(mesh.rotation); mesh.rotation = this.diagramManager.config.snapRotateVal(mesh.rotation, this.diagramManager.config.current.rotateSnap);
} }
this.previousParentId = null; this.previousParentId = null;
this.previousScaling = null; this.previousScaling = null;
@ -258,5 +246,4 @@ export class Base {
} }
}); });
} }
} }