janusweb 1.5.42 → 1.5.43

package/scripts/room.js

@@ -27,6 +27,7 @@ elation.require([
         'baseurl': { type: 'string', default: false },
         'source': { type: 'string' },
         'skybox': { type: 'boolean', default: true, set: this.toggleSkybox },
+        'skybox_intensity': { type: 'float', set: this.setSkybox, default: 1.0 },
         'skybox_equi': { type: 'string', set: this.setSkybox },
         'skybox_left_id': { type: 'string', set: this.setSkybox },
         'skybox_right_id': { type: 'string', set: this.setSkybox },
@@ -68,7 +69,7 @@ elation.require([
         'server': { type: 'string' },
         'port': { type: 'int' },
         'rate': { type: 'int', default: 200 },
-        'voip': { type: 'string', default: 'janus' },
+        'voip': { type: 'string', default: 'none' },
         'voipid': { type: 'string' },
         'voiprange': { type: 'float', default: 1 },
         'voipserver': { type: 'string', default: 'voip.janusxr.org' },
@@ -79,7 +80,7 @@ elation.require([
         'requires': { type: 'string' },
         'onload': { type: 'string' },
         'sync': { type: 'boolean', default: false },
-        'pointerlock': { type: 'boolean', default: true },
+        'pointerlock': { type: 'boolean', default: true, set: this.updatePointerLock },
       });
       this.translators = {
         '^janus-vfs:': elation.janusweb.translators.janusvfs({janus: this.janus}),
@@ -113,6 +114,7 @@ elation.require([
       this.customElements = {};
       this.unknownElements = {};
       this.eventlistenerproxies = {};
+      this.pendingScriptMap = {};
 
       // FIXME - binding functions to this instance so we can unbind events later.  Should be done at a lower level
       this.onRoomEdit = elation.bind(this, this.onRoomEdit);
@@ -138,6 +140,7 @@ elation.require([
         let hashidx = this.url.indexOf('#');
         if (hashidx != -1) {
           this.urlhash = this.url.substr(hashidx+1);
+          this.setHash(this.urlhash)
           this.url = this.url.substr(0, hashidx);
         }
         this.roomid = md5(this.url);
@@ -274,7 +277,7 @@ elation.require([
         let obj = this.getObjectById(this.urlhash);
         if (obj) {
           obj.localToWorld(spawnpoint.position.set(0,0,0));
-          spawnpoint.orientation.setFromRotationMatrix(obj.objects['3d'].matrixWorld);
+          spawnpoint.orientation.setFromRotationMatrix(obj.objects['3d'].matrixWorld.lookAt(spawnpoint.position, obj.localToWorld(V(0,0,1)), obj.localToWorld(V(0,1,0).sub(spawnpoint.position))));
         }
       }
       return spawnpoint;
@@ -307,9 +310,11 @@ elation.require([
         elation.events.add(equi, 'asset_load', ev => {
           this.skyboxtexture = ev.target._texture;
           this.skyboxtexture.mapping = THREE.EquirectangularReflectionMapping;
+          this.skyboxtexture.encoding = THREE.sRGBEncoding;
           if (this.janus.currentroom === this) {
             this.skyboxobj.setTexture(this.skyboxtexture);
           }
+          elation.events.fire({element: this, type: 'skybox_update'});
         });
         equi.getInstance();
       } else if (hasSkybox) {
@@ -885,9 +890,9 @@ elation.require([
             // If no reciprocal link was found, spawn one so we can find our way back
             let linkrot = new EulerDegrees();
             linkrot.radians.copy(this.spawnpoint.rotation);
-            //linkrot.x *= THREE.Math.RAD2DEG;
+            //linkrot.x *= THREE.MathUtils.RAD2DEG;
             linkrot.y = linkrot.y + 180;
-            //linkrot.z *= THREE.Math.RAD2DEG;
+            //linkrot.z *= THREE.MathUtils.RAD2DEG;
             let linkpos = this.spawnpoint.localToWorld(V(0,0,player.fatness/2));
             this.createObject('link', {
               pos: linkpos,
@@ -973,7 +978,6 @@ elation.require([
 
         if (assets.scripts) {
           this.pendingScripts = 0;
-          this.pendingScriptMap = {};
           this.loadScripts(assets.scripts);
         }
 
@@ -1064,7 +1068,7 @@ elation.require([
 
         if (this.audionodes) {
           this.audionodes.gain.connect(this.audionodes.listener.getInput());
-console.log('connect room audio to graph', this.audionodes.gain, this.audionodes.listener.getInput(), this);
+          //console.log('connect room audio to graph', this.audionodes.gain, this.audionodes.listener.getInput(), this);
           this.fadeAudioIn(2);
         }
         this.engine.systems.controls.pointerLockEnabled = this.pointerlock;
@@ -1508,6 +1512,7 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
             type: args.type,
             format: args.format,
             hls: args.hls,
+            proxy: args.proxy,
             baseurl: this.baseurl
           });
         }
@@ -2071,6 +2076,7 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
           pickable:      ['property', 'pickable'],
 
           skybox:         ['property', 'skybox'],
+          skybox_intensity: ['property', 'skybox_intensity'],
           skybox_equi:    ['property', 'skybox_equi'],
           skybox_left_id: ['property', 'skybox_left_id'],
           skybox_right_id:['property', 'skybox_right_id'],
@@ -2166,29 +2172,72 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
           //changestr += this.currentroom.changes[id];
           var change = this.changes[id];
           var real = this.getObjectFromProxy(change);
+          let propdefs = real._thingdef.properties,
+              proxydefs = change._proxydefs;
           if (real) {
-            var xmltype = typemap[real.type] || 'Object';
+            var xmltype = false;
+            if (room.customElements) {
+              for (let k in room.customElements) {
+                if (room.customElements[k].classname == real.type) {
+                  xmltype = k;
+                  break;
+                }
+              }
+            }
+            if (!xmltype) {
+              if (real.type in janus.customElements) {
+                xmltype = real.type;
+              }
+            }
+            if (!xmltype) {
+              xmltype = typemap[real.type] || 'Object';
+            }
             let xmlnode = xmldoc.createElement(xmltype);
             
             var attrs = Object.keys(change);
             for (var i = 0; i < attrs.length; i++) {
               var k = attrs[i];
 
+              let propdef = propdefs[proxydefs[k][1]];
+
               if (ignoreattributes.indexOf(k) != -1) continue;
 
+              let defaultval = (propdef ? propdef.default : null);
               var val = change[k];
-              if (val instanceof THREE.Vector2 ||
-                  val instanceof THREE.Quaternion ||
-                  val instanceof THREE.Vector3) {
-                val = val.toArray().map(function(n) { return (+n).toFixed(4); }).join(' ');
+              if (val instanceof THREE.Vector2) {
+                if (defaultval instanceof THREE.Vector2) defaultval = defaultval.toArray();
+                //if (!('default' in propdef) || ('default' in propdef && !(val.x == defaultval[0] && val.y == defaultval[1]))) {
+                  val = val.toArray().map(function(n) { return (+n).toFixed(4); }).join(' ');
+                //} else {
+                //  val = null;
+                //}
+              } else if (val instanceof THREE.Quaternion) {
+                //if (defaultval instanceof THREE.Quaternion) defaultval = defaultval.toArray();
+                //if (!('default' in propdef) || ('default' in propdef && !(val.x == defaultval[0] && val.y == defaultval[1] && val.z == defaultval[2] && val.w == defaultval[3]))) {
+                  val = val.toArray().map(function(n) { return (+n).toFixed(4); }).join(' ');
+                //} else {
+                //  val = null;
+                //}
+              } else if (val instanceof THREE.Vector3) {
+                if (defaultval instanceof THREE.Vector3) defaultval = defaultval.toArray();
+                //if (!('default' in propdef) || ('default' in propdef && !(val.x == defaultval[0] && val.y == defaultval[1] && val.z == defaultval[2]))) {
+                  val = val.toArray().map(function(n) { return (+n).toFixed(4); }).join(' ');
+                //} else {
+                //  val = null;
+                //}
               } else if (val instanceof THREE.Euler) {
-                val = [val.x.toFixed(4), val.y.toFixed(4), val.z.toFixed(4)].join(' ');
+                if (defaultval instanceof THREE.Euler) defaultval = defaultval.toArray();
+                //if (!('default' in propdef) || ('default' in propdef && !(val.x == defaultval[0] && val.y == defaultval[1] && val.z == defaultval[2]))) {
+                  val = [val.x.toFixed(4), val.y.toFixed(4), val.z.toFixed(4)].join(' ');
+                //} else {
+                //  val = null;
+                //}
               } else if (val instanceof THREE.Color) {
-                if (k == 'col' && real.colorIsDefault) {
-                  val = null;
-                } else {
+                //if (k == 'col' && real.colorIsDefault) {
+                //  val = null;
+                //} else {
                   val = val.toArray().map(function(n) { return +n.toFixed(4); }).join(' ');
-                }
+                //}
               } else if (elation.utils.isString(val) && val.indexOf('blob:') == 0) {
                 var xhr = new XMLHttpRequest();
 
@@ -2211,6 +2260,15 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
                 }
                 val = 'data:image/png;base64,' + btoa(binary);
 */
+              } else if (elation.utils.isArray(val)) {
+                //if ('default' in propdef && val.length == 0) {
+                  // FIXME - this assumes if a default array is provided, it's probably empty. This may not always be true.
+                //  val = null;
+                //}
+              } else {
+                //if ('default' in propdef && val == defaultval) {
+                //  val = null;
+                //}
               }
 
               if (val !== null && val !== undefined && typeof val != 'function') {
@@ -2403,7 +2461,7 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
           } else if (val instanceof THREE.Euler) {
             if (defaultval instanceof THREE.Euler) defaultval = defaultval.toArray();
             if (!('default' in propdef) || ('default' in propdef && !(val.x == defaultval[0] && val.y == defaultval[1] && val.z == defaultval[2]))) {
-              objectsrc += ' ' + k + '="' + val.toArray().slice(0, 3).map(n => Math.round((n * THREE.Math.RAD2DEG) * 10000) / 10000).join(' ') + '"';
+              objectsrc += ' ' + k + '="' + val.toArray().slice(0, 3).map(n => Math.round((n * THREE.MathUtils.RAD2DEG) * 10000) / 10000).join(' ') + '"';
             }
           } else if (val instanceof THREE.Quaternion) {
             if (defaultval instanceof THREE.Quaternion) defaultval = defaultval.toArray();
@@ -2512,10 +2570,11 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
           _ray = new THREE.Raycaster();
       _ray.params.Line.threshold = 3;
       _ray.params.Points.threshold = 3;
-      return function(dir, pos, classname, maxdist) {
+      return function(dir, pos, classname, maxdist, colliderroot=null) {
         _ray.set(pos, dir);
         _ray.far = maxdist || Infinity;
-        var intersections = _ray.intersectObject(this.colliders, true);
+        if (!colliderroot) colliderroot = this.colliders; 
+        var intersections = _ray.intersectObject(colliderroot, true);
         var hits = [];
         if (classname) {
           for (var i = 0; i < intersections.length; i++) {
@@ -2598,17 +2657,19 @@ console.log('connect room audio to graph', this.audionodes.gain, this.audionodes
             });
             if (!this.loaded && this.pendingScripts) {
               // We're still waiting for the room to finish loading, so wait for the room_load_complete event before checking if we need to load anything else
-              this.addEventListener('room_load_complete', (ev) => {
+              let func = (ev) => {
                 // Room and all of its assets have finished loading. If our required component still isn't available, check the master package list and autoload if possible
                 if (!finished) {
                   this.loadComponentList().then(components => {
                     if (components[k]) {
                       this.loadNewAsset('script', { src: components[k].url, override: { room: this.getProxyObject() } });
                       this._target.loadScripts([{src: components[k].url}]);
+                      this.removeEventListener('room_load_complete', func);
                     }
                   });
                 }
-              });
+              }
+              this.addEventListener('room_load_complete', func);
             } else {
               // Room is already loaded and scripts are processed - we still don't know about this component, so load it up
               this.loadComponentList().then(components => {
@@ -2870,6 +2931,9 @@ console.log('unknown material', mat);
       }
       return stats;
     }
+    this.updatePointerLock = function() {
+      this.engine.systems.controls.pointerLockEnabled = this.pointerlock;
+    }
   }, elation.engine.things.generic);
 });
 

package/scripts/text.js

@@ -14,7 +14,8 @@ elation.require(['engine.things.label'], function() {
         'zalign':          { type: 'string', default: 'back', refreshGeometry: true },
         'emissive':        { type: 'color', default: 0x000000 },
         'opacity':         { type: 'float', default: 1.0 },
-        'depthTest':       { type: 'bool', default: true },
+        'depth_write':     { type: 'bool', default: true },
+        'depth_test':      { type: 'bool', default: true },
         'thickness':       { type: 'float', refreshGeometry: true },
         'segments':        { type: 'int', default: 6, refreshGeometry: true },
         'bevel':           { type: 'bool', default: false, refreshGeometry: true },
@@ -82,6 +83,9 @@ elation.require(['engine.things.label'], function() {
         this.mesh = mesh;
       }
       this.objects['3d'].add(mesh);
+      setTimeout(() => {
+        //this.setCollider('box', this.getBoundingBox(true));
+      }, 0);
       this.refresh();
     }
     this.createTextMaterial = function() {
@@ -91,7 +95,8 @@ elation.require(['engine.things.label'], function() {
         transparent: this.properties.opacity < 1,
         emissive: this.properties.emissive, 
         flatShading: false,
-        depthTest: this.properties.depthTest,
+        depthTest: this.depth_test,
+        depthWrite: this.depth_write,
         reflectivity: .5,
         wireframe: this.wireframe,
       };

package/scripts/websurface.js

@@ -45,7 +45,7 @@ elation.require(['engine.things.generic'], function() {
       elation.events.add(this, 'click', elation.bind(this, this.click));
     }
     this.createObject3D = function() {
-      var plane = new THREE.PlaneBufferGeometry(1,1);
+      var plane = new THREE.PlaneGeometry(1,1);
 
       var mat = new THREE.MeshBasicMaterial({
         color: 0x000000,
@@ -113,7 +113,7 @@ elation.require(['engine.things.generic'], function() {
       if (!this.active) {
         var canvas = this.engine.client.view.rendersystem.renderer.domElement;
         canvas.style.pointerEvents = 'none';
-        canvas.style.position = 'absolute';
+        //canvas.style.position = 'absolute';
         this.engine.systems.controls.releasePointerLock();
         this.active = true;
         this.selectionmaterial.color.copy(this.activecolor);
@@ -127,7 +127,7 @@ setTimeout(elation.bind(this, function() {
       if (this.active) {
         var canvas = this.engine.client.view.rendersystem.renderer.domElement;
         canvas.style.pointerEvents = 'all';
-        canvas.style.position = 'static';
+        //canvas.style.position = 'static';
         this.engine.systems.controls.requestPointerLock();
         ev.stopPropagation();
         ev.preventDefault();