From 84f5fc757455f907e8971f26984c375cd7a9e706 Mon Sep 17 00:00:00 2001
From: Percen <21pesi1bif@hft-stuttgart.de>
Date: Sat, 14 Dec 2024 16:18:32 +0000
Subject: [PATCH] Update public/index.html

---
 public/index.html | 84 ++++++-----------------------------------------
 1 file changed, 10 insertions(+), 74 deletions(-)

diff --git a/public/index.html b/public/index.html
index b8880da..46159f2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>GeoVis AR Projekt</title>
-    <style>
+  <style>
     body {
       margin: 0;
       font-family: Arial, sans-serif;
@@ -28,7 +28,7 @@
       max-width: 80%;
       box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.5);
     }
-//teste
+
     h1 {
       font-size: 3em;
       margin-bottom: 20px;
@@ -59,35 +59,15 @@
       background-color: #387a39;
     }
 
-    .menu-bar {
-      position: fixed;
-      top: 0;
-      left: 0;
-      right: 0;
-      display: flex;
-      justify-content: center;
-      background-color: rgba(0, 0, 0, 0.7);
-      padding: 10px;
-      z-index: 10;
-    }
-
-    .menu-bar button {
-      background-color: #2196F3;
-    }
-
-    .menu-bar button:hover {
-      background-color: #1E88E5;
-    }
   </style>
   <script src="https://unpkg.com/three@0.126.0/build/three.js"></script>
   <script src="https://unpkg.com/three@0.126.0/examples/js/loaders/GLTFLoader.js"></script>
 </head>
 <body>
   <script>
-    let selectedModel = 'car'; // Standardauswahl
+    let selectedModel = 'robot'; // Start mit dem Roboter
     let models = {};
     let reticle;
-    let menu;
 
     async function activateXR() {
       const canvas = document.createElement('canvas');
@@ -115,38 +95,12 @@
 
       // Modelle laden
       loader.load("https://threejs.org/examples/models/gltf/RobotExpressive/RobotExpressive.glb", (gltf) => {
-        models.car = gltf.scene;
+        models.robot = gltf.scene;
       });
       loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/sunflower/sunflower.gltf", (gltf) => {
-        models.lamp = gltf.scene;
+        models.sunflower = gltf.scene;
       });
 
-      // 3D-Menü erstellen
-      const menuGeometry = new THREE.PlaneGeometry(0.5, 0.2); // Menügröße
-      const menuMaterial = new THREE.MeshBasicMaterial({ color: 0x333333, opacity: 0.8, transparent: true });
-      menu = new THREE.Mesh(menuGeometry, menuMaterial);
-      menu.position.set(0, -0.5, -1); // Unten im Kamerasichtfeld
-      scene.add(menu);
-
-      // Menü-Buttons als Flächen
-      const buttonGeometry = new THREE.PlaneGeometry(0.15, 0.1);
-      const buttonMaterial1 = new THREE.MeshBasicMaterial({ color: 0x2196F3 });
-      const buttonMaterial2 = new THREE.MeshBasicMaterial({ color: 0xFF9800 });
-
-      const carButton = new THREE.Mesh(buttonGeometry, buttonMaterial1);
-      carButton.position.set(-0.2, -0.5, -0.99); // Links unten
-      scene.add(carButton);
-
-      const lampButton = new THREE.Mesh(buttonGeometry, buttonMaterial2);
-      lampButton.position.set(0.2, -0.5, -0.99); // Rechts unten
-      scene.add(lampButton);
-	  
-	  
-
-      // Raycaster für Button-Interaktion
-      const raycaster = new THREE.Raycaster();
-      const pointer = new THREE.Vector2();
-
       // AR-Session starten
       const session = await navigator.xr.requestSession('immersive-ar', { requiredFeatures: ['hit-test'] });
       session.updateRenderState({ baseLayer: new XRWebGLLayer(session, gl) });
@@ -159,24 +113,12 @@
       session.addEventListener("select", (event) => {
         if (!reticle) return;
 
-        // Raycaster von der Kameraposition (Mitte des Bildschirms)
-        raycaster.setFromCamera(pointer, camera);
-        const intersects = raycaster.intersectObjects([carButton, lampButton]);
+        // Modell wechseln (zwischen Robot und Sonnenblume)
+        selectedModel = selectedModel === 'robot' ? 'sunflower' : 'robot';
+        console.log(`${selectedModel.charAt(0).toUpperCase() + selectedModel.slice(1)} ausgewählt`);
 
-        // Prüfen, ob ein Button getroffen wurde
-        if (intersects.length > 0) {
-          const clickedButton = intersects[0].object;
-
-          if (clickedButton === carButton) {
-            selectedModel = 'car';
-            console.log('Auto ausgewählt');
-          } else if (clickedButton === lampButton) {
-            selectedModel = 'lamp';
-            console.log('Laterne ausgewählt');
-          }
-        } 
         // Kein Button getroffen -> Modell platzieren
-        else if (models[selectedModel]) {
+        if (models[selectedModel]) {
           const clone = models[selectedModel].clone();
           clone.position.copy(reticle.position);
           clone.scale.set(0.5, 0.5, 0.5); // Größe anpassen
@@ -200,13 +142,7 @@
           camera.projectionMatrix.fromArray(view.projectionMatrix);
           camera.updateMatrixWorld(true);
 
-          // Menü bleibt fixiert vor der Kamera
-          menu.position.set(0, -0.5, -1);
-          menu.lookAt(camera.position);
-
-          carButton.position.set(-0.2, -0.5, -0.99);
-          lampButton.position.set(0.2, -0.5, -0.99);
-
+          // Reticle Position
           const hitTestResults = frame.getHitTestResults(hitTestSource);
           if (hitTestResults.length > 0) {
             const hitPose = hitTestResults[0].getPose(referenceSpace);
-- 
GitLab