Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GeoVistoogsi
AR
Commits
87b8f4c4
Commit
87b8f4c4
authored
4 months ago
by
Percen
Browse files
Options
Download
Email Patches
Plain Diff
Update public/index.html
parent
4ad81d9f
master
21caog1bif-master-patch-76399
21caog1bif-master-patch-83779
21caog1bif-master-patch-96693
1 merge request
!66
Update public/index.html
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
public/index.html
+6
-5
public/index.html
with
6 additions
and
5 deletions
+6
-5
public/index.html
+
6
-
5
View file @
87b8f4c4
...
@@ -27,8 +27,9 @@
...
@@ -27,8 +27,9 @@
let
selectedModel
=
'
robot
'
;
// Standardauswahl
let
selectedModel
=
'
robot
'
;
// Standardauswahl
let
models
=
{};
let
models
=
{};
let
reticle
;
let
reticle
;
let
currentModel
;
let
currentModel
=
null
;
let
scene
;
let
scene
;
let
camera
;
async
function
activateXR
()
{
async
function
activateXR
()
{
const
canvas
=
document
.
createElement
(
'
canvas
'
);
const
canvas
=
document
.
createElement
(
'
canvas
'
);
...
@@ -38,7 +39,7 @@
...
@@ -38,7 +39,7 @@
renderer
.
autoClear
=
false
;
renderer
.
autoClear
=
false
;
scene
=
new
THREE
.
Scene
();
scene
=
new
THREE
.
Scene
();
const
camera
=
new
THREE
.
PerspectiveCamera
();
camera
=
new
THREE
.
PerspectiveCamera
();
camera
.
matrixAutoUpdate
=
false
;
camera
.
matrixAutoUpdate
=
false
;
// Licht hinzufügen
// Licht hinzufügen
...
@@ -93,7 +94,7 @@
...
@@ -93,7 +94,7 @@
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
);
//
Setze die Position des aktuellen Modells
//
Das Modell an die Reticle-Position setzen
if
(
currentModel
)
{
if
(
currentModel
)
{
currentModel
.
position
.
set
(
hitPose
.
transform
.
position
.
x
,
hitPose
.
transform
.
position
.
y
,
hitPose
.
transform
.
position
.
z
);
currentModel
.
position
.
set
(
hitPose
.
transform
.
position
.
x
,
hitPose
.
transform
.
position
.
y
,
hitPose
.
transform
.
position
.
z
);
}
}
...
@@ -148,14 +149,14 @@
...
@@ -148,14 +149,14 @@
scene
.
remove
(
currentModel
);
scene
.
remove
(
currentModel
);
}
}
//
Setze das
ausgewählt
e Modell
//
Bestimmen, welches Modell
ausgewählt
wird
if
(
direction
===
'
next
'
)
{
if
(
direction
===
'
next
'
)
{
selectedModel
=
selectedModel
===
'
robot
'
?
'
flower
'
:
'
robot
'
;
selectedModel
=
selectedModel
===
'
robot
'
?
'
flower
'
:
'
robot
'
;
}
else
if
(
direction
===
'
previous
'
)
{
}
else
if
(
direction
===
'
previous
'
)
{
selectedModel
=
selectedModel
===
'
robot
'
?
'
flower
'
:
'
robot
'
;
selectedModel
=
selectedModel
===
'
robot
'
?
'
flower
'
:
'
robot
'
;
}
}
//
Stelle sicher, dass das aktuelle Modell auch tatsächlich in der Szene ist
//
Das ausgewählte Modell hinzufügen
currentModel
=
models
[
selectedModel
].
clone
();
// Erstelle eine Kopie des Modells
currentModel
=
models
[
selectedModel
].
clone
();
// Erstelle eine Kopie des Modells
scene
.
add
(
currentModel
);
scene
.
add
(
currentModel
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets