Merge pull request #103 from networked-aframe/0.5.2-dev

0.5.2 Release
networked-aframe · Mar 18, 2018 · 1327e37 · 1327e37
2 parents 4b815eb + d693469
commit 1327e37
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -289,6 +289,19 @@ List of events:
 | entityCreated | Fired when a networked entity is created | `evt.detail.el` - new entity |
 | entityDeleted | Fired when a networked entity is deleted | `evt.detail.networkId` - networkId of deleted entity |
 
+The following events are fired on the `networked` component. See the [toggle-ownership component](./server/static/js/toggle-ownership.component.js) for examples.
+
+List of ownership transfer events:
+
+| Event | Description | Values |
+| -------- | ----------- | ------------- |
+| ownership-gained | Fired when a networked entity's ownership is taken | `evt.detail.el` - the entity whose ownership was gained |
+| | | `evt.detail.oldOwner` - the clientId of the previous owner |
+| ownership-lost | Fired when a networked entity's ownership is lost | `evt.detail.el` - the entity whose ownership was lost |
+| | | `evt.detail.newOwner` - the clientId of the new owner |
+| ownership-changed | Fired when a networked entity's ownership is changed | `evt.detail.el` - the entity whose ownership was lost |
+| | | `evt.detail.oldOwner` - the clientId of the previous owner |
+| | | `evt.detail.newOwner` - the clientId of the new owner |
 
 ### Adapters
 

diff --git a/dist/networked-aframe.js b/dist/networked-aframe.js
@@ -3829,7 +3829,14 @@
 	// @TODO if aframevr/aframe#3042 gets merged, this should just delegate to the aframe sound component
 	AFRAME.registerComponent('networked-audio-source', {
 	  schema: {
-	    positional: { default: true }
+	    positional: { default: true },
+	    distanceModel: {
+	      default: "inverse",
+	      oneOf: ["linear", "inverse", "exponential"]
+	    },
+	    maxDistance: { default: 10000 },
+	    refDistance: { default: 1 },
+	    rolloffFactor: { default: 1 }
 	  },
 
 	  init: function init() {
@@ -3851,6 +3858,9 @@
 	    }
 	  },
 
+	  update: function update() {
+	    this._setPannerProperties();
+	  },
 	  _setMediaStream: function _setMediaStream(newStream) {
 	    if (!this.sound) {
 	      this.setupSound();
@@ -3866,12 +3876,21 @@
 	        this.audioEl.setAttribute("autoplay", "autoplay");
 	        this.audioEl.setAttribute("playsinline", "playsinline");
 	        this.audioEl.srcObject = newStream;
+	        this.audioEl.volume = 0; // we don't actually want to hear audio from this element
 
 	        this.sound.setNodeSource(this.sound.context.createMediaStreamSource(newStream));
 	      }
 	      this.stream = newStream;
 	    }
 	  },
+	  _setPannerProperties: function _setPannerProperties() {
+	    if (this.sound && this.data.positional) {
+	      this.sound.setDistanceModel(this.data.distanceModel);
+	      this.sound.setMaxDistance(this.data.maxDistance);
+	      this.sound.setRefDistance(this.data.refDistance);
+	      this.sound.setRolloffFactor(this.data.rolloffFactor);
+	    }
+	  },
 
 
 	  remove: function remove() {
@@ -3902,6 +3921,7 @@
 
 	    this.sound = this.data.positional ? new THREE.PositionalAudio(this.listener) : new THREE.Audio(this.listener);
 	    el.setObject3D(this.attrName, this.sound);
+	    this._setPannerProperties();
 	  }
 	});
 

diff --git a/dist/networked-aframe.min.js b/dist/networked-aframe.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "networked-aframe",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "A web framework for building multi-user virtual reality experiences.",
   "homepage": "",
   "main": "dist/networked-aframe.js",

diff --git a/server/static/js/toggle-ownership.component.js b/server/static/js/toggle-ownership.component.js
@@ -15,7 +15,37 @@ AFRAME.registerComponent('toggle-ownership', {
 
     if (NAF.utils.isMine(this.el)) {
       this.updateColor();
+    } else {
+      this.el.setAttribute('material', 'opacity', 0.5);
     }
+
+    // Opacity is not a networked attribute, but change it based on ownership events
+    this.networkedEl = NAF.utils.getNetworkedEntity(this.el);
+
+    let timeout;
+
+    this.networkedEl.addEventListener("ownership-gained", e => {
+      e.detail.el.setAttribute('material', 'opacity', 1);
+    });
+
+    this.networkedEl.addEventListener("ownership-lost", e => {
+      e.detail.el.setAttribute('material', 'opacity', 0.5);
+    });
+
+    this.networkedEl.addEventListener("ownership-changed", e => {
+      clearTimeout(timeout);
+      console.log(e.detail)
+      if (e.detail.newOwner == NAF.clientId) {
+        //same as listening to "ownership-gained"
+      } else if (e.detail.oldOwner == NAF.clientId) {
+        //same as listening to "ownership-lost"
+      } else {
+        e.detail.el.setAttribute('material', 'opacity', 0.8);
+        timeout = setTimeout(() => {
+          e.detail.el.setAttribute('material', 'opacity', 0.5);
+        }, 200)
+      }
+    });
   },
 
   onKeyUp(e) {

diff --git a/src/NafIndex.js b/src/NafIndex.js
@@ -14,7 +14,7 @@ naf.options = options;
 naf.utils = utils;
 naf.log = new NafLogger();
 naf.schemas = new Schemas();
-naf.version = "0.5.0";
+naf.version = "0.5.2";
 
 naf.adapters = new AdapterFactory();
 var entities = new NetworkEntities();

diff --git a/src/components/networked-audio-source.js b/src/components/networked-audio-source.js
@@ -1,9 +1,15 @@
 var naf = require('../NafIndex');
 
-// @TODO if aframevr/aframe#3042 gets merged, this should just delegate to the aframe sound component
 AFRAME.registerComponent('networked-audio-source', {
   schema: {
-    positional: { default: true }
+    positional: { default: true },
+    distanceModel: {
+      default: "inverse",
+      oneOf: ["linear", "inverse", "exponential"]
+    },
+    maxDistance: { default: 10000 },
+    refDistance: { default: 1 },
+    rolloffFactor: { default: 1 }
   },
 
   init: function () {
@@ -25,6 +31,10 @@ AFRAME.registerComponent('networked-audio-source', {
     }
   },
 
+  update() {
+    this._setPannerProperties();
+  },
+
   _setMediaStream(newStream) {
     if(!this.sound) {
       this.setupSound();
@@ -40,13 +50,23 @@ AFRAME.registerComponent('networked-audio-source', {
         this.audioEl.setAttribute("autoplay", "autoplay");
         this.audioEl.setAttribute("playsinline", "playsinline");
         this.audioEl.srcObject = newStream;
+        this.audioEl.volume = 0; // we don't actually want to hear audio from this element
 
         this.sound.setNodeSource(this.sound.context.createMediaStreamSource(newStream));
       }
       this.stream = newStream;
     }
   },
 
+  _setPannerProperties() {
+    if (this.sound && this.data.positional) {
+      this.sound.setDistanceModel(this.data.distanceModel);
+      this.sound.setMaxDistance(this.data.maxDistance);
+      this.sound.setRefDistance(this.data.refDistance);
+      this.sound.setRolloffFactor(this.data.rolloffFactor);
+    }
+  },
+
   remove: function() {
     if (!this.sound) return;
 
@@ -77,5 +97,6 @@ AFRAME.registerComponent('networked-audio-source', {
       ? new THREE.PositionalAudio(this.listener)
       : new THREE.Audio(this.listener);
     el.setObject3D(this.attrName, this.sound);
+    this._setPannerProperties();
   }
 });
diff --git a/src/components/networked.js b/src/components/networked.js
@@ -13,6 +13,10 @@ AFRAME.registerComponent('networked', {
   },
 
   init: function() {
+    this.OWNERSHIP_GAINED = 'ownership-gained';
+    this.OWNERSHIP_CHANGED = 'ownership-changed';
+    this.OWNERSHIP_LOST = 'ownership-lost';
+
     var wasCreatedByNetwork = this.wasCreatedByNetwork();
 
     this.onConnected = bind(this.onConnected, this);
@@ -59,6 +63,8 @@ AFRAME.registerComponent('networked', {
       this.removeLerp();
       this.el.setAttribute('networked', { owner: NAF.clientId });
       this.syncAll();
+      this.el.emit(this.OWNERSHIP_GAINED, { el: this.el, oldOwner: owner });
+      this.el.emit(this.OWNERSHIP_CHANGED, { el: this.el, oldOwner: owner, newOwner: NAF.clientId});
       return true;
     }
     return false;
@@ -286,11 +292,19 @@ AFRAME.registerComponent('networked', {
     }
 
     if (this.data.owner !== entityData.owner) {
+      var wasMine = this.isMine();
       this.lastOwnerTime = entityData.lastOwnerTime;
       this.attachLerp();
+
+      const oldOwner = this.data.owner;
+      const newOwner = entityData.owner;
+      if (wasMine) {
+        this.el.emit(this.OWNERSHIP_LOST, { el: this.el, newOwner: newOwner });
+      }
+      this.el.emit(this.OWNERSHIP_CHANGED, { el: this.el, oldOwner: oldOwner, newOwner: newOwner});
+
       this.el.setAttribute('networked', { owner: entityData.owner });
     }
-
     this.updateComponents(entityData.components);
   },