Commit bf6033cb authored by Percen's avatar Percen
Browse files

Merge branch '21pesi1bif-master-patch-68088' into 'master'

Update public/index.html

See merge request !25
parents fb52aea7 5ca36a32
Pipeline #10481 passed with stage
in 7 seconds
Showing with 13 additions and 2 deletions
+13 -2
...@@ -74,6 +74,9 @@ ...@@ -74,6 +74,9 @@
<body> <body>
<div class="container"> <div class="container">
<h1>GeoVis AR Projekt</h1> <h1>GeoVis AR Projekt</h1>
<p>Mit Augmented Reality können Sie ihrer Fantasie freien Lauf lassen und ihre Stadt interaktiv gestalten!</p> <p>Mit Augmented Reality können Sie ihrer Fantasie freien Lauf lassen und ihre Stadt interaktiv gestalten!</p>
...@@ -118,17 +121,25 @@ ...@@ -118,17 +121,25 @@
const loader = new THREE.GLTFLoader(); const loader = new THREE.GLTFLoader();
let reticle; let reticle;
loader.load("https://github.com/KhronosGroup/glTF-Sample-Models/blob/main/1.0/Avocado/glTF/Avocado.gltf", function(gltf) { 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;
}); });
*/
let flower;
loader.load("https://threejs.org/examples/models/gltf/RobotExpressive/RobotExpressive.glb", function(gltf) {
flower = gltf.scene;
});
session.addEventListener("select", (event) => { session.addEventListener("select", (event) => {
if (flower) { if (flower) {
const clone = flower.clone(); const clone = flower.clone();
......
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