diff --git a/index.html b/index.html index 71a8978..4826956 100644 --- a/index.html +++ b/index.html @@ -7,9 +7,9 @@ name="description"> - - - + + + Deep Diagram diff --git a/src/react/pageHeader.tsx b/src/react/pageHeader.tsx index 5e50262..692124e 100644 --- a/src/react/pageHeader.tsx +++ b/src/react/pageHeader.tsx @@ -1,12 +1,32 @@ -import {Anchor, AppShell, Burger, Button, Group, Image} from "@mantine/core"; +import {Anchor, AppShell, Box, Burger, Button, Group, Image, Menu, Stack} from "@mantine/core"; import React from "react"; import {Link} from "react-router-dom"; +import {useAuth0} from "@auth0/auth0-react"; export default function PageHeader() { + + const {user, isAuthenticated, loginWithRedirect, logout} = useAuth0(); + const picture = () => { + if (user.picture) { + return user + } else { + return <> + } + } + const userDisplay = () => { + if (isAuthenticated) { + return + {picture()} + + + } else { + return + } + } return ( - + - + @@ -21,11 +41,34 @@ export default function PageHeader() { VR Experience - - - + + + + + + Examples + About + Documentation + Pricing + VR Experience + + + + {userDisplay()} + + + ) } \ No newline at end of file diff --git a/src/react/webApp.tsx b/src/react/webApp.tsx index 7eb0ce7..c5b941c 100644 --- a/src/react/webApp.tsx +++ b/src/react/webApp.tsx @@ -3,6 +3,7 @@ import '@mantine/core/styles.css'; import React from "react"; import {RouterProvider} from "react-router-dom"; import {webRouter} from "./webRouter"; +import {Auth0Provider} from "@auth0/auth0-react"; export default function WebApp() { document.addEventListener('promptpassword', () => { @@ -13,6 +14,13 @@ export default function WebApp() { }); return ( + + ) } diff --git a/src/vrApp.ts b/src/vrApp.ts index f364d6f..bfb408e 100644 --- a/src/vrApp.ts +++ b/src/vrApp.ts @@ -1,4 +1,13 @@ -import {Color3, Engine, FreeCamera, Observable, Scene, Vector3, WebGPUEngine} from "@babylonjs/core"; +import { + Color3, + DeviceOrientationCamera, + Engine, + FreeCamera, + Observable, + Scene, + Vector3, + WebGPUEngine +} from "@babylonjs/core"; import '@babylonjs/loaders'; import {DiagramManager} from "./diagram/diagramManager"; import log, {Logger} from "loglevel"; @@ -21,6 +30,7 @@ export default class VrApp { private _db: PouchData; private _dbName: string; private _engine: Engine | WebGPUEngine; + private _mobileCamera: DeviceOrientationCamera; constructor(canvas: HTMLCanvasElement, dbname: string) { this._canvas = canvas; @@ -32,7 +42,7 @@ export default class VrApp { } public async initialize(scene: Scene) { - setMainCamera(scene); + this.setMainCamera(scene); const spinner = new Spinner(); spinner.show(); const diagramReadyObservable = new Observable(); @@ -89,14 +99,34 @@ export default class VrApp { scene.render(); }); } + + private setMainCamera(scene: Scene) { + const CAMERA_NAME = 'Main Camera'; + const camera: FreeCamera = new FreeCamera(CAMERA_NAME, + new Vector3(0, 1.6, 0), scene); + scene.setActiveCameraByName(CAMERA_NAME); + + /* if (!this._mobileCamera) { + window.addEventListener("devicemotion", (event) => { + if(event.rotationRate.alpha || event.rotationRate.beta || event.rotationRate.gamma) { + console.log(this); + const camera: DeviceOrientationCamera = new DeviceOrientationCamera('Mobile Camera', + new Vector3(0, 1.6, 0), scene); + this._mobileCamera = camera; + + scene.setActiveCameraByName('Mobile Camera'); + } + + }); + } + + */ + + + } + } -function setMainCamera(scene: Scene) { - const CAMERA_NAME = 'Main Camera'; - const camera: FreeCamera = new FreeCamera(CAMERA_NAME, - new Vector3(0, 1.6, 0), scene); - scene.setActiveCameraByName(CAMERA_NAME); -} function initEnvironment(diagramManager: DiagramManager, spinner: Spinner) {