Commit 58897799 authored by Percen's avatar Percen
Browse files

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

Update public/index.html

See merge request !64
parents 3b621ab2 58b672a2
Pipeline #10552 passed with stage
in 7 seconds
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
let selectedModel = 'robot'; // Standardauswahl let selectedModel = 'robot'; // Standardauswahl
let models = {}; let models = {};
let reticle; let reticle;
let currentModel;
async function activateXR() { async function activateXR() {
const canvas = document.createElement('canvas'); const canvas = document.createElement('canvas');
...@@ -90,6 +91,11 @@ ...@@ -90,6 +91,11 @@
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);
// Setze die Position des aktuellen Modells
if (currentModel) {
currentModel.position.set(hitPose.transform.position.x, hitPose.transform.position.y, hitPose.transform.position.z);
}
} }
renderer.render(scene, camera); renderer.render(scene, camera);
...@@ -136,25 +142,20 @@ ...@@ -136,25 +142,20 @@
// Funktion zum Modellwechsel // Funktion zum Modellwechsel
function switchModel(direction) { function switchModel(direction) {
// Entferne das aktuelle Modell
if (currentModel) {
scene.remove(currentModel);
}
// Setze das ausgewählte Modell
if (direction === 'next') { if (direction === 'next') {
selectedModel = selectedModel === 'robot' ? 'flower' : 'robot'; selectedModel = selectedModel === 'robot' ? 'flower' : 'robot';
updateModel();
} else if (direction === 'previous') { } else if (direction === 'previous') {
selectedModel = selectedModel === 'robot' ? 'flower' : 'robot'; selectedModel = selectedModel === 'robot' ? 'flower' : 'robot';
updateModel();
} }
}
function updateModel() {
// Entferne das aktuelle Modell
scene.remove(models[selectedModel]);
// Lade das neue Modell basierend auf selectedModel currentModel = models[selectedModel].clone(); // Erstelle eine Kopie des Modells, damit es platziert werden kann
if (selectedModel === 'robot') { scene.add(currentModel);
scene.add(models.robot);
} else if (selectedModel === 'flower') {
scene.add(models.flower);
}
} }
// AR starten // AR starten
......
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