From caa7adb9854bf0c7c1ef37f1e9d7817840a73ee8 Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Sun, 21 Oct 2018 22:51:14 +0000
Subject: [PATCH] WIP
---
src/gltf-component-mappings.js | 4 +---
src/hub.html | 1 -
src/hub.js | 2 +-
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/gltf-component-mappings.js b/src/gltf-component-mappings.js
index 292539bd0..a6d818546 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 c020970c5..6e50fc616 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 2fd06d771..f335d5cd3 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);
--
GitLab