janusweb 1.5.54 → 1.5.56

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

@@ -67,7 +67,7 @@ elation.elements.define('janus-avatar-picker', class extends elation.elements.ba
             <ui-list name="avatar" selectable="1" collection="avatarlist" itemcomponent="janus-avatar-picker-item"></ui-list>
           </ui-tab>
           <ui-tab label="Ready Player Me">
-            <iframe data-src="https://demo.readyplayer.me/avatar?frameApi" allow="camera"></iframe>
+            <iframe name="rpmselector" data-src="https://demo.readyplayer.me/avatar?frameApi" allow="camera"></iframe>
           </ui-tab>
         </ui-tabs>
       `;
@@ -94,7 +94,7 @@ elation.elements.define('janus-avatar-picker', class extends elation.elements.ba
     let threshold = [];
     for (let i = 0; i < 100; i += 10) threshold.push(i / 100);
     let observer = new IntersectionObserver(ev => this.handleIntersectionChange(ev), { root: document, rootMargin: '0px', threshold: threshold });
-    observer.observe(this);
+    observer.observe(this.elements.rpmselector);
     document.addEventListener('scroll', ev => this.handleScroll(ev));
     window.addEventListener('message', ev => this.handleWindowMessage(ev));
   }
@@ -264,9 +264,10 @@ this.appendChild(this.previewwindow);
       <assets>
         <assetobject id="body" src="${avatarurl}" />
         <assetobject id="avatar_animations" src="${animurl}" />
+        <assetobject id="avatar_animations_sit" src="https://assets.metacade.com/james/readyplayerme/animation-pack-sit.glb" />
       </assets>
       <room>
-        <ghost body_id="body" bone_head="Head" morphtarget_mouth="mouthOpen" morphtarget_eyes="eyesClosed" />
+        <ghost body_id="body" bone_head="Head" morphtarget_mouth="mouthOpen" morphtarget_eyes="eyesClosed" animation_extras="avatar_animations_sit" />
       </room>
     </FireBoxRoom>
     `;

package/package.json

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

package/scripts/client.js

@@ -71,7 +71,7 @@ elation.require(['elements.elements', 'elements', 'engine.engine', 'engine.asset
       uiconfig: args.uiconfig,
       showchat: elation.utils.any(args.showchat && args.showchat != 'false', true),
       usevoip: elation.utils.any(args.usevoip && args.usevoip != 'false', false),
-      resolution: args.resolution, 
+      resolution: elation.utils.any(args.resolution, ''),
       fullsize: fullsize,
       url: args.url,
       networking: args.networking,

package/scripts/janusplayer.js

@@ -9,9 +9,10 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       <assets>
         <assetobject id="body" src="http://www.baicoianu.com/~bai/janusweb/test/janus-avatar-base.glb" />
         <assetobject id="avatar_animations" src="http://www.baicoianu.com/~bai/janusweb/test/janus-avatar-animations.glb" />
+        <assetobject id="avatar_animations_sit" src="http://www.baicoianu.com/~bai/janusweb/test/janus-avatar-animations-sit.glb" />
       </assets>
       <room>
-        <ghost scale=".01 .01 .01" col="#e0d5a1" body_id="body" bone_head="head" />
+        <ghost scale=".01 .01 .01" col="#e0d5a1" body_id="body" bone_head="head" animation_extras="avatar_animations_sit" />
       </room>
     </FireBoxRoom>
     `;

package/scripts/object.js

@@ -667,9 +667,12 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
             }
           } else {
             shadermaterial.blending = THREE.NormalBlending;
+            shadermaterial.transparent = this.transparent;
           }
           if (this.depth_write !== null) {
             shadermaterial.depthWrite = this.depth_write;
+          } else {
+            shadermaterial.depthWrite = !this.transparent;
           }
           if (this.depth_test !== null) {
             shadermaterial.depthTest = this.depth_test;
@@ -677,7 +680,10 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
           if (this.color_write !== null) {
             shadermaterial.colorWrite = this.color_write;
           }
+          if (texture) shadermaterial.uniforms['iChannel0'].value = texture;
+          if (textureNormal) shadermaterial.uniforms['iChannel1'].value = textureNormal;
           this.traverseObjects((n) => {
+            n.renderOrder = this.renderorder;
             if (n.material) {
               if (Array.isArray(n.material)) {
                 for (let i = 0; i < n.material.length; i++) {

package/scripts/portal.js

@@ -162,7 +162,9 @@ elation.require(['janusweb.janusbase'], function() {
     }
     this.adjustAspectRatio = function(image) {
       let aspect = (image.width / image.height) / (this.size.x / this.size.y);
-      this.mesh.scale.set(aspect, 1, 1);
+      if (this.mesh) {
+        this.mesh.scale.set(aspect, 1, 1);
+      }
     }
     this.updateMaterial = function() {
       if (this.objects['3d'] && this.material) {

package/scripts/room.js

@@ -304,7 +304,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.lookAt(spawnpoint.position, obj.localToWorld(V(0,0,1)), obj.localToWorld(V(0,1,0).sub(spawnpoint.position))));
+          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;
@@ -1605,15 +1605,15 @@ elation.require([
         let object = args.object;
         if (args.mesh_verts) {
           let geo = new THREE.BufferGeometry();
-          geo.addAttribute( 'position', new THREE.Float32BufferAttribute( args.mesh_verts, 3 ) );
+          geo.setAttribute( 'position', new THREE.Float32BufferAttribute( args.mesh_verts, 3 ) );
           if (args.mesh_faces) {
             geo.setIndex(args.mesh_faces);
           }
           if (args.mesh_normals) {
-            geo.addAttribute( 'normal', new THREE.Float32BufferAttribute( args.mesh_normals, 3 ) );
+            geo.setAttribute( 'normal', new THREE.Float32BufferAttribute( args.mesh_normals, 3 ) );
           }
           if (args.mesh_uvs) {
-            geo.addAttribute( 'uv', new THREE.Float32BufferAttribute( args.mesh_uvs, 2 ) );
+            geo.setAttribute( 'uv', new THREE.Float32BufferAttribute( args.mesh_uvs, 2 ) );
           }
           object = new THREE.Mesh(geo, new THREE.MeshPhongMaterial());
         }