From 03a04b1e37a5c1ec6a8057da3e9062a373b89ad3 Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Fri, 26 Oct 2018 00:49:22 +0000
Subject: [PATCH] Bring in persistence networked-aframe support
---
package-lock.json | 2 +-
src/gltf-component-mappings.js | 2 +-
src/scene-entry-manager.js | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 0bbad51e8..4ea5eaa9d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8984,7 +8984,7 @@
"dev": true
},
"networked-aframe": {
- "version": "github:mozillareality/networked-aframe#1dd7e0aa62bd119c214fec7e9137d4447f40cba0",
+ "version": "github:mozillareality/networked-aframe#f91ad0132e3622469b2f958a24d3cc7e43afac39",
"from": "github:mozillareality/networked-aframe#master",
"requires": {
"buffered-interpolation": "^0.2.4",
diff --git a/src/gltf-component-mappings.js b/src/gltf-component-mappings.js
index ecd553bc8..7e1d5dced 100644
--- a/src/gltf-component-mappings.js
+++ b/src/gltf-component-mappings.js
@@ -76,7 +76,7 @@ AFRAME.GLTFModelPlus.registerComponent("nav-mesh", "nav-mesh", (el, _componentNa
AFRAME.GLTFModelPlus.registerComponent("pinnable", "pinnable");
AFRAME.GLTFModelPlus.registerComponent("media", "media", (el, componentName, componentData) => {
- if (componentData.networkId) {
+ if (componentData.id) {
el.setAttribute("networked", {
template: "#interactable-media",
owner: "scene",
diff --git a/src/scene-entry-manager.js b/src/scene-entry-manager.js
index 3b4a0685e..c74cb231e 100644
--- a/src/scene-entry-manager.js
+++ b/src/scene-entry-manager.js
@@ -216,6 +216,7 @@ export default class SceneEntryManager {
const el = e.detail.el;
const networkId = el.components.networked.data.networkId;
const gltfNode = pinnedEntityToGltf(el);
+ el.setAttribute("networked", { persistent: true });
this.hubChannel.pin(networkId, gltfNode);
});
@@ -226,6 +227,7 @@ export default class SceneEntryManager {
const components = el.components;
const networkId = components.networked.data.networkId;
+ el.setAttribute("networked", { persistent: false });
this.hubChannel.unpin(networkId);
});
--
GitLab