Commit a555fe65 authored by Percen's avatar Percen
Browse files

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

Update public/index.html

See merge request !78
1 merge request!78Update public/index.html
Pipeline #10566 passed with stage
in 7 seconds
Showing with 2 additions and 34 deletions
+2 -34
...@@ -18,20 +18,6 @@ ...@@ -18,20 +18,6 @@
background-size: cover; background-size: cover;
background-position: center; background-position: center;
} }
button {
position: fixed;
top: 10%;
left: 50%;
transform: translateX(-50%);
padding: 15px;
font-size: 18px;
background-color: rgba(255, 255, 255, 0.7);
border: none;
cursor: pointer;
}
button:hover {
background-color: rgba(255, 255, 255, 1);
}
</style> </style>
<script src="https://unpkg.com/three@0.126.0/build/three.js"></script> <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> <script src="https://unpkg.com/three@0.126.0/examples/js/loaders/GLTFLoader.js"></script>
...@@ -40,7 +26,6 @@ ...@@ -40,7 +26,6 @@
<script> <script>
let selectedModel = 'robot'; // Standardauswahl let selectedModel = 'robot'; // Standardauswahl
let models = {}; let models = {};
let currentModel = null; // Variable für das aktuell angezeigte Modell
let reticle; let reticle;
async function activateXR() { async function activateXR() {
...@@ -84,6 +69,8 @@ ...@@ -84,6 +69,8 @@
session.requestAnimationFrame(onXRFrame); session.requestAnimationFrame(onXRFrame);
// AR-Rendering // AR-Rendering
function onXRFrame(time, frame) { function onXRFrame(time, frame) {
session.requestAnimationFrame(onXRFrame); session.requestAnimationFrame(onXRFrame);
...@@ -105,15 +92,6 @@ ...@@ -105,15 +92,6 @@
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);
// Aktuelles Modell anzeigen
if (currentModel !== models[selectedModel]) {
if (currentModel) {
scene.remove(currentModel); // Entferne das alte Modell
}
currentModel = models[selectedModel];
scene.add(currentModel); // Füge das neue Modell hinzu
}
} }
renderer.render(scene, camera); renderer.render(scene, camera);
...@@ -121,11 +99,6 @@ ...@@ -121,11 +99,6 @@
} }
} }
// Modellwechsel-Funktion
function toggleModel() {
selectedModel = (selectedModel === 'robot') ? 'flower' : 'robot';
}
// AR starten // AR starten
if (navigator.xr) { if (navigator.xr) {
const startButton = document.createElement('button'); const startButton = document.createElement('button');
...@@ -136,11 +109,6 @@ ...@@ -136,11 +109,6 @@
startButton.remove(); startButton.remove();
activateXR(); activateXR();
}; };
const toggleButton = document.createElement('button');
toggleButton.textContent = 'Wechseln zwischen Robot und Sonnenblume';
toggleButton.onclick = toggleModel;
document.body.appendChild(toggleButton);
} else { } else {
alert('WebXR wird nicht unterstützt.'); alert('WebXR wird nicht unterstützt.');
} }
......
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