Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • A AR
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 3
    • Merge requests 3
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • GeoVistoogsi
  • AR
  • Merge requests
  • !77
An error occurred while fetching the assigned milestone of the selected merge_request.

Update public/index.html

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Percen requested to merge 21pesi1bif-master-patch-91544 into master 4 months ago
  • Overview 0
  • Commits 1
  • Pipelines 0
  • Changes 1
  • Percen @21pesi1bif mentioned in commit 0b0a7af5 4 months ago

    mentioned in commit 0b0a7af5

  • Percen @21pesi1bif merged 4 months ago

    merged

  • Loading
  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Compare
  • master (base)

and
  • latest version
    affa3865
    1 commit, 4 months ago

1 file
+ 32
- 14

    Preferences

    File browser
    Compare changes
public/index.html
+ 32
- 14
  • View file @ affa3865

  • Edit in single-file editor

  • Open in Web IDE


@@ -18,6 +18,20 @@
@@ -18,6 +18,20 @@
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>
@@ -26,6 +40,7 @@
@@ -26,6 +40,7 @@
<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() {
@@ -55,13 +70,9 @@
@@ -55,13 +70,9 @@
// Modelle laden
// 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;
models.robot.visible = false; // Start ohne sichtbar
scene.add(models.robot);
});
});
loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/sunflower/sunflower.gltf", (gltf) => {
loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/sunflower/sunflower.gltf", (gltf) => {
models.flower = gltf.scene;
models.flower = gltf.scene;
models.flower.visible = false; // Start ohne sichtbar
scene.add(models.flower);
});
});
// AR-Session starten
// AR-Session starten
@@ -95,16 +106,13 @@
@@ -95,16 +106,13 @@
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);
// Interaktive Modellwahl: Schalte zwischen den Modellen basierend auf Reticle
// Aktuelles Modell anzeigen
const distanceToRobot = hitTestResults[0].distanceTo(models.robot.position);
if (currentModel !== models[selectedModel]) {
const distanceToFlower = hitTestResults[0].distanceTo(models.flower.position);
if (currentModel) {
scene.remove(currentModel); // Entferne das alte Modell
if (distanceToRobot < distanceToFlower) {
}
models.robot.visible = true;
currentModel = models[selectedModel];
models.flower.visible = false;
scene.add(currentModel); // Füge das neue Modell hinzu
} else {
models.flower.visible = true;
models.robot.visible = false;
}
}
}
}
@@ -113,6 +121,11 @@
@@ -113,6 +121,11 @@
}
}
}
}
 
// 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');
@@ -123,6 +136,11 @@
@@ -123,6 +136,11 @@
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.');
}
}
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 participants
Reference:
Source branch: 21pesi1bif-master-patch-91544

Menu

Explore Projects Groups Snippets

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