janusweb 1.5.39 → 1.5.40

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

@@ -42,15 +42,14 @@ elation.elements.define('janus-avatar-picker', class extends elation.elements.ba
     this.defineAttribute('src', { type: 'string' });
     this.defineAttribute('sources', { type: 'object' });
     this.defineAttribute('previewpos', { type: 'vector3', default: V(-2, 0, -3) });
-    this.defineAttribute('hideconfirm', { type: 'boolean', default: false });
-    this.defineAttribute('hidereset', { type: 'boolean', default: false });
+    this.defineAttribute('hideconfirm', { type: 'boolean', default: true });
+    this.defineAttribute('hidereset', { type: 'boolean', default: true });
     this.selected = false;
   }
   create() {
     let tpl = '';
     if (this.sources) {
       let sources = (elation.utils.isString(this.sources) ? JSON.parse(this.sources) : this.sources);
-      console.log('HI YES', sources);
       if (sources.length > 1) {
         tpl += '<ui-tabs>';
         sources.forEach(source => {
@@ -178,9 +177,11 @@ this.appendChild(this.previewwindow);
   handleAvatarSelect(ev) {
     console.log('selected an avatar', ev.data);
     this.selected = ev.data;
-    this.showPreview(ev.data.url);
     if (this.elements.confirm) {
+      this.showPreview(ev.data.url);
       this.elements.confirm.disabled = false;
+    } else {
+      this.handleAvatarConfirm();
     }
     this.dispatchEvent(new CustomEvent("select", { detail: this.selected }));
   }
@@ -229,7 +230,8 @@ this.appendChild(this.previewwindow);
 });
 elation.elements.define('janus-avatar-picker-item', class extends elation.elements.ui.item {
   create() {
-    elation.events.add(this, 'click', (ev) => { console.log('duh', this); this.click(ev) });
+    super.create();
+    //elation.events.add(this, 'click', (ev) => { console.log('duh', this); this.click(ev) });
     let item = this.value;
     let defaulticon = janus.ui.apps.default.apps.avatar.resolveFullURL('./images/default-avatar.jpg');
     this.elements = elation.elements.fromString(`

package/package.json

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

package/scripts/janusghost.js

@@ -238,15 +238,34 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
               //rotation: V(0, 180, 0),
               lighting: this.lighting,
               //cull_face: 'none'
+              opacity: 0.9999,
+              renderorder: this.renderorder || 100,
+              shader_chunk_replace: (this.lighting ? {
+                'color_fragment': 'color_fragment_discard_close',
+              } : {}),
             });
             this.face.start();
           } else {
             this.face = headid;
+            this.face.lighting = this.lighting;
+            this.face.opacity = 0.9999;
+            this.face.renderorder = this.renderorder || 100;
+            this.face.shader_chunk_replace = (this.lighting ? {
+              'color_fragment': 'color_fragment_discard_close',
+            } : {});
             this.head.appendChild(headid);
             this.face.start();
           }
-          this.head.pos = headpos.clone().multiplyScalar(this.scale.y);
+          if (scale) {
+            this.face.scale.fromArray(scale);
+            if (this.label) {
+              this.label.scale.fromArray(scale);
+              this.label.pos.multiply(this.label.scale);
+            }
+          }
+          this.head.pos = headpos.clone().multiply(this.face.scale);
           this.face.applyPosition(headpos.negate());
+
           if (this.remotevideo) {
             this.updateVideoScreen();
             this.face.addEventListener('load', (ev) => {
@@ -256,13 +275,7 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
           }
         }
         //this.head.properties.position.copy(headpos);
-        if (scale) {
-          this.face.scale.fromArray(scale);
-          if (this.label) {
-            this.label.scale.fromArray(scale);
-            this.label.pos.multiply(this.label.scale);
-          }
-        }
+
       }
     }
     this.setBody = function(bodyid, scale, pos) {
@@ -328,7 +341,7 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
             if (this.body.animationmixer) {
               this.cloneAnimations(animasset);
             }
-            this.body.setAnimation('idle');
+            //this.body.setAnimation('idle');
           }
         });
         animasset.load();
@@ -336,7 +349,7 @@ elation.require(['janusweb.janusbase', 'engine.things.leapmotion'], function() {
         if (this.body.animationmixer) {
           this.cloneAnimations(animasset);
         }
-        this.body.setAnimation('idle');
+        //this.body.setAnimation('idle');
       }
     }
     this.cloneAnimations = function(animasset) {

package/scripts/janusplayer.js

@@ -283,10 +283,10 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
           }
         }
         if (this.ghost && !this.decouplehead) {
-          this.ghost.setHeadOrientation(this.head.orientation);
+          this.ghost.setHeadOrientation(this.head.orientation, true);
           if (this.ghost._target.head) {
             //this.ghost._target.face.position.copy(this.head.position);
-            this.ghost.head.orientation.copy(this.head.orientation);
+            this.ghost.head.orientation.copy(this.head.orientation).invert();
           }
         }
       }
@@ -490,7 +490,7 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
               avatar_src: 'data:text/plain,' + encodeURIComponent(avatar),
               showlabel: false,
               //pos: V(0, -this.fatness, 0),
-              //rotation: V(0, 180, 0),
+              rotation: V(0, 180, 0),
               renderorder: 101,
             });
             this.ghost.orientation.set(0,1,0,0);
@@ -654,7 +654,7 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
         avatar_src: 'data:text/plain,' + encodeURIComponent(avatar),
         showlabel: false,
         //pos: V(0, -this.fatness, 0),
-        //rotation: V(0, 180, 0),
+        rotation: V(0, 180, 0),
         renderorder: 101,
       });