Commit 19e51950 authored by Percen's avatar Percen
Browse files

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

Update public/index.html

See merge request !71
parents 7302904a a7117f3b
Pipeline #10559 passed with stage
in 6 seconds
Showing with 39 additions and 30 deletions
+39 -30
...@@ -18,6 +18,14 @@ ...@@ -18,6 +18,14 @@
background-size: cover; background-size: cover;
background-position: center; background-position: center;
} }
button {
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
padding: 15px;
font-size: 18px;
}
</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>
...@@ -28,16 +36,14 @@ ...@@ -28,16 +36,14 @@
let models = {}; let models = {};
let reticle; let reticle;
let currentModel = null; let currentModel = null;
let scene, camera, hitTestSource; let scene, camera, hitTestSource, renderer;
let lastTouchTime = 0;
const modelKeys = ['robot', 'flower'];
let modelIndex = 0;
async function activateXR() { async function activateXR() {
const canvas = document.createElement('canvas'); const canvas = document.createElement('canvas');
document.body.appendChild(canvas); document.body.appendChild(canvas);
const gl = canvas.getContext('webgl', { xrCompatible: true }); const gl = canvas.getContext('webgl', { xrCompatible: true });
const renderer = new THREE.WebGLRenderer({ alpha: true, canvas, context: gl }); renderer = new THREE.WebGLRenderer({ alpha: true, canvas, context: gl });
renderer.autoClear = false; renderer.autoClear = false;
scene = new THREE.Scene(); scene = new THREE.Scene();
...@@ -49,12 +55,15 @@ ...@@ -49,12 +55,15 @@
scene.add(light); scene.add(light);
const loader = new THREE.GLTFLoader(); const loader = new THREE.GLTFLoader();
// Reticle laden
loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/reticle/reticle.gltf", (gltf) => { loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/reticle/reticle.gltf", (gltf) => {
reticle = gltf.scene; reticle = gltf.scene;
reticle.visible = false; reticle.visible = false;
scene.add(reticle); scene.add(reticle);
}); });
// Modelle laden
loader.load("https://threejs.org/examples/models/gltf/RobotExpressive/RobotExpressive.glb", (gltf) => { loader.load("https://threejs.org/examples/models/gltf/RobotExpressive/RobotExpressive.glb", (gltf) => {
models.robot = gltf.scene; models.robot = gltf.scene;
}); });
...@@ -68,7 +77,7 @@ ...@@ -68,7 +77,7 @@
const viewerSpace = await session.requestReferenceSpace('viewer'); const viewerSpace = await session.requestReferenceSpace('viewer');
hitTestSource = await session.requestHitTestSource({ space: viewerSpace }); hitTestSource = await session.requestHitTestSource({ space: viewerSpace });
session.addEventListener("select", () => placeModel()); session.addEventListener('select', placeModel);
session.requestAnimationFrame(onXRFrame); session.requestAnimationFrame(onXRFrame);
function onXRFrame(time, frame) { function onXRFrame(time, frame) {
...@@ -92,56 +101,56 @@ ...@@ -92,56 +101,56 @@
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);
} }
renderer.render(scene, camera); renderer.render(scene, camera);
} }
} }
} }
// Modell platzieren
function placeModel() { function placeModel() {
if (!reticle || !reticle.visible) return; if (!reticle || !reticle.visible || !models[selectedModel]) return;
const model = models[selectedModel].clone();
if (currentModel) scene.remove(currentModel); model.position.copy(reticle.position);
scene.add(model);
currentModel = models[selectedModel]?.clone();
if (currentModel) {
currentModel.position.copy(reticle.position);
scene.add(currentModel);
}
} }
let startX = 0; // Swipe-Gesten erkennen
const threshold = 50; let touchStartX = 0;
let touchEndX = 0;
document.body.addEventListener('touchstart', (e) => { document.body.addEventListener('touchstart', (e) => {
startX = e.touches[0].clientX; touchStartX = e.touches[0].clientX;
}); });
document.body.addEventListener('touchend', (e) => { document.body.addEventListener('touchend', (e) => {
const endX = e.changedTouches[0].clientX; touchEndX = e.changedTouches[0].clientX;
const deltaX = endX - startX; handleSwipe();
});
if (Math.abs(deltaX) > threshold) { function handleSwipe() {
switchModel(deltaX > 0 ? 'previous' : 'next'); const deltaX = touchEndX - touchStartX;
if (Math.abs(deltaX) > 50) {
if (deltaX > 0) {
switchModel('next');
} else {
switchModel('previous');
}
} }
}); }
function switchModel(direction) { function switchModel(direction) {
if (currentModel) scene.remove(currentModel);
if (direction === 'next') { if (direction === 'next') {
modelIndex = (modelIndex + 1) % modelKeys.length; selectedModel = selectedModel === 'robot' ? 'flower' : 'robot';
} else { } else {
modelIndex = (modelIndex - 1 + modelKeys.length) % modelKeys.length; selectedModel = selectedModel === 'flower' ? 'robot' : 'flower';
} }
selectedModel = modelKeys[modelIndex];
console.log(`Modell gewechselt zu: ${selectedModel}`); console.log(`Modell gewechselt zu: ${selectedModel}`);
} }
if (navigator.xr) { if (navigator.xr) {
const startButton = document.createElement('button'); const startButton = document.createElement('button');
startButton.textContent = 'Start AR'; startButton.textContent = 'Start AR';
startButton.style.cssText = "position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); padding: 15px; font-size: 18px;";
document.body.appendChild(startButton); document.body.appendChild(startButton);
startButton.onclick = () => { startButton.onclick = () => {
startButton.remove(); startButton.remove();
......
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