diff --git a/src/gltf-component-mappings.js b/src/gltf-component-mappings.js index 292539bd0df00407815a8da3aeaaa6e9f4f558df..a6d81854673fca6f81347c46f82280c487b7ad5c 100644 --- a/src/gltf-component-mappings.js +++ b/src/gltf-component-mappings.js @@ -74,8 +74,6 @@ AFRAME.GLTFModelPlus.registerComponent("nav-mesh", "nav-mesh", (el, _componentNa }); AFRAME.GLTFModelPlus.registerComponent("media", "media", (el, componentName, componentData) => { - // TODO compute a network id based upon URL and transform - const networkId = "foo"; - el.setAttribute("networked", { template: "#interactable-media", owner: "scene", networkId }); + el.setAttribute("networked", { template: "#interactable-media", owner: "scene", networkId: componentData.networkId }); el.setAttribute("media-loader", { resolve: true, src: componentData.src }); }); diff --git a/src/hub.html b/src/hub.html index c020970c5febc79025c88461266ddf4bbb79acf9..6e50fc6165597981b5158e81de80ba400185ab59 100644 --- a/src/hub.html +++ b/src/hub.html @@ -158,7 +158,6 @@ sticky-object="autoLockOnRelease: true; autoLockOnLoad: true;" position-at-box-shape-border="target:.delete-button" destroy-at-extreme-distances - rotation activatable__increase-scale="buttonStartEvents: scroll_right; buttonEndEvents: horizontal_scroll_release; activatedState: scaleUp;" activatable__decrease-scale="buttonStartEvents: scroll_left; buttonEndEvents: horizontal_scroll_release; activatedState: scaleDown;" > diff --git a/src/hub.js b/src/hub.js index 2fd06d77111dd9bd2ed13ee867efe30f215e0f04..f335d5cd35d9fece1731c4c4db775c71822f85f6 100644 --- a/src/hub.js +++ b/src/hub.js @@ -246,7 +246,7 @@ async function handleHubChannelJoined(entryManager, hubChannel, data) { const environmentScene = document.querySelector("#environment-scene"); const objectsScene = document.querySelector("#objects-scene"); const objectsUrl = - "https://farspark-dev.reticulum.io/0/raw/0/0/0/0/aHR0cHM6Ly91cGxvYWRzLWRldi5yZXRpY3VsdW0uaW8vZmlsZXMvNTQ4NTBlNjUtNzhlMi00MjAyLTkzMjItMzk2YmFlZDQ4MTJhLmdsdGY_dG9rZW49NzA2YzdkMjM1OGM0MDIxYzVjOGU2MmIzNGM5MDZiZDY"; + "https://farspark-dev.reticulum.io/0/raw/0/0/0/0/aHR0cHM6Ly91cGxvYWRzLWRldi5yZXRpY3VsdW0uaW8vZmlsZXMvZDI2ZTRiOWMtNmU4My00ZTFiLTk0NWEtOWViMTE3MTQ4ZjUwLmdsdGY_dG9rZW49ODk1NjI5NzQzNjQzYjljOGVhM2I2MTA2OTY4MzAxYTU"; const objectsEl = document.createElement("a-entity"); objectsEl.setAttribute("gltf-model-plus", { src: objectsUrl, useCache: false, inflate: true }); objectsScene.appendChild(objectsEl);