janusweb 1.5.41 → 1.5.43

package/scripts/janusplayer.js

@@ -3,6 +3,7 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
 
   elation.component.add('engine.things.janusplayer', function() {
     //this.defaultavatar = '<FireBoxRoom>\n  <Assets>\n    <AssetObject id="screen" src="https://web.janusxr.org/media/assets/hoverscreen.obj" mtl="https://web.janusxr.org/media/assets/hoverscreen.mtl" />\n  </Assets>\n  <Room>\n    <Ghost id="januswebuser" col="#ffffff" lighting="true" head_pos="0 1.4 0" body_id="" eye_pos="0 1.6 0" userid_pos="0 0.5 0" cull_face="back" screen_name="screen_Cube.004">\n      <Object id="screen" js_id="head" />\n    </Ghost>\n  </Room>\n</FireBoxRoom>'
+    //this.defaultavatar = '<FireBoxRoom>\n<Assets>\n<AssetObject id="screen" src="https://vesta.janusxr.org/avatars/static/janusweb/janusweb.obj.gz" mtl="https://vesta.janusxr.org/user_avatar/12689/janusweb.mtl" /></Assets>\n<Room>\n<Ghost id="januswebuser" head_id="screen" head_pos="0 1.4 0" body_id="" eye_pos="0 1.6 0" userid_pos="0 0.5 0" cull_face="back" />\n</Room>\n</FireBoxRoom>';
     this.defaultavatar = `
     <FireBoxRoom>
       <assets>
@@ -18,7 +19,11 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
     this.postinit = function() {
       elation.engine.things.janusplayer.extendclass.postinit.call(this);
 
-      this.settings = elation.collection.localindexed({storagekey: 'janusweb.player.settings', index: 'key'});
+      try {
+        this.settings = elation.collection.localindexed({storagekey: 'janusweb.player.settings', index: 'key'});
+      } catch (e) {
+        this.settings = elation.collection.indexed({storagekey: 'janusweb.player.settings', index: 'key'});
+      }
 
       this.defineProperties({
         janus: {type: 'object' },
@@ -31,6 +36,8 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
         party_mode: { type: 'boolean', set: this.updatePartyMode },
         avatarsrc: { type: 'string' },
         cameraview: { type: 'string', default: 'firstperson' },
+        camerazoom: { type: 'float', default: 0 },
+        cameraangle: { type: 'float', default: 0 },
         decouplehead: { type: 'boolean', default: false },
       });
 
@@ -46,9 +53,9 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       elation.events.add(this.engine.client.view.container, 'touchend', elation.bind(this, this.handleTouchEnd));
 
       this.controlstate2 = this.engine.systems.controls.addContext('janusplayer', {
-        'toggle_view': ['keyboard_v,keyboard_shift_v', elation.bind(this, this.toggleCamera)],
-        'zoom_out': ['mouse_wheel_down', ev => this.zoomView(-1)],
-        'zoom_in': ['mouse_wheel_up', ev => this.zoomView(1)],
+        'toggle_view': ['keyboard_nomod_v,keyboard_shift_v', elation.bind(this, this.toggleCamera)],
+        'zoom_out': ['mouse_wheel_down', ev => this.zoomView(-1, ev)],
+        'zoom_in': ['mouse_wheel_up', ev => this.zoomView(1, ev)],
         //'browse_back': ['gamepad_any_button_4', elation.bind(this, this.browseBack)],
         //'browse_forward': ['gamepad_any_button_5', elation.bind(this, this.browseForward)],
       });
@@ -97,6 +104,17 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       this.cursor_style = 'default';
       this.cursor_object = '';
       this.lookat_object = '';
+      window.addEventListener('blur', ev => {
+        if (document.pointerLockElement && document.activeElement instanceof HTMLIFrameElement) {
+          document.pointerLockElement.focus();
+//this.disable();
+      this.engine.systems.controls.deactivateContext('janusplayer');
+      this.engine.systems.controls.activateContext('janusplayer');
+let click = new MouseEvent('click', { });
+document.body.dispatchEvent(click);
+//setTimeout(() => this.enable(), 100);
+        }
+      });
 
       if (this.usevoip) {
         this.voip = new JanusVOIPRecorder({audioScale: 1024});
@@ -127,6 +145,7 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       this.party_mode = this.getSetting('partymode.enabled', false);
       this.currentavatar = '';
       this.getAvatarData().then(d => this.currentavatar = d);
+      this.morphtargetchanges = {};
     }
     this.createChildren = function() {
       elation.engine.things.janusplayer.extendclass.createChildren.call(this);
@@ -395,7 +414,7 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       }
       if (this.controlstate.jump && !this.jumping) {
         let jumptime = 1;
-        if (this.ghost && this.ghost.body.animations && this.ghost.body.animations.jump) {
+        if (this.ghost && this.ghost.body && this.ghost.body.animations && this.ghost.body.animations.jump) {
           let jumpanim = this.ghost.body.animations.jump;
           let jumpclip = jumpanim.getClip();
 
@@ -541,81 +560,83 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
     this.stop = function() {
     }
     this.getProxyObject = function() {
-      var proxy = new elation.proxy(this, {
-        parent:        ['accessor', 'parent.getProxyObject'],
-        room:          ['property', 'room'],
-        pos:           ['property', 'position'],
-        vel:           ['property', 'velocity'],
-        accel:         ['property', 'acceleration'],
-        eye_pos:       ['property', 'vectors.eye_pos'],
-        head_pos:      ['property', 'vectors.head_pos'],
-        cursor_pos:    ['property', 'vectors.cursor_pos'],
-        cursor_xdir:   ['property', 'vectors.cursor_xdir'],
-        cursor_ydir:   ['property', 'vectors.cursor_ydir'],
-        cursor_zdir:   ['property', 'vectors.cursor_zdir'],
-        view_dir:      ['property', 'vectors.view_zdir'],
-        dir:           ['property', 'vectors.zdir'],
-        up_dir:        ['property', 'vectors.ydir'],
-        userid:        ['property', 'janus.userId'],
-        enabled:       ['property', 'enabled'],
-        flying:        ['property', 'flying'],
-        walking:       ['property', 'walking'],
-        running:       ['property', 'running'],
-        //url:           ['property', 'currenturl'],
-        //hmd_enabled:   ['property', 'hmd_enabled'],
-        cursor_active: ['property', 'cursor_active'],
-        cursor_visible: ['property', 'cursor_visible'],
-        cursor_opacity: ['property', 'cursor_opacity'],
-        cursor_style: ['property', 'cursor_style'],
-        cursor_object: ['property', 'cursor_object'],
-        lookat_object: ['property', 'lookat_object'],
-        lookat_pos:    ['property', 'vectors.lookat_pos'],
-        //lookat_xdir:   ['property', 'properties.lookat_xdir'],
-        //lookat_ydir:   ['property', 'properties.lookat_ydir'],
-        //lookat_zdir:   ['property', 'properties.lookat_zdir'],
-        hand0_active:  ['property', 'hands.left.isactive'],
-        hand0_pos:     ['property', 'hands.left.handpos'],
-        hand0_xdir:    ['property', 'hands.left.xdir'],
-        hand0_ydir:    ['property', 'hands.left.ydir'],
-        hand0_zdir:    ['property', 'hands.left.zdir'],
-        hand0_p0:      ['property', 'hands.left.p0'],
-        hand0_p1:      ['property', 'hands.left.p1'],
-        hand0_p2:      ['property', 'hands.left.p2'],
-        hand0_p3:      ['property', 'hands.left.p3'],
-        hand0_p4:      ['property', 'hands.left.p4'],
+      if (!this._proxyobject) {
+        this._proxyobject = new elation.proxy(this, {
+          parent:        ['accessor', 'parent.getProxyObject'],
+          room:          ['property', 'room'],
+          pos:           ['property', 'position'],
+          vel:           ['property', 'velocity'],
+          accel:         ['property', 'acceleration'],
+          eye_pos:       ['property', 'vectors.eye_pos'],
+          head_pos:      ['property', 'vectors.head_pos'],
+          cursor_pos:    ['property', 'vectors.cursor_pos'],
+          cursor_xdir:   ['property', 'vectors.cursor_xdir'],
+          cursor_ydir:   ['property', 'vectors.cursor_ydir'],
+          cursor_zdir:   ['property', 'vectors.cursor_zdir'],
+          view_dir:      ['property', 'vectors.view_zdir'],
+          dir:           ['property', 'vectors.zdir'],
+          up_dir:        ['property', 'vectors.ydir'],
+          userid:        ['property', 'janus.userId'],
+          enabled:       ['property', 'enabled'],
+          flying:        ['property', 'flying'],
+          walking:       ['property', 'walking'],
+          running:       ['property', 'running'],
+          //url:           ['property', 'currenturl'],
+          //hmd_enabled:   ['property', 'hmd_enabled'],
+          cursor_active: ['property', 'cursor_active'],
+          cursor_visible: ['property', 'cursor_visible'],
+          cursor_opacity: ['property', 'cursor_opacity'],
+          cursor_style: ['property', 'cursor_style'],
+          cursor_object: ['property', 'cursor_object'],
+          lookat_object: ['property', 'lookat_object'],
+          lookat_pos:    ['property', 'vectors.lookat_pos'],
+          //lookat_xdir:   ['property', 'properties.lookat_xdir'],
+          //lookat_ydir:   ['property', 'properties.lookat_ydir'],
+          //lookat_zdir:   ['property', 'properties.lookat_zdir'],
+          hand0_active:  ['property', 'hands.left.isactive'],
+          hand0_pos:     ['property', 'hands.left.handpos'],
+          hand0_xdir:    ['property', 'hands.left.xdir'],
+          hand0_ydir:    ['property', 'hands.left.ydir'],
+          hand0_zdir:    ['property', 'hands.left.zdir'],
+          hand0_p0:      ['property', 'hands.left.p0'],
+          hand0_p1:      ['property', 'hands.left.p1'],
+          hand0_p2:      ['property', 'hands.left.p2'],
+          hand0_p3:      ['property', 'hands.left.p3'],
+          hand0_p4:      ['property', 'hands.left.p4'],
 
-        hand1_active:  ['property', 'hands.right.isactive'],
-        hand1_pos:     ['property', 'hands.right.handpos'],
-        hand1_xdir:    ['property', 'hands.right.xdir'],
-        hand1_ydir:    ['property', 'hands.right.ydir'],
-        hand1_zdir:    ['property', 'hands.right.zdir'],
-        hand1_p0:      ['property', 'hands.right.p0'],
-        hand1_p1:      ['property', 'hands.right.p1'],
-        hand1_p2:      ['property', 'hands.right.p2'],
-        hand1_p3:      ['property', 'hands.right.p3'],
-        hand1_p4:      ['property', 'hands.right.p4'],
-        url:           ['property', 'parent.currentroom.url'],
+          hand1_active:  ['property', 'hands.right.isactive'],
+          hand1_pos:     ['property', 'hands.right.handpos'],
+          hand1_xdir:    ['property', 'hands.right.xdir'],
+          hand1_ydir:    ['property', 'hands.right.ydir'],
+          hand1_zdir:    ['property', 'hands.right.zdir'],
+          hand1_p0:      ['property', 'hands.right.p0'],
+          hand1_p1:      ['property', 'hands.right.p1'],
+          hand1_p2:      ['property', 'hands.right.p2'],
+          hand1_p3:      ['property', 'hands.right.p3'],
+          hand1_p4:      ['property', 'hands.right.p4'],
+          url:           ['property', 'parent.currentroom.url'],
 
-        collision_radius: ['property', 'collision_radius'],
+          collision_radius: ['property', 'collision_radius'],
 
-        currentavatar: ['property', 'currentavatar'],
-        defaultanimation: ['property', 'defaultanimation'],
+          currentavatar: ['property', 'currentavatar'],
+          defaultanimation: ['property', 'defaultanimation'],
 
-        localToWorld:  ['function', 'localToWorld'],
-        worldToLocal:  ['function', 'worldToLocal'],
-        appendChild:   ['function', 'appendChild'],
-        removeChild:   ['function', 'removeChild'],
-        addForce:      ['function', 'addForce'],
-        removeForce:   ['function', 'removeForce'],
-        raycast:       ['function', 'raycast'],
-        getViewFrustum:['function', 'getViewFrustum'],
-        getUsername:   ['function', 'getUsername'],
-        setUsername:   ['function', 'setUsername'],
-        getSetting:   ['function', 'getSetting'],
-        setSetting:   ['function', 'setSetting'],
-        setAvatar:    ['function', 'setAvatar'],
-      });
-      return proxy;
+          localToWorld:  ['function', 'localToWorld'],
+          worldToLocal:  ['function', 'worldToLocal'],
+          appendChild:   ['function', 'appendChild'],
+          removeChild:   ['function', 'removeChild'],
+          addForce:      ['function', 'addForce'],
+          removeForce:   ['function', 'removeForce'],
+          raycast:       ['function', 'raycast'],
+          getViewFrustum:['function', 'getViewFrustum'],
+          getUsername:   ['function', 'getUsername'],
+          setUsername:   ['function', 'setUsername'],
+          getSetting:   ['function', 'getSetting'],
+          setSetting:   ['function', 'setSetting'],
+          setAvatar:    ['function', 'setAvatar'],
+        });
+      }
+      return this._proxyobject;
     }
     this.getAvatarData = function() {
       return new Promise((resolve, reject) => {
@@ -725,6 +746,29 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       } 
       return handData;
     }
+    this.hasMorphTargetData = function() {
+      return Object.keys(this.morphtargetchanges).length > 0;
+    }
+    this.setMorphTargetInfluence = function(morphtarget, value) {
+      if (this.ghost && this.ghost.body) {
+        this.ghost.body.setMorphTargetInfluence(morphtarget, value);
+        //if (this.morphtargetchanges.indexOf(morphtarget) == -1) {
+        this.morphtargetchanges[morphtarget] = value;
+        //}
+      }
+    }
+    this.getMorphTargetData = function() {
+      if (this.hasMorphTargetData()) {
+        let data = {};
+        let body = this.ghost.body;
+        for (let morphtarget in this.morphtargetchanges) {
+          data[morphtarget] = this.morphtargetchanges[morphtarget];
+          delete this.morphtargetchanges[morphtarget];
+        }
+        return data;
+      }
+      return false;
+    }
     this.getRandomUsername = function() {
       var adjectives = [
 				"Adorable", "Beautiful", "Clean", "Drab", "Elegant", "Fancy", "Glamorous", "Handsome", "Long", "Magnificent",
@@ -816,11 +860,18 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       if (proxyobj) {
         //var realobj = this.room.getObjectFromProxy(proxyobj);
         if (proxyobj.parent) {
-          proxyobj.parent.removeChild(proxyobj);
+          if (typeof proxyobj.parent.removeChild == 'function') {
+            proxyobj.parent.removeChild(proxyobj);
+          } else if (typeof proxyobj.parent.remove == 'function') {
+            proxyobj.parent.remove(proxyobj._target);
+          }
         }
         var realobj = proxyobj._target;
         if (realobj) {
           this.add(realobj);
+          if (typeof realobj.start == 'function') {
+            realobj.start();
+          }
         }
       }
     }
@@ -833,6 +884,9 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
         //var realobj = this.room.getObjectFromProxy(proxyobj);
         var realobj = proxyobj._target;
         if (realobj) {
+          if (typeof realobj.stop == 'function') {
+            realobj.stop();
+          }
           this.remove(realobj);
         }
       }
@@ -844,8 +898,9 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
           this.setCollider('sphere', {
             radius: this.collision_radius,
           });
-*/
           this.pickable = false;
+          this.collidable = false;
+*/
           this.setCollider('capsule', {
             radius: this.collision_radius,
             length: 1,
@@ -921,6 +976,7 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       }
     }
     this.handleTouchStart = function(ev) {
+      //if (!this.enabled) return;
       let halfscreenwidth = window.innerWidth / 2;
       this.enabled = true;
       for (let i = 0; i < ev.changedTouches.length; i++) {
@@ -999,16 +1055,23 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       return function(newscale, scaletime, scalecurve) {
         if (newscale != this.scale) {
           startscale.copy(this.properties.scale);
-          let start = performance.now();
-          let timer = setInterval(() => {
-            let n = (performance.now() - start) / scaletime;
+          if (scaletime) {
+            let start = performance.now();
+            let timer = setInterval(() => {
+              let n = (performance.now() - start) / scaletime;
 
-            this.scale = tmpvec.set(newscale, newscale, newscale).sub(startscale).multiplyScalar(n).add(startscale);
+              this.scale = tmpvec.set(newscale, newscale, newscale).sub(startscale).multiplyScalar(n).add(startscale);
+              this.camera.scale = camscale.set(1 / this.scale.x, 1 / this.scale.y, 1 / this.scale.z);
+              if (n >= 1) {
+                clearInterval(timer);
+                this.scale.set(newscale, newscale, newscale);
+                this.camera.scale = camscale.set(1 / this.scale.x, 1 / this.scale.y, 1 / this.scale.z);
+              }
+            }, 16);
+          } else {
+            this.scale.set(newscale, newscale, newscale);
             this.camera.scale = camscale.set(1 / this.scale.x, 1 / this.scale.y, 1 / this.scale.z);
-            if (n >= 1) {
-              clearInterval(timer);
-            }
-          }, 16);
+          }
         }
       };
     })();
@@ -1075,8 +1138,10 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
           elapsed = now - this.lookAtLERPstart,
           n = Math.min(1, Math.max(0, elapsed / this.lookAtLERPtime));
 
-      THREE.Quaternion.slerp(this.lookAtLERPq1body, this.lookAtLERPq2body, this.orientation, n);
-      THREE.Quaternion.slerp(this.lookAtLERPq1head, this.lookAtLERPq2head, this.head.orientation, n);
+      //THREE.Quaternion.slerp(this.lookAtLERPq1body, this.lookAtLERPq2body, this.orientation, n);
+      //THREE.Quaternion.slerp(this.lookAtLERPq1head, this.lookAtLERPq2head, this.head.orientation, n);
+      this.orientation.slerpQuaternions(this.lookAtLERPq1body, this.lookAtLERPq2body, n);
+      this.head.orientation.slerpQuaternions(this.lookAtLERPq1head, this.lookAtLERPq2head, n);
       if (n == 1) {
         this.lookAtLERPtime = 0;
       }
@@ -1099,16 +1164,35 @@ elation.require(['engine.things.player', 'janusweb.external.JanusVOIP', 'ui.butt
       if (ev.value == 1) {
         if (this.cameraview == 'firstperson') {
           this.cameraview = 'thirdperson';
-          this.camera.position.z = 2;
+          this.cameraangle = 0;
+          this.camerazoom = 2;
         } else {
           this.cameraview = 'firstperson';
-          this.camera.position.z = 0;
+          this.cameraangle = 0;
+          this.camerazoom = 0;
         }
+        this.updateCamera();
       }
     }
-    this.zoomView = function(amount) {
+    this.zoomView = function(amount, ev) {
       if (this.cameraview == 'thirdperson') {
-        this.camera.position.z -= amount / 10;
+        //this.camera.position.z -= amount / 10;
+        //this.camera.position.z = Math.max(0.001, this.camera.position.z * (amount > 0 ? .95 : 1.05));
+        let state = this.engine.systems.controls.state;
+        if (state.keyboard_alt) {
+          this.cameraangle += amount * Math.PI / 64;
+        } else {
+          this.camerazoom = Math.max(0.001, this.camerazoom * (amount > 0 ? .95 : 1.05));
+        }
+        this.updateCamera();
+      }
+    }
+    this.updateCamera = function() {
+      if (this.camera) {
+        this.camera.fov = this.fov;
+        this.camera.position.z = Math.cos(this.cameraangle) * this.camerazoom;
+        this.camera.position.x = Math.sin(this.cameraangle) * this.camerazoom;
+        this.camera.orientation.setFromEuler(new THREE.Euler(0, this.cameraangle, 0));
       }
     }
     this.setAnimationSequence = function(sequence) {

package/scripts/janusweb.js

@@ -1,6 +1,6 @@
 elation.require([
   'janusweb.config', 'engine.things.generic','janusweb.remoteplayer', 'janusweb.room', 'janusweb.tracking', 'janusweb.multiplayermanager', 'janusweb.external.JanusFireboxParser', 'utils.proxy',
-  'janusweb.elements.raycaster', 'janusweb.elements.teleporter', 'janusweb.elements.linesegments'], function() {
+  'janusweb.elements.raycaster', 'janusweb.elements.teleporter', 'janusweb.elements.linesegments', 'janusweb.elements.outliner'], function() {
 
   elation.requireCSS('janusweb.janusweb');
   elation.component.add('engine.things.janusweb', function() {
@@ -74,7 +74,11 @@ elation.require([
       });
       elation.events.add(window, 'popstate', elation.bind(this, this.handlePopstate));
 
-      this.bookmarks = elation.collection.localindexed({index: 'url', storagekey: 'janusweb.bookmarks'});
+      try {
+        this.bookmarks = elation.collection.localindexed({index: 'url', storagekey: 'janusweb.bookmarks'});
+      } catch (e) {
+        this.bookmarks = elation.collection.indexed({index: 'url', storagekey: 'janusweb.bookmarks'});
+      }
 
       if (this.corsproxy != '') {
         elation.engine.assets.setCORSProxy(this.corsproxy);
@@ -86,7 +90,7 @@ elation.require([
       this.engine.systems.controls.addContext('janus', {
         //'load_url': [ 'keyboard_tab', elation.bind(this, this.showLoadURL) ],
         'toggle_menu': [ 'keyboard_esc', elation.bind(this, this.toggleMenu) ],
-        'room_debug': [ 'keyboard_f6', elation.bind(this, this.showRoomDebug) ],
+        //'room_debug': [ 'keyboard_f6', elation.bind(this, this.showRoomDebug) ],
         'chat': [ 'keyboard_t', elation.bind(this, this.showChat) ],
         'bookmark': [ 'keyboard_ctrl_b', elation.bind(this, this.addBookmark) ],
         'mute': [ 'keyboard_ctrl_m', elation.bind(this, this.mute) ]
@@ -108,7 +112,7 @@ elation.require([
 
       this.assetpack.executeWhenLoaded(() => {
         // TODO - this should be config-driven
-        this.registerAdditionalElements(['raycaster', 'linesegments']);
+        this.registerAdditionalElements(['raycaster', 'linesegments', 'outliner']);
 
         if (this.networking) {
           this.network = elation.janusweb.multiplayermanager({
@@ -620,7 +624,7 @@ elation.require([
     this.registerElement = function(tagname, classobj, extendclass) {
       if (!extendclass || !elation.engine.things[extendclass]) extendclass = 'janusbase';
       tagname = tagname.toLowerCase();
-console.log('Register new SYSTEM tag type:', tagname, classobj, extendclass);
+      //console.log('Register new SYSTEM tag type:', tagname, classobj, extendclass);
       elation.component.add('engine.things.' + tagname, classobj, elation.engine.things[extendclass]);
 /*
       this.typemap[tagname] = tagname;