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

cleaned up warnings.

Browse Source
This commit is contained in:
Michael Mainguy 2023-09-05 19:30:15 -05:00
parent 13a49d63bb
commit 717a5c6151
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
index.html
View File

@ -20,6 +20,7 @@
align-content: center; align-content: center;
flex-direction: column; flex-direction: column;
z-index: -1; z-index: -1;
/*noinspection CssUnknownTarget*/
background: url("/spinner.gif"); background: url("/spinner.gif");
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;

4
src/app.ts
View File

@ -15,6 +15,7 @@ import {AppConfig} from "./util/appConfig";
import {GamepadManager} from "./controllers/gamepadManager"; import {GamepadManager} from "./controllers/gamepadManager";
import {CustomEnvironment} from "./util/customEnvironment"; import {CustomEnvironment} from "./util/customEnvironment";
import {Controllers} from "./controllers/controllers"; import {Controllers} from "./controllers/controllers";
// @ts-ignore
import workerUrl from "./worker?worker&url"; import workerUrl from "./worker?worker&url";
import {DiagramEventType} from "./diagram/diagramEntity"; import {DiagramEventType} from "./diagram/diagramEntity";
import {PeerjsNetworkConnection} from "./integration/peerjsNetworkConnection"; import {PeerjsNetworkConnection} from "./integration/peerjsNetworkConnection";
@ -57,6 +58,7 @@ export class App {
//const persistenceManager = new IndexdbPersistenceManager("diagram"); //const persistenceManager = new IndexdbPersistenceManager("diagram");
const worker = new Worker(workerUrl, {type: 'module'}); const worker = new Worker(workerUrl, {type: 'module'});
peerjsNetworkConnection.connectionObservable.add((peerId) => { peerjsNetworkConnection.connectionObservable.add((peerId) => {
this.logger.debug('App', 'peerjs network connected', peerId);
worker.postMessage({type: 'sync'}); worker.postMessage({type: 'sync'});
}); });
const controllers = new Controllers(); const controllers = new Controllers();
@ -131,7 +133,7 @@ export class App {
}); });
xr.baseExperience.sessionManager.onXRSessionInit.add((session) => { xr.baseExperience.sessionManager.onXRSessionInit.add((session) => {
session.addEventListener('visibilitychange', (ev) => { session.addEventListener('visibilitychange', (ev) => {
this.logger.debug(ev);
}); });
}); });

2
src/diagram/diagramManager.ts
View File

@ -38,7 +38,7 @@ export class DiagramManager {
this.logger.warn("onDiagramEventObservable already has Observers, you should be careful"); this.logger.warn("onDiagramEventObservable already has Observers, you should be careful");
} }
this.toolbox.colorChangeObservable.add((evt) => { this.toolbox.colorChangeObservable.add((evt) => {
this.logger.debug(evt);
this.onDiagramEventObservable.notifyObservers({type: DiagramEventType.CHANGECOLOR}, 2); this.onDiagramEventObservable.notifyObservers({type: DiagramEventType.CHANGECOLOR}, 2);
}, -1, true, this, false); }, -1, true, this, false);
this.onDiagramEventObservable.add(this.onDiagramEvent, 1, true, this); this.onDiagramEventObservable.add(this.onDiagramEvent, 1, true, this);

5
src/information/inputTextView.ts
View File

@ -1,5 +1,5 @@
import {MeshBuilder, Observable, Scene, Vector3, WebXRDefaultExperience} from "@babylonjs/core"; import {MeshBuilder, Observable, Scene, Vector3, WebXRDefaultExperience} from "@babylonjs/core";
import log from "loglevel"; import log, {Logger} from "loglevel";
import {AdvancedDynamicTexture, Control, InputText, VirtualKeyboard} from "@babylonjs/gui"; import {AdvancedDynamicTexture, Control, InputText, VirtualKeyboard} from "@babylonjs/gui";
import {ControllerEventType, Controllers} from "../controllers/controllers"; import {ControllerEventType, Controllers} from "../controllers/controllers";
import {setMenuPosition} from "../util/functions/setMenuPosition"; import {setMenuPosition} from "../util/functions/setMenuPosition";
@ -16,7 +16,7 @@ export class InputTextView {
private sounds: DiaSounds; private sounds: DiaSounds;
private readonly controllers: Controllers; private readonly controllers: Controllers;
private readonly xr: WebXRDefaultExperience; private readonly xr: WebXRDefaultExperience;
private readonly logger: Logger = log.getLogger('InputTextView');
constructor(text: string, xr: WebXRDefaultExperience, scene: Scene, controllers: Controllers) { constructor(text: string, xr: WebXRDefaultExperience, scene: Scene, controllers: Controllers) {
this.text = text ? text : ""; this.text = text ? text : "";
@ -70,6 +70,7 @@ export class InputTextView {
keyboard.isEnabled = true; keyboard.isEnabled = true;
keyboard.children.forEach((key) => { keyboard.children.forEach((key) => {
key.onPointerEnterObservable.add((eventData, eventState) => { key.onPointerEnterObservable.add((eventData, eventState) => {
this.logger.debug(eventData);
const gripId = eventState?.userInfo?.pickInfo?.gripTransform?.id; const gripId = eventState?.userInfo?.pickInfo?.gripTransform?.id;
if (gripId) { if (gripId) {
this.controllers.controllerObserver.notifyObservers({ this.controllers.controllerObserver.notifyObservers({