Skip to content
GitLab
"git@transfer.hft-stuttgart.de:knight/asyst-moodle-plugin.git" did not exist on "135ce25ef470d45920b9dcd411e0a1771b04c859"
Commit fb52aea7 authored by Percen's avatar Percen
Browse files

Merge branch 'revert-0095f899' into 'master' 

Revert "Merge branch '21pesi1bif-master-patch-94087' into 'master'"

See merge request !24
parents 51ea5d8e 1664851a
Pipeline #10480 passed with stage
in 7 seconds
Show whitespace changes
Inline Side-by-side
public/index.html
View file @ fb52aea7
...@@ -74,9 +74,6 @@ ...@@ -74,9 +74,6 @@
<body> <body>
<div class="container"> <div class="container">
<h1>GeoVis AR Projekt</h1> <h1>GeoVis AR Projekt</h1>
<p>Mit Augmented Reality können Sie ihrer Fantasie freien Lauf lassen und ihre Stadt interaktiv gestalten!</p> <p>Mit Augmented Reality können Sie ihrer Fantasie freien Lauf lassen und ihre Stadt interaktiv gestalten!</p>
...@@ -126,20 +123,12 @@ ...@@ -126,20 +123,12 @@
reticle.visible = false; reticle.visible = false;
scene.add(reticle); scene.add(reticle);
}); });
/**
let flower;
loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/sunflower/sunflower.gltf", function(gltf) {
flower = gltf.scene;
});
*/
let flower; let flower;
loader.load("https://threejs.org/examples/models/gltf/RobotExpressive/RobotExpressive.glb", function(gltf) { loader.load("https://immersive-web.github.io/webxr-samples/media/gltf/sunflower/sunflower.gltf", function(gltf) {
flower = gltf.scene; flower = gltf.scene;
}); });
session.addEventListener("select", (event) => { session.addEventListener("select", (event) => {
if (flower) { if (flower) {
const clone = flower.clone(); const clone = flower.clone();
......
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