Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
Hubs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ar-noc
Hubs
Commits
caa7adb9
Commit
caa7adb9
authored
6 years ago
by
Greg Fodor
Browse files
Options
Downloads
Patches
Plain Diff
WIP
parent
bbdbbadb
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/gltf-component-mappings.js
+1
-3
1 addition, 3 deletions
src/gltf-component-mappings.js
src/hub.html
+0
-1
0 additions, 1 deletion
src/hub.html
src/hub.js
+1
-1
1 addition, 1 deletion
src/hub.js
with
2 additions
and
5 deletions
src/gltf-component-mappings.js
+
1
−
3
View file @
caa7adb9
...
@@ -74,8 +74,6 @@ AFRAME.GLTFModelPlus.registerComponent("nav-mesh", "nav-mesh", (el, _componentNa
...
@@ -74,8 +74,6 @@ AFRAME.GLTFModelPlus.registerComponent("nav-mesh", "nav-mesh", (el, _componentNa
});
});
AFRAME
.
GLTFModelPlus
.
registerComponent
(
"
media
"
,
"
media
"
,
(
el
,
componentName
,
componentData
)
=>
{
AFRAME
.
GLTFModelPlus
.
registerComponent
(
"
media
"
,
"
media
"
,
(
el
,
componentName
,
componentData
)
=>
{
// TODO compute a network id based upon URL and transform
el
.
setAttribute
(
"
networked
"
,
{
template
:
"
#interactable-media
"
,
owner
:
"
scene
"
,
networkId
:
componentData
.
networkId
});
const
networkId
=
"
foo
"
;
el
.
setAttribute
(
"
networked
"
,
{
template
:
"
#interactable-media
"
,
owner
:
"
scene
"
,
networkId
});
el
.
setAttribute
(
"
media-loader
"
,
{
resolve
:
true
,
src
:
componentData
.
src
});
el
.
setAttribute
(
"
media-loader
"
,
{
resolve
:
true
,
src
:
componentData
.
src
});
});
});
This diff is collapsed.
Click to expand it.
src/hub.html
+
0
−
1
View file @
caa7adb9
...
@@ -158,7 +158,6 @@
...
@@ -158,7 +158,6 @@
sticky-object=
"autoLockOnRelease: true; autoLockOnLoad: true;"
sticky-object=
"autoLockOnRelease: true; autoLockOnLoad: true;"
position-at-box-shape-border=
"target:.delete-button"
position-at-box-shape-border=
"target:.delete-button"
destroy-at-extreme-distances
destroy-at-extreme-distances
rotation
activatable__increase-scale=
"buttonStartEvents: scroll_right; buttonEndEvents: horizontal_scroll_release; activatedState: scaleUp;"
activatable__increase-scale=
"buttonStartEvents: scroll_right; buttonEndEvents: horizontal_scroll_release; activatedState: scaleUp;"
activatable__decrease-scale=
"buttonStartEvents: scroll_left; buttonEndEvents: horizontal_scroll_release; activatedState: scaleDown;"
activatable__decrease-scale=
"buttonStartEvents: scroll_left; buttonEndEvents: horizontal_scroll_release; activatedState: scaleDown;"
>
>
...
...
This diff is collapsed.
Click to expand it.
src/hub.js
+
1
−
1
View file @
caa7adb9
...
@@ -246,7 +246,7 @@ async function handleHubChannelJoined(entryManager, hubChannel, data) {
...
@@ -246,7 +246,7 @@ async function handleHubChannelJoined(entryManager, hubChannel, data) {
const
environmentScene
=
document
.
querySelector
(
"
#environment-scene
"
);
const
environmentScene
=
document
.
querySelector
(
"
#environment-scene
"
);
const
objectsScene
=
document
.
querySelector
(
"
#objects-scene
"
);
const
objectsScene
=
document
.
querySelector
(
"
#objects-scene
"
);
const
objectsUrl
=
const
objectsUrl
=
"
https://farspark-dev.reticulum.io/0/raw/0/0/0/0/aHR0cHM6Ly91cGxvYWRzLWRldi5yZXRpY3VsdW0uaW8vZmlsZXMv
NTQ4NTBlNjUtNzhlMi00MjAyLTkzMjItMzk2YmFlZDQ4MTJhLmdsdGY_dG9rZW49NzA2YzdkMjM1OGM0MDIxYzVjOGU2MmIzNGM5MDZiZDY
"
;
"
https://farspark-dev.reticulum.io/0/raw/0/0/0/0/aHR0cHM6Ly91cGxvYWRzLWRldi5yZXRpY3VsdW0uaW8vZmlsZXMv
ZDI2ZTRiOWMtNmU4My00ZTFiLTk0NWEtOWViMTE3MTQ4ZjUwLmdsdGY_dG9rZW49ODk1NjI5NzQzNjQzYjljOGVhM2I2MTA2OTY4MzAxYTU
"
;
const
objectsEl
=
document
.
createElement
(
"
a-entity
"
);
const
objectsEl
=
document
.
createElement
(
"
a-entity
"
);
objectsEl
.
setAttribute
(
"
gltf-model-plus
"
,
{
src
:
objectsUrl
,
useCache
:
false
,
inflate
:
true
});
objectsEl
.
setAttribute
(
"
gltf-model-plus
"
,
{
src
:
objectsUrl
,
useCache
:
false
,
inflate
:
true
});
objectsScene
.
appendChild
(
objectsEl
);
objectsScene
.
appendChild
(
objectsEl
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment