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

Update public/index.html See merge request !25

Merge branch '21pesi1bif-master-patch-68088' into 'master'
Update public/index.html See merge request !25
bf6033cb · Percen · fb52aea7 · 5ca36a32 · bf6033cb
Commit bf6033cb authored 7 months ago by Percen
Hide whitespace changes
Inline Side-by-side

Showing

with 13 additions and 2 deletions
+13 -2
--- a/public/index.html
+++ b/public/index.html
@@ -74,6 +74,9 @@
 <body>


+
+
+
  <div class="container">
    <h1>GeoVis AR Projekt</h1>
    <p>Mit Augmented Reality können Sie ihrer Fantasie freien Lauf lassen und ihre Stadt interaktiv gestalten!</p>
@@ -118,17 +121,25 @@

      const loader = new THREE.GLTFLoader();
      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.visible = false;
        scene.add(reticle);
      });
-
+/**
      let flower;
      loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/sunflower/sunflower.gltf", function(gltf) {
        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) => {
        if (flower) {
          const clone = flower.clone();