Skip to content
GitLab
Commit 0aca3554 authored by Percen's avatar Percen
Browse files

Merge branch 'sinan' into 'master' 

Update public/index.html

See merge request !13
parents 32ca8b1d b28205f2
Pipeline #10470 passed with stage
in 6 seconds
Show whitespace changes
Inline Side-by-side
public/index.html
View file @ 0aca3554
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<title>GeoVis AR Projekt</title> <title>GeoVis AR Projekt</title>
<!-- three.js --> <!-- three.js -->
...@@ -12,137 +11,107 @@ ...@@ -12,137 +11,107 @@
</head> </head>
<body> <body>
<!-- Starting an immersive WebXR session requires user interaction.
We start this one with a simple button. -->
<button onclick="activateXR()">Start city planning</button> <button onclick="activateXR()">Start city planning</button>
<script> <script>
async function activateXR() { async function activateXR() {
// Add a canvas element and initialize a WebGL context that is compatible with WebXR.
const canvas = document.createElement("canvas"); const canvas = document.createElement("canvas");
document.body.appendChild(canvas); document.body.appendChild(canvas);
const gl = canvas.getContext("webgl", {xrCompatible: true}); const gl = canvas.getContext("webgl", {xrCompatible: true});
const scene = new THREE.Scene(); const scene = new THREE.Scene();
// The cube will have a different color on each side. // Lichtquelle
const materials = [ const directionalLight = new THREE.DirectionalLight(0xffffff, 0.3);
new THREE.MeshBasicMaterial({color: 0xff0000}), directionalLight.position.set(10, 15, 10);
new THREE.MeshBasicMaterial({color: 0x0000ff}), scene.add(directionalLight);
new THREE.MeshBasicMaterial({color: 0x00ff00}),
new THREE.MeshBasicMaterial({color: 0xff00ff}),
new THREE.MeshBasicMaterial({color: 0x00ffff}),
new THREE.MeshBasicMaterial({color: 0xffff00})
];
// Create the cube and add it to the demo scene. // Haupt-Renderer
/** const renderer = new THREE.WebGLRenderer({
const cube = new THREE.Mesh(new THREE.BoxBufferGeometry(0.5, 0.5, 0.5), materials);
cube.position.set(0, 0, -1);
scene.add(cube);
* */
const directionalLight = new THREE.DirectionalLight(0xffffff, 0.3);
directionalLight.position.set(10, 15, 10);
scene.add(directionalLight);
// Set up the WebGLRenderer, which handles rendering to the session's base layer.
const renderer = new THREE.WebGLRenderer({
alpha: true, alpha: true,
preserveDrawingBuffer: true, preserveDrawingBuffer: true,
canvas: canvas, canvas: canvas,
context: gl context: gl
}); });
renderer.autoClear = false; renderer.autoClear = false;
// The API directly updates the camera matrices.
// Disable matrix auto updates so three.js doesn't attempt
// to handle the matrices independently.
const camera = new THREE.PerspectiveCamera();
camera.matrixAutoUpdate = false;
// Initialize a WebXR session using "immersive-ar". const camera = new THREE.PerspectiveCamera();
const session = await navigator.xr.requestSession("immersive-ar", {requiredFeatures: ['hit-test']}); camera.matrixAutoUpdate = false;
session.updateRenderState({ const session = await navigator.xr.requestSession("immersive-ar", {requiredFeatures: ['hit-test']});
session.updateRenderState({
baseLayer: new XRWebGLLayer(session, gl) baseLayer: new XRWebGLLayer(session, gl)
}); });
const referenceSpace = await session.requestReferenceSpace('local');
// A 'local' reference space has a native origin that is located const viewerSpace = await session.requestReferenceSpace('viewer');
// near the viewer's position at the time the session was created. const hitTestSource = await session.requestHitTestSource({ space: viewerSpace });
const referenceSpace = await session.requestReferenceSpace('local');
// Minimap-Renderer einrichten
const minimapSize = 5;
// Create another XRReferenceSpace that has the viewer as the origin. const minimapCamera = new THREE.OrthographicCamera(-minimapSize, minimapSize, minimapSize, -minimapSize, 0.1, 100);
const viewerSpace = await session.requestReferenceSpace('viewer'); minimapCamera.position.set(0, 10, 0); // Vogelperspektive
// Perform hit testing using the viewer as origin. minimapCamera.lookAt(0, 0, 0);
const hitTestSource = await session.requestHitTestSource({ space: viewerSpace });
const minimapRenderer = new THREE.WebGLRenderer({ alpha: true });
minimapRenderer.setSize(200, 200);
const loader = new THREE.GLTFLoader(); minimapRenderer.domElement.style.position = "absolute";
let reticle; minimapRenderer.domElement.style.bottom = "10px";
loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/reticle/reticle.gltf", function(gltf) { minimapRenderer.domElement.style.right = "10px";
document.body.appendChild(minimapRenderer.domElement);
const loader = new THREE.GLTFLoader();
let reticle;
loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/reticle/reticle.gltf", function(gltf) {
reticle = gltf.scene; reticle = gltf.scene;
reticle.visible = false; reticle.visible = false;
scene.add(reticle); scene.add(reticle);
}) });
let flower; let flower;
loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/sunflower/sunflower.gltf", function(gltf) { loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/sunflower/sunflower.gltf", function(gltf) {
flower = gltf.scene; flower = gltf.scene;
}); });
session.addEventListener("select", (event) => { session.addEventListener("select", (event) => {
if (flower) { if (flower) {
const clone = flower.clone(); const clone = flower.clone();
clone.position.copy(reticle.position); clone.position.copy(reticle.position);
scene.add(clone); scene.add(clone);
} }
}); });
// Renderloop
const onXRFrame = (time, frame) => {
// Create a render loop that allows us to draw on the AR view.
const onXRFrame = (time, frame) => {
// Queue up the next draw request.
session.requestAnimationFrame(onXRFrame); session.requestAnimationFrame(onXRFrame);
// Bind the graphics framebuffer to the baseLayer's framebuffer
gl.bindFramebuffer(gl.FRAMEBUFFER, session.renderState.baseLayer.framebuffer) gl.bindFramebuffer(gl.FRAMEBUFFER, session.renderState.baseLayer.framebuffer)
// Retrieve the pose of the device.
// XRFrame.getViewerPose can return null while the session attempts to establish tracking.
const pose = frame.getViewerPose(referenceSpace); const pose = frame.getViewerPose(referenceSpace);
if (pose) { if (pose) {
// In mobile AR, we only have one view.
const view = pose.views[0]; const view = pose.views[0];
const viewport = session.renderState.baseLayer.getViewport(view); const viewport = session.renderState.baseLayer.getViewport(view);
renderer.setSize(viewport.width, viewport.height) renderer.setSize(viewport.width, viewport.height);
// Use the view's transform matrix and projection matrix to configure the THREE.camera. camera.matrix.fromArray(view.transform.matrix);
camera.matrix.fromArray(view.transform.matrix)
camera.projectionMatrix.fromArray(view.projectionMatrix); camera.projectionMatrix.fromArray(view.projectionMatrix);
camera.updateMatrixWorld(true); camera.updateMatrixWorld(true);
const hitTestResults = frame.getHitTestResults(hitTestSource);
const hitTestResults = frame.getHitTestResults(hitTestSource); if (hitTestResults.length > 0 && reticle) {
if (hitTestResults.length > 0 && reticle) {
const hitPose = hitTestResults[0].getPose(referenceSpace); const hitPose = hitTestResults[0].getPose(referenceSpace);
reticle.visible = true; reticle.visible = true;
reticle.position.set(hitPose.transform.position.x, hitPose.transform.position.y, hitPose.transform.position.z) reticle.position.set(hitPose.transform.position.x, hitPose.transform.position.y, hitPose.transform.position.z);
reticle.updateMatrixWorld(true); reticle.updateMatrixWorld(true);
} }
// Minimap-Update
minimapCamera.position.x = camera.position.x;
minimapCamera.position.z = camera.position.z;
minimapRenderer.render(scene, minimapCamera);
// Render the scene with THREE.WebGLRenderer. // Szene rendern
renderer.render(scene, camera) renderer.render(scene, camera);
} }
} }
session.requestAnimationFrame(onXRFrame); session.requestAnimationFrame(onXRFrame);
} }
</script> </script>
</body> </body>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal