Skip to content
GitLab
Commit 7302904a authored by Percen's avatar Percen
Browse files

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

Update public/index.html

See merge request !70
parents 312fd106 72529535
master 21caog1bif-master-patch-76399 21caog1bif-master-patch-83779 21caog1bif-master-patch-96693
1 merge request!70Update public/index.html
Pipeline #10558 passed with stage
in 6 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 30 deletions
+19 -30
public/index.html
+ 19
- 30
View file @ 7302904a
...@@ -24,15 +24,13 @@ ...@@ -24,15 +24,13 @@
</head> </head>
<body> <body>
<script> <script>
let selectedModel = 'robot'; // Standardauswahl let selectedModel = 'robot';
let models = {}; let models = {};
let reticle; let reticle;
let currentModel = null; let currentModel = null;
let scene; let scene, camera, hitTestSource;
let camera;
let hitTestSource;
const modelKeys = ['robot', 'flower']; // Modell-Liste const modelKeys = ['robot', 'flower'];
let modelIndex = 0; let modelIndex = 0;
async function activateXR() { async function activateXR() {
...@@ -46,12 +44,10 @@ ...@@ -46,12 +44,10 @@
camera = new THREE.PerspectiveCamera(); camera = new THREE.PerspectiveCamera();
camera.matrixAutoUpdate = false; camera.matrixAutoUpdate = false;
// Licht hinzufügen
const light = new THREE.DirectionalLight(0xffffff, 1); const light = new THREE.DirectionalLight(0xffffff, 1);
light.position.set(10, 10, 10); light.position.set(10, 10, 10);
scene.add(light); scene.add(light);
// Reticle (Cursor)
const loader = new THREE.GLTFLoader(); const loader = new THREE.GLTFLoader();
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;
...@@ -59,7 +55,6 @@ ...@@ -59,7 +55,6 @@
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;
}); });
...@@ -67,16 +62,15 @@ ...@@ -67,16 +62,15 @@
models.flower = gltf.scene; models.flower = gltf.scene;
}); });
// AR-Session starten
const session = await navigator.xr.requestSession('immersive-ar', { requiredFeatures: ['hit-test'] }); const session = await navigator.xr.requestSession('immersive-ar', { requiredFeatures: ['hit-test'] });
session.updateRenderState({ baseLayer: new XRWebGLLayer(session, gl) }); session.updateRenderState({ baseLayer: new XRWebGLLayer(session, gl) });
const referenceSpace = await session.requestReferenceSpace('local'); const referenceSpace = await session.requestReferenceSpace('local');
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.requestAnimationFrame(onXRFrame); session.requestAnimationFrame(onXRFrame);
// AR-Rendering
function onXRFrame(time, frame) { function onXRFrame(time, frame) {
session.requestAnimationFrame(onXRFrame); session.requestAnimationFrame(onXRFrame);
gl.bindFramebuffer(gl.FRAMEBUFFER, session.renderState.baseLayer.framebuffer); gl.bindFramebuffer(gl.FRAMEBUFFER, session.renderState.baseLayer.framebuffer);
...@@ -97,18 +91,24 @@ ...@@ -97,18 +91,24 @@
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);
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);
} }
} }
} }
// Swipe-Erkennung function placeModel() {
if (!reticle || !reticle.visible) return;
if (currentModel) scene.remove(currentModel);
currentModel = models[selectedModel]?.clone();
if (currentModel) {
currentModel.position.copy(reticle.position);
scene.add(currentModel);
}
}
let startX = 0; let startX = 0;
const threshold = 50; const threshold = 50;
...@@ -121,18 +121,12 @@ ...@@ -121,18 +121,12 @@
const deltaX = endX - startX; const deltaX = endX - startX;
if (Math.abs(deltaX) > threshold) { if (Math.abs(deltaX) > threshold) {
if (deltaX > 0) { switchModel(deltaX > 0 ? 'previous' : 'next');
switchModel('previous');
} else {
switchModel('next');
}
} }
}); });
function switchModel(direction) { function switchModel(direction) {
if (currentModel) { if (currentModel) scene.remove(currentModel);
scene.remove(currentModel);
}
if (direction === 'next') { if (direction === 'next') {
modelIndex = (modelIndex + 1) % modelKeys.length; modelIndex = (modelIndex + 1) % modelKeys.length;
...@@ -141,12 +135,7 @@ ...@@ -141,12 +135,7 @@
} }
selectedModel = modelKeys[modelIndex]; selectedModel = modelKeys[modelIndex];
currentModel = models[selectedModel]?.clone(); console.log(`Modell gewechselt zu: ${selectedModel}`);
if (currentModel) {
currentModel.position.copy(reticle.position);
scene.add(currentModel);
console.log(`Modell gewechselt zu: ${selectedModel}`);
}
} }
if (navigator.xr) { if (navigator.xr) {
......
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

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal