janusweb 1.5.52 → 1.5.54

package/media/assets/webui/apps/virtualgamepad/virtualgamepad.js

@@ -103,7 +103,7 @@ this.debug.style.zIndex = '1000';
       janus.engine.systems.render.renderer.domElement.addEventListener('touchstart', (ev) => {
         this.show();
         this.reset();
-        if (!player.enabled) player.enable();
+        if (room.pointerlock && !player.enabled) player.enable();
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "janusweb",
   "description": "Web client for JanusVR worlds",
-  "version": "1.5.52",
+  "version": "1.5.54",
   "main": "scripts/janusweb.js",
   "author": "James Baicoianu",
   "license": "MIT",

package/scripts/janusbase.js

@@ -210,17 +210,18 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
             });
             var collider = colliderasset.getInstance();
             this.collidermesh = collider;
-            if (collider.userData.loaded) {
+
+            if (colliderasset.state == 'complete') {
               //this.colliders.add(collider);
               processMeshCollider(collider);
             } else {
               let meshColliderLoaded = false;
-              elation.events.add(collider, 'asset_load', elation.bind(this, function(ev) {
+              elation.events.add(collider, 'asset_load', ev => {
                 if (!meshColliderLoaded) {
                   processMeshCollider(collider);
                 }
                 meshColliderLoaded = true;
-              }) );
+              });
             }
           }
         }
@@ -440,6 +441,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
           executeCallback:     ['function', 'executeCallback'],
           isEqual:             ['function', 'isEqual'],
           addClass:            ['function', 'addClass'],
+          getElementsByClassName: ['function', 'getElementsByClassName'],
           removeClass:         ['function', 'removeClass'],
           hasClass:            ['function', 'hasClass'],
           raycast:             ['function', 'raycast'],
@@ -1218,7 +1220,7 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
         if (el.tag == tag) {
           elements.push(el);
         }
-        el.getElementsByTagName(tagname, elements);
+        if (el.getElementsByTagName) el.getElementsByTagName(tagname, elements);
       };
       return elements;
     }
@@ -1243,6 +1245,19 @@ elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], f
       }
       return false;
     }
+    this.getElementsByClassName = function(classname) {
+      var objects = [];
+      for (var k in this.children) {
+        let child = this.children[k];
+        if (child.hasClass && child.hasClass(classname)) {
+          objects.push(child.getProxyObject());
+        }
+        if (child.getElementsByClassName) {
+          objects.push(...child.getElementsByClassName(classname));
+        }
+      }
+      return objects;
+    }
     this.setLayers = function(layers) {
       // TODO - this system is experimental, and probably isn't quite ready for use
       //        It should be extended to have named layers, rather than expecting the
@@ -1432,6 +1447,8 @@ console.log('clone', props);
       let obj1 = ev.data.bodies[0].object, obj2 = ev.data.bodies[1].object,
           other = (obj1 == this ? obj2 : obj1);
 
+      if (!(obj1.collidable && obj2.collidable)) return;
+
       let events = elation.events.fire({type: 'collide', element: this, data: {
         other: (typeof other.getProxyObject == 'function' ? other.getProxyObject() : other),
         collision: ev.data

package/scripts/janusparticle.js

@@ -47,6 +47,8 @@ elation.require(['janusweb.janusbase'], function() {
         rand_accel: { type: 'vector3', default: [0, 0, 0]},
         rand_col: { type: 'vector3', default: [0, 0, 0]},
         rand_scale: { type: 'vector3', default: [0, 0, 0]},
+        speed_min: { type: 'float', default: null },
+        speed_max: { type: 'float', default: null },
         loop: { type: 'bool', default: true, set: this.updateParticles },
         refreshrate: { type: 'int', default: 30 },
         blend_src: { type: 'string', default: 'src_alpha', set: this.updateMaterial },
@@ -438,6 +440,14 @@ elation.require(['janusweb.janusbase'], function() {
         vel.y += randomInRange(rand_vel.y);
         vel.z += randomInRange(rand_vel.z);
       }
+
+      let speed = vel.length();
+      if (this.speed_min !== null && speed < this.speed_min) {
+        vel.normalize().multiplyScalar(this.speed_min);
+      } else if (this.speed_max !== null && speed > this.speed_max) {
+        vel.normalize().multiplyScalar(this.speed_max);
+      }
+
       if (rand_accel.lengthSq() > 0) {
         accel.x += randomInRange(rand_accel.x);
         accel.y += randomInRange(rand_accel.y);

package/scripts/object.js

@@ -67,6 +67,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
         color_write: { type: 'boolean', default: null, set: this.updateMaterial },
         envmap_id: { type: 'string', set: this.updateMaterial, comment: 'Environment map texture ID (overrides skybox reflections)' },
         normalmap_id: { type: 'string', set: this.updateMaterial, comment: 'Normal map texture ID' },
+        normal_scale: { type: 'integer', set: this.updateMaterial, default: 1, comment: 'Normal scale' },
         bumpmap_id: { type: 'string', set: this.updateMaterial, comment: 'Bumpmap texture ID' },
         bumpmap_scale: { type: 'float', default: 1.0, set: this.updateMaterial, comment: 'Bumpmap scale' },
         alphamap_id: { type: 'string', set: this.updateMaterial, comment: 'Alpha map texture ID' },
@@ -648,7 +649,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
         let shader = this.getAsset('shader', this.shader_id);
         if (shader) {
           shadermaterial = shader.getInstance();
-          shadermaterial.uniforms = this.room.parseShaderUniforms(shader.uniforms);
+          elation.utils.merge(this.room.parseShaderUniforms(shader.uniforms), shadermaterial.uniforms);
           shadermaterial.side = this.sidemap[this.properties.cull_face];
           shadermaterial.shadowSide = shadowside
           shadermaterial.receiveShadow = this.shadow && this.shadow_receive;
@@ -796,6 +797,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
                   elation.events.add(asset, 'asset_load', elation.bind(this, function(ev) { m.normalMap = ev.data; this.refresh(); }));
                 }
               }
+              m.normalScale.set(this.normal_scale, this.normal_scale);
             } else if (textureBump) {
               m.bumpMap = textureBump;
               m.bumpScale = this.bumpmap_scale;
@@ -818,6 +820,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
             }
             if (textureNormal) {
               m.normalMap = textureNormal;
+              m.normalScale.set(this.normal_scale, this.normal_scale);
             } else if (m.normalMap) {
               var imagesrc = m.normalMap.sourceFile;
               var asset = this.getAsset('image', imagesrc, {id: imagesrc, src: imagesrc, hasalpha: false, srgb: false});
@@ -829,6 +832,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
                   elation.events.add(asset, 'asset_load', elation.bind(this, function(ev) { m.normalMap = ev.data; this.refresh(); }));
                 }
               }
+              m.normalScale.set(this.normal_scale, this.normal_scale);
             }
 
             if (textureLightmap && textureLightmap.image) {
@@ -1473,6 +1477,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
           envmap_id:  [ 'property', 'envmap_id'],
           websurface_id:  [ 'property', 'websurface_id'],
           normalmap_id:  [ 'property', 'normalmap_id'],
+          normal_scale:  [ 'property', 'normal_scale'],
           alphamap_id:  [ 'property', 'alphamap_id'],
           displacementmap_id:  [ 'property', 'displacementmap_id'],
           displacementmap_scale:  [ 'property', 'displacementmap_scale'],

package/scripts/portal.js

@@ -38,6 +38,7 @@ elation.require(['janusweb.janusbase'], function() {
       this.lastactivatetime = 0;
     }
     this.createObject3D = function() {
+      this.created = true;
       this.objects['3d'] = new THREE.Object3D();
       this.updateGeometry();
       return this.objects['3d'];
@@ -99,13 +100,15 @@ elation.require(['janusweb.janusbase'], function() {
       }
     }
     this.createMaterial = function() {
+      if (this.portalmaterial) return this.portalmaterial;
       var matargs = {
         color: 0xdddddd,
         side: THREE.DoubleSide,
       };
       var mat;
+      let shader = false;
       if (this.shader_id) {
-        let shader = this.getAsset('shader', this.shader_id);
+        shader = this.getAsset('shader', this.shader_id);
         //console.log('shader', this.shader_id, shader);
         if (shader) {
           let shadermaterial = shader.getInstance();
@@ -123,8 +126,12 @@ elation.require(['janusweb.janusbase'], function() {
         var asset = this.getAsset('image', this.thumb_id);
         if (asset) var thumb = asset.getInstance();
         if (thumb) {
-          mat.map = thumb;
-          mat.map.encoding = THREE.sRGBEncoding;
+          thumb.encoding = THREE.sRGBEncoding;
+          if (shader) {
+            mat.uniforms.iChannel0.value = thumb;
+          } else {
+            mat.map = thumb;
+          }
           if (asset.loaded) {
             if (asset.hasalpha) {
               mat.transparent = true;
@@ -149,6 +156,8 @@ elation.require(['janusweb.janusbase'], function() {
       mat.polygonOffsetFactor = -1;
       mat.polygonOffsetUnits = -4;
 
+      this.portalmaterial = mat;
+
       return mat;
     }
     this.adjustAspectRatio = function(image) {
@@ -505,6 +514,7 @@ elation.require(['janusweb.janusbase'], function() {
       this.janus.network.unsubscribe(this.portalroom);
     }
     this.updateGeometry = function() {
+      if (!this.created) return;
       var thickness = 0.05 * this.size.z;
       var offset = ((thickness / 2) / this.properties.scale.z) * 2;
       var box;

package/scripts/room.js

@@ -958,6 +958,7 @@ elation.require([
         if (room.skybox_down_id) this.properties.skybox_down_id = room.skybox_down_id;
         if (room.skybox_front_id) this.properties.skybox_front_id = room.skybox_front_id;
         if (room.skybox_back_id) this.properties.skybox_back_id = room.skybox_back_id;
+        if (typeof room.skybox_intensity != 'undefined') this.skybox_intensity = room.skybox_intensity;
 
         if (room.cubemap_radiance_id) this.properties.cubemap_radiance_id = room.cubemap_radiance_id;
         if (room.cubemap_irradiance_id) this.properties.cubemap_irradiance_id = room.cubemap_irradiance_id;
@@ -1498,6 +1499,7 @@ elation.require([
             tex_linear: args.tex_linear,
             sbs3d: args.sbs3d,
             ou3d: args.ou3d,
+            equi: args.equi,
             reverse3d: args.reverse3d,
             hasalpha: args.hasalpha,
             maxsize: args.maxsize,
@@ -1962,6 +1964,9 @@ elation.require([
         if (this.jsobjects[k].hasClass(classname)) {
           objects.push(this.jsobjects[k]);
         }
+        if (this.jsobjects[k].getElementsByClassName) {
+          objects.push(...this.jsobjects[k].getElementsByClassName(classname));
+        }
       }
       return objects;
     }
@@ -2181,6 +2186,10 @@ elation.require([
           getBoundingSphere:     ['function', 'getBoundingSphere'],
           getBoundingBox:        ['function', 'getBoundingBox'],
 
+          getElementsByTagName:  ['function', 'getObjectsByTagName'],
+          getElementsByClassName:['function', 'getObjectsByClassName'],
+          getElementById:        ['function', 'getObjectById'],
+
           registerElement:     ['function', 'registerElement'],
           extendElement:       ['function', 'extendElement'],
           addEventListener:    ['function', 'addEventListenerProxy'],