Skip to content
GitLab
"git@transfer.hft-stuttgart.de:co2ampel2/web.git" did not exist on "c643194e9229d176737d334b06b863c4bd10541c"
Commit 6992553e authored by Percen's avatar Percen
Browse files

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

Update public/index.html

See merge request geovistoogsi/ar!32
parents 64096d61 7a07cc15
Pipeline #10509 passed with stage
in 7 seconds
Show whitespace changes
Inline Side-by-side
public/index.html
View file @ 6992553e
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
border-radius: 5px; border-radius: 5px;
cursor: pointer; cursor: pointer;
transition: background-color 0.3s; transition: background-color 0.3s;
margin: 10px;
} }
button:hover { button:hover {
...@@ -59,23 +60,37 @@ ...@@ -59,23 +60,37 @@
background-color: #387a39; background-color: #387a39;
} }
.footer { .menu-bar {
position: fixed; position: fixed;
bottom: 20px; top: 0;
font-size: 0.9em; left: 0;
color: white; right: 0;
display: flex;
justify-content: center;
background-color: rgba(0, 0, 0, 0.7);
padding: 10px;
z-index: 10;
} }
.menu-bar button {
background-color: #2196F3;
}
.menu-bar button:hover {
background-color: #1E88E5;
}
</style> </style>
<!-- three.js --> <!-- three.js -->
<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>
</head> </head>
<body> <body>
<!-- Menüleiste -->
<div class="menu-bar">
<button onclick="selectModel('car')">Auto</button>
<button onclick="selectModel('lamp')">Laterne</button>
</div>
<div class="container"> <div class="container">
<h1>GeoVis AR Projekt</h1> <h1>GeoVis AR Projekt</h1>
...@@ -83,11 +98,15 @@ ...@@ -83,11 +98,15 @@
<button onclick="activateXR()">Start City Planning</button> <button onclick="activateXR()">Start City Planning</button>
</div> </div>
<script>
let selectedModel = 'car'; // Standardmodell
function selectModel(model) {
selectedModel = model;
console.log(`Ausgewähltes Modell: ${model}`);
}
<script>
async function activateXR() { async function activateXR() {
// Hier können Sie die Funktion für das AR-Projekt aktivieren
document.querySelector('.container').style.display = 'none'; // Startseite ausblenden document.querySelector('.container').style.display = 'none'; // Startseite ausblenden
const canvas = document.createElement("canvas"); const canvas = document.createElement("canvas");
document.body.appendChild(canvas); document.body.appendChild(canvas);
...@@ -126,27 +145,23 @@ ...@@ -126,27 +145,23 @@
reticle.visible = false; reticle.visible = false;
scene.add(reticle); scene.add(reticle);
}); });
/**
let flower; let models = {
car: null,
lamp: null
};
loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/sunflower/sunflower.gltf", function(gltf) { loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/sunflower/sunflower.gltf", function(gltf) {
flower = gltf.scene; models.car = gltf.scene;
}); });
*/
let flower;
loader.load("https://github.com/KhronosGroup/glTF-Sample-Models/blob/main/2.0/ToyCar/glTF/ToyCar.gltf", function(gltf) {
flower = gltf.scene;
});
/**
let flower;
loader.load("/assets/models/street_lamp.glb", function(gltf) {
flower = gltf.scene;
});
*/
loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/sunflower/sunflower.gltf", function(gltf) {
models.lamp = gltf.scene;
});
session.addEventListener("select", (event) => { session.addEventListener("select", () => {
if (flower) { if (reticle && models[selectedModel]) {
const clone = flower.clone(); const clone = models[selectedModel].clone();
clone.position.copy(reticle.position); clone.position.copy(reticle.position);
scene.add(clone); scene.add(clone);
} }
...@@ -154,7 +169,6 @@ ...@@ -154,7 +169,6 @@
const onXRFrame = (time, frame) => { const 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);
const pose = frame.getViewerPose(referenceSpace); const pose = frame.getViewerPose(referenceSpace);
...@@ -181,6 +195,5 @@ ...@@ -181,6 +195,5 @@
session.requestAnimationFrame(onXRFrame); session.requestAnimationFrame(onXRFrame);
} }
</script> </script>
</body> </body>
</html> </html>
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