janusweb 1.5.41 → 1.5.42

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

@@ -243,46 +243,6 @@ elation.elements.define('janus-button-audio', class extends elation.elements.ui.
     this.muted = muted;
   }
 });
-elation.elements.define('janus-button-voip', class extends elation.elements.ui.popupbutton {
-  init() {
-    super.init();
-    this.defineAttribute('active', { type: 'boolean' });
-    this.defineAttribute('muted', { type: 'boolean' });
-  }
-  create() {
-    this.popupcontent = `<janus-voip-picker name="voipsettings"></janus-voip-picker>`;
-    super.create();
-    this.createPopup();
-    this.hidePopup();
-    elation.events.add(this.popup.content.elements['picker'], 'voip-picker-select', (ev) => this.hidePopup());
-    this.updateMuteState();
-//setInterval(() => this.updateMuteState(), 1000);
-  }
-  updateMuteState() {
-    //let muted = !(soundsystem.canPlaySound && soundsystem.enabled);
-    let voipclient = this.voipclient;
-    if (!this.voipclient) {
-      voipclient = document.querySelector('janus-voip-client');
-      this.voipclient = voipclient;
-      if (this.voipclient) {
-        elation.events.add(this.voipclient, 'init', ev => this.updateMuteState());
-      }
-    }
-    let muted = true;
-    if (voipclient) {
-      if (voipclient.localuser && !this.registeredEvents) {
-        elation.events.add(voipclient.localuser, 'mute', () => this.updateMuteState());
-        elation.events.add(voipclient.localuser, 'unmute', () => this.updateMuteState());
-        elation.events.add(voipclient.localuser, 'update', ev => this.updateMuteState());
-        this.registeredEvents = true;
-      }
-      if (voipclient.localuser && voipclient.localuser.stream && !voipclient.localuser.muted) {
-        muted = false;
-      }
-    }
-    if (this.muted != muted) this.muted = muted;
-  }
-});
 elation.elements.define('janus-button-share', class extends elation.elements.ui.button {
   init() {
     super.init();

package/media/assets/webui/apps/comms/chat.html

@@ -1,5 +1,6 @@
 <details name="toggle" open aria-live="polite" role="log">
   <summary>Text Chat <ui-notificationbutton name="unread" count="0"></ui-notificationbutton></summary>
+  <janus-voip-client-callbutton></janus-voip-client-callbutton>
   <collection-indexed id="chatmessages" index="timestamp"></collection-indexed>
   <ui-list name="chatlist" collection="chatmessages" itemtemplate="janus.comms.chat_message" scrollable="1"></ui-list>
   <ui-input name="chatinput" placeholder="Press T for text chat"></ui-input>

package/media/assets/webui/apps/comms/chat_message.html

@@ -1 +1 @@
-<span class="message {type}"><span class="userid">{userId}</span> {message}</span>
+<span class="message {type}"><span class="userid">{userId}</span> {?raw}{message|s}{:else}{message}{/raw}</span>

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

@@ -222,6 +222,7 @@ if (!this.elements.chatmessages) return;
       type: 'join',
       userId: data.id,
       message: 'has joined ' + (data.room.title || data.room.url),
+      raw: false,
     });
     this.scrollToBottom();
   }
@@ -232,7 +233,8 @@ if (!this.elements.chatmessages) return;
       timestamp: new Date().getTime(),
       type: 'part',
       userId: data.id,
-      message: 'has left the room'
+      message: 'has left the room',
+      raw: false,
     });
     this.scrollToBottom();
   }
@@ -243,7 +245,8 @@ if (!this.elements.chatmessages) return;
       timestamp: new Date().getTime(),
       type: 'disconnect',
       userId: data.id,
-      message: 'has disconnected'
+      message: 'has disconnected',
+      raw: false,
     });
     this.scrollToBottom();
   }
@@ -254,8 +257,10 @@ if (!this.elements.chatmessages) return;
       timestamp: new Date().getTime(),
       type: 'chat',
       userId: data.userId,
-      message: data.message.data || data.message.message
+      message: data.message.data || data.message.message,
+      raw: false,
     });
+
     this.scrollToBottom();
     this.updateUnread(1);
   }
@@ -263,11 +268,12 @@ if (!this.elements.chatmessages) return;
     if (msg && msg.length > 0) {
       janus.network.send({'method': 'chat', data: msg});
 if (!this.elements.chatmessages) return;
-      this.elements.chatmessages.add({
+      let newmsg = this.elements.chatmessages.add({
         timestamp: new Date().getTime(),
         type: 'selfchat',
         userId: player.userid,
-        message: msg
+        message: msg,
+        raw: false,
       });
       this.elements.chatinput.value = '';
       this.scrollToBottom();
@@ -279,7 +285,8 @@ if (!this.elements.chatmessages) return;
       timestamp: new Date().getTime(),
       type: 'print',
       userId: 'room',
-      message: msg[0]
+      message: msg[0],
+      raw: false,
     });
     this.scrollToBottom();
   }

package/media/assets/webui/apps/comms/external/naf-shim.js

@@ -150,7 +150,7 @@ console.log('occupants received', Object.keys(occupantList), Object.keys(this.co
           'credential': 'turn',
           'realm': 'turn',
           'urls': [
-            'turns:voip.janusxr.org:3478',
+            'turns:stream.janusxr.org:3478',
           ]
         },
       ]

package/media/assets/webui/apps/comms/voip.css

@@ -171,3 +171,23 @@ janus-voip-picker .micselect {
 janus-voip-picker-mictest {
   margin-left: 5px;
 }
+janus-voip-client-incomingcall ui-flexpanel {
+  height: auto;
+}
+janus-voip-client-incomingcall janus-button-voip[action="accept"] {
+  background: #0a0;
+  border: 1px solid black;
+}
+janus-voip-client-incomingcall janus-button-voip[action="accept"]:hover {
+  background: #0d0;
+}
+janus-voip-client-incomingcall janus-button-voip[action="accept"][disabled] {
+  opacity: .3;
+}
+janus-voip-client-incomingcall ui-button[action="reject"] {
+  background: #800;
+  border: 1px solid black;
+}
+janus-voip-client-incomingcall ui-button[action="reject"]:hover {
+  background: #a00;
+}

package/media/assets/webui/apps/comms/voip.js

@@ -38,6 +38,7 @@ elation.elements.define('janus-voip-client', class extends elation.elements.base
       this.inputstream = localStream;
     });
 
+    elation.events.add(janus.network, 'janusweb_user_chat', (ev) => this.handleUserChat(ev));
   }
   setRoom(newroom) {
     let roomid = newroom.voipid || newroom.id;
@@ -76,6 +77,28 @@ elation.elements.define('janus-voip-client', class extends elation.elements.base
     }
     this.currentroom = this.rooms[roomid];
   }
+  disconnect() {
+    if (this.currentroom) {
+      this.currentroom.disconnect();
+      this.currentroom = null;
+    }
+    this.localuser.setData(null);
+  }
+  handleUserChat(ev) {
+    console.log('got a chat', ev.data);
+    let msg = ev.data.message;
+    let m = msg.data.match(/📞 (.*$)/);
+    if (m) {
+      let chatmessages = document.querySelector('janus-comms-chat').elements.chatmessages,
+          chatlist = document.querySelector('janus-comms-chat').elements.chatlist;
+      if (chatmessages) {
+        let item = chatmessages.items[chatmessages.items.length - 1];
+        item.raw = true;
+        item.message = '<janus-voip-client-incomingcall>' + msg.data + '</janus-voip-client-incomingcall>';
+        chatlist.refresh();
+      }
+    }
+  }
 });
 elation.elements.define('janus-voip-client-janus', class extends elation.elements.base {
   create() {
@@ -125,6 +148,9 @@ elation.elements.define('janus-voip-client-janus', class extends elation.element
       sfu.adapter.setLocalMediaStream(localStream);
       sfu.dispatchEvent(new CustomEvent('voip-media-change', {detail: { stream: localStream }}));
     });
+    if (this.inputstream) {
+      sfu.adapter.setLocalMediaStream(this.inputstream);
+    }
 /*
     elation.events.add(janus._target, 'room_change', (ev) => {
       if (!sfu || !sfu.adapter) return;
@@ -192,7 +218,12 @@ console.log('leave room and remove all occupants', this.room);
     this.sfu.setClientId(ev.data);
   }
   setInputStream(stream) {
-    this.sfu.adapter.setLocalMediaStream(stream);
+    if (this.sfu) {
+      this.inputstream = stream;
+      this.sfu.adapter.setLocalMediaStream(stream);
+    } else {
+      this.connect();
+    }
   }
 });
 elation.elements.define('janus-voip-client-hifi', class extends elation.elements.base {
@@ -390,6 +421,10 @@ elation.elements.define('janus-voip-localuser', class extends elation.elements.b
     if (!data) {
       this.stream = false;
       elation.events.fire({type: 'update', element: this});
+      if (this.updateVolumeInterval) {
+        clearInterval(this.updateVolumeInterval);
+        this.updateVolumeInterval = false;
+      }
       return;
     }
 
@@ -410,7 +445,7 @@ elation.elements.define('janus-voip-localuser', class extends elation.elements.b
       video.srcObject = data;
       this.appendChild(video);
       video.muted = true;
-      video.play().then(() => console.log('playing', video));
+      video.play().then(() => console.log('playing', video)).catch(e => console.log('Failed to start video', e, video));
       this.video = video;
     }
 
@@ -883,6 +918,10 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
 
           this.webcamDisabledElement = elation.elements.create('option', {innerHTML: 'Disabled', value: 'none', append: cameras.select});
         }
+        let vidtrack = false;
+        if (this.stream) {
+          vidtrack = this.stream.getVideoTracks()[0]
+        }
         devices.forEach(d => {
           if (d.kind == 'audioinput') {
             elation.elements.create('option', {innerHTML: d.label, value: d.deviceId, append: inputs.select});
@@ -890,7 +929,11 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
             if (d.deviceId == '') {
               hasWebcamPermission = false;
             } else {
-              elation.elements.create('option', {innerHTML: d.label, value: d.deviceId, append: cameras.select});
+              let option = elation.elements.create('option', {innerHTML: d.label, value: d.deviceId, append: cameras.select});
+              if (vidtrack && d.label == vidtrack.label) {
+                option.selected = true;
+                cameras.select.value = option.value;
+              }
             }
           } else if (outputs && d.kind == 'audiooutput') {
             elation.elements.create('option', {innerHTML: d.label, value: d.deviceId, append: outputs.select});
@@ -900,9 +943,6 @@ elation.elements.define('janus-voip-picker-audio', class extends elation.element
           if (hasWebcamPermission && this.elements.videoDevice.hidden ) {
             this.elements.webcamEnabled.hide();
             this.elements.videoDevice.show();
-            let option = this.elements.videoDevice.select.childNodes[0];
-            option.selected = true;
-            this.elements.videoDevice.select.value = option.value;
           } else {
             console.log('NO WEBCAM PERMISSION');
             this.elements.webcamEnabled.show();
@@ -1121,6 +1161,7 @@ elation.elements.define('janus-voip-picker-mictest', class extends elation.eleme
         bufferLength = dataArray.length,
         analyser = this.analyser;;
 
+    if (!this.offsetParent) return;
     analyser.getByteFrequencyData(this.dataArray);
 
     ctx.fillStyle = "#000";
@@ -1175,3 +1216,131 @@ elation.elements.define('janus-voip-picker-videotest', class extends elation.ele
     }
   }
 });
+elation.elements.define('janus-button-voip', class extends elation.elements.ui.popupbutton {
+  init() {
+    super.init();
+    this.defineAttribute('active', { type: 'boolean' });
+    this.defineAttribute('muted', { type: 'boolean' });
+  }
+  create() {
+    this.popupcontent = `<janus-voip-picker name="voipsettings"></janus-voip-picker>`;
+    super.create();
+    //this.createPopup();
+    this.hidePopup();
+    this.updateMuteState();
+//setInterval(() => this.updateMuteState(), 1000);
+  }
+  updateMuteState() {
+    //let muted = !(soundsystem.canPlaySound && soundsystem.enabled);
+    let voipclient = this.voipclient;
+    if (!this.voipclient) {
+      voipclient = document.querySelector('janus-voip-client');
+      this.voipclient = voipclient;
+      if (this.voipclient) {
+        elation.events.add(this.voipclient, 'init', ev => this.updateMuteState());
+      }
+    }
+    let muted = true;
+    if (voipclient) {
+      if (voipclient.localuser && !this.registeredEvents) {
+        elation.events.add(voipclient.localuser, 'mute', () => this.updateMuteState());
+        elation.events.add(voipclient.localuser, 'unmute', () => this.updateMuteState());
+        elation.events.add(voipclient.localuser, 'update', ev => this.updateMuteState());
+        this.registeredEvents = true;
+      }
+      if (voipclient.localuser && voipclient.localuser.stream && !voipclient.localuser.muted) {
+        muted = false;
+      }
+    }
+    if (this.muted != muted) this.muted = muted;
+  }
+  createPopup() {
+    super.createPopup();
+    setTimeout(() => {
+      //elation.events.add(this.popup.content.querySelector('janus-voip-picker'), 'voip-picker-select', (ev) => this.hidePopup());
+      document.addEventListener('voip-picker-select', (ev) => { this.hidePopup(); });
+    }, 100);
+  }
+});
+elation.elements.define('janus-voip-client-callbutton', class extends elation.elements.janus.button.voip {
+  create() {
+    this.detached = true;
+    this.button = elation.elements.create('ui-button', {
+      append: this,
+      label: '📞',
+    });
+    this.button.addEventListener('click', ev => this.handleClick(ev));
+super.create();
+  }
+  isVoipActive(client) {
+    if (!client) client = document.querySelector('janus-voip-client');
+    return (client && client.localuser && client.localuser.stream);
+  }
+  handleClick(ev) {
+    if (!this.isVoipActive()) {
+      this.showPopup();
+    } else {
+/*
+      if (this.popup.parentNode === this) {
+        if (!elation.utils.isin(this.popup, ev.target)) {
+          this.hidePopup();
+        }
+      } else {
+        this.showPopup();
+      }
+*/
+    }
+    let chat = document.querySelector('janus-comms-chat');
+    chat.sendMessage('📞 ring ring');
+    if (!this.isVoipActive()) {
+    }
+  }
+});
+elation.elements.define('janus-voip-client-incomingcall', class extends elation.elements.base {
+  create() {
+    this.actions = elation.elements.create('ui-flexpanel', { append: this });
+    let active = this.isVoipActive();
+    this.acceptbutton = elation.elements.create('janus-button-voip', {
+      label: (active ? 'Call in Progress' : 'Accept'),
+      action: 'accept',
+      detached: true,
+      disabled: active,
+      append: this.actions
+    });
+    this.rejectbutton = elation.elements.create('ui-button', {
+      label: (active ? 'Hang Up' : 'Decline'),
+      action: 'reject',
+      append: this.actions
+    });
+
+    this.acceptbutton.addEventListener('click', ev => this.handleAccept(ev));
+    this.rejectbutton.addEventListener('click', ev => this.handleReject(ev));
+  }
+  isVoipActive(client) {
+    if (!client) client = document.querySelector('janus-voip-client');
+    return (client && client.localuser && client.localuser.stream);
+  }
+  handleAccept(ev) {
+    this.acceptbutton.disabled = true;
+    this.acceptbutton.label = 'Call in Progress';
+    this.rejectbutton.disabled = false;
+    this.rejectbutton.label = 'Hang Up';
+  }
+  handleReject(ev) {
+    let chat = document.querySelector('janus-comms-chat');
+    this.removeChild(this.actions);
+    //this.removeChild(this.rejectbutton);
+
+    let client = document.querySelector('janus-voip-client');
+    if (this.isVoipActive(client)) {
+      chat.sendMessage('👋 hanging up');
+      client.disconnect();
+      this.acceptbutton.disabled = false;
+      this.acceptbutton.label = 'Reconnect';
+      this.rejectbutton.label = 'Decline';
+      this.rejectbutton.disabled = true;
+    } else {
+      chat.sendMessage('❌ request declined');
+    }
+  }
+});

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

@@ -115,7 +115,8 @@ elation.elements.define('janus.ui.editor.panel', class extends elation.elements.
       'manipulate_out':   [ 'keyboard_e',  (ev) => this.editObjectManipulateOut(ev) ],
     });
     janus.engine.systems.controls.addContext('roomedit_paste', {
-      'paste':     [ 'keyboard_ctrl_v', (ev) => { if (ev.value == 1) this.editObjectPaste(ev); } ],
+      'add':     [ 'keyboard_ctrl_a', (ev) => { if (ev.value == 1) this.showCreateDialog(ev); } ],
+      'paste':     [ 'keyboard_ctrl_v', (ev) => { if (ev.value == 1) this.editObjectPaste(ev);} ],
     });
     janus.engine.systems.controls.activateContext('roomedit_paste');
 
@@ -134,6 +135,7 @@ elation.elements.define('janus.ui.editor.panel', class extends elation.elements.
     room.addEventListener('wheel', (ev) => this.editObjectMousewheel(ev));
     window.addEventListener('keydown', (ev) => this.editObjectKeydown(ev));
     window.addEventListener('keyup', (ev) => this.editObjectKeyup(ev));
+
   }
   initRoomEvents(room) {
     if (!this.initialized.has(room)) {
@@ -149,6 +151,33 @@ elation.elements.define('janus.ui.editor.panel', class extends elation.elements.
       room.addEventListener('thing_remove', (ev) => this.handleThingRemove(ev));
       this.initialized.add(room);
     }
+
+    if (!this.outliner_selected) {
+      this.outliner_selected = room.createObject('outliner', {
+        col: 'lime',
+        opacity: .4,
+        outline: 3,
+      });
+      this.outliner_hover = room.createObject('outliner', {
+        col: 'gray',
+        opacity: .4,
+        outline: 1,
+      });
+setTimeout(() => {
+      this.outliner_selected.col = 'lime';
+      this.outliner_hover.col = 'gray';
+}, 0);
+      this.outliner_hover.update = function() {
+        let rc = player.raycast();
+        if (rc.length > 0 && rc[0].object !== room) {
+          this.select(rc[0].object);
+        } else {
+          this.deselect();
+        }
+      }
+    } else if (this.outliner_selected.room !== room) {
+      room.appendChild(this.outliner_selected);
+    }
   }
 
   getManipulator() {
@@ -329,6 +358,7 @@ console.log('set translation snap', ev.data, ev);
     return locked;
   }
   editObject(object, isnew) {
+    if (this.roomedit.object) this.editObjectStop()
     this.roomedit.object = object;
     this.roomedit.parentObject = null;
     this.roomedit.objectBoundingBox = false;
@@ -346,11 +376,13 @@ console.log('set translation snap', ev.data, ev);
     object.addEventListener('load', (ev) => {
       this.roomedit.objectBoundingBox = object.getBoundingBox(true);
       this.editObjectUpdate();
-      this.editObjectShowWireframe();
+      //this.editObjectShowWireframe();
+      this.editObjectShowOutline();
       console.log('update bbox', this.roomedit.objectBoundingBox);
     });
 
-    object.pickable = false;
+    //object.pickable = false;
+    //console.log('set object unpickable', object);
 
     room.addEventListener('mousemove', (ev) => this.editObjectMousemove(ev));
     elation.events.add(this, 'mousedown', this.editObjectClick);
@@ -374,7 +406,8 @@ console.log('set translation snap', ev.data, ev);
     // activate context
     janus.engine.systems.controls.activateContext('roomedit', this);
 
-    this.editObjectShowWireframe();
+    //this.editObjectShowWireframe();
+    this.editObjectShowOutline();
     this.editObjectShowInfo(object);
     let manipulator = this.getManipulator();
     manipulator.attach(object.objects['3d']);
@@ -393,6 +426,18 @@ console.log('set translation snap', ev.data, ev);
     inventorypanel.refresh();
   }
 
+  editObjectShowOutline() {
+    if (this.roomedit.object === room) {
+      this.outliner_selected.deselect();
+    } else {
+      this.outliner_selected.select(this.roomedit.object);
+    }
+  }
+  editObjectRemoveOutline() {
+    if (this.outliner_selected) {
+      this.outliner_selected.deselect();
+    }
+  }
   editObjectShowWireframe() {
     if (this.roomedit.wireframe) {
       this.editObjectRemoveWireframe();
@@ -518,7 +563,7 @@ console.log('set translation snap', ev.data, ev);
           // restore collider
           this.roomedit.object.collision_id = this.roomedit.collision_id;
           this.roomedit.collision_id = false;
-        } else {
+        } else if (false) {
           this.roomedit.object.collision_id = 'cube';
           this.roomedit.object.collision_trigger = true;
           this.roomedit.object.collision_scale = this.roomedit.objectBoundingBox.max.clone().sub(this.roomedit.objectBoundingBox.min);
@@ -534,11 +579,13 @@ console.log('set translation snap', ev.data, ev);
         this.roomedit.object.dispatchEvent({type: 'edit', bubbles: true});
       }
     }
-    this.roomedit.object.pickable = true;
+    //this.roomedit.object.pickable = true;
+    this.roomedit.object.sync = true;
     this.roomedit.object = false;
     this.roomedit.raycast = false;
     this.roomedit.parentObject = null;
-    this.editObjectRemoveWireframe();
+    //this.editObjectRemoveWireframe();
+    this.editObjectRemoveOutline();
     this.editObjectRemoveParentWireframe();
     let manipulator = this.getManipulator();
     manipulator.detach();
@@ -573,7 +620,22 @@ console.log('set translation snap', ev.data, ev);
     if (this.roomedit.object) {
       var obj = this.roomedit.object;
       if (this.roomedit.moving && this.roomedit.raycast && ev.element.getProxyObject() !== obj) {
-        this.roomedit.objectPosition = ev.data.point;
+        let raycast = player.raycast(V(0, 0, -1));
+        if (raycast) {
+          let hit;
+          for (let i = 0; i < raycast.length; i++) {
+            if (raycast[i].object !== obj) {
+              hit = raycast[i];
+              break;
+            }
+          }
+    
+          if (hit) {
+            this.roomedit.objectPosition = hit.point;
+          }
+        } else {
+          this.roomedit.objectPosition = ev.data.point;
+        }
         let manipulator = this.getManipulator();
         manipulator.enabled = false;
         this.editObjectUpdate();
@@ -1042,6 +1104,7 @@ console.log('change color', obj.col, vec);
     if (obj) {
       this.roomedit.pastebuffer = obj;
 
+/*
       let data = new DataTransfer();
       data.items.add('text/plain', 'blublub');
       //data.items.add('x-janus/x-' + obj.tag, 'cool huh');
@@ -1050,6 +1113,7 @@ console.log('change color', obj.col, vec);
       }, (e) => {
         console.log('FAILED!', e);
       });
+*/
     }
   }
   editObjectCut(ev) {
@@ -1159,6 +1223,9 @@ console.log('[editor] scene added a thing', ev);
               let parts = newobjargs[j].split('=');
               objargs[parts[0]] = decodeURIComponent(parts[1]);
             }
+            if (objargs.id) {
+              objargs.collision_id = objargs.id;
+            }
             newobject = room.createObject(objtype, objargs);
             objects.push(newobject);
             if (objects[0]) {
@@ -1361,6 +1428,9 @@ console.log('pastey!', ev.clipboardData.items[0], ev);
     this.loadObjectFromURIList(url);
     ev.preventDefault();
   }
+  showCreateDialog(ev) {
+    console.log('create thing?');
+  }
 });
 
 elation.elements.define('janus.ui.editor.objectinfo', class extends elation.elements.base {

package/media/assets/webui/apps/inventory/inventory.css

@@ -54,8 +54,9 @@ ui-grid.models>* a {
   display: flex;
   align-items: center;
   justify-content: center;
-  text-align: Center;
+  text-align: center;
   text-decoration: none;
+  color: white;
 }
 ui-grid.models>* p {
   display: none;

package/media/assets/webui/apps/locomotion/teleporter.js

@@ -113,11 +113,18 @@ janus.registerElement('locomotion_teleporter', {
         onchange: ev => this.handleTeleportChange(ev),
         onactivate: ev => this.handleTeleportTurn(ev),
       },
-      'teleport_y': {
+      'teleport_y_right': {
         defaultbindings: 'gamepad_any_axis_1,gamepad_any_axis_3',
-        onchange: ev => this.handleTeleportChange(ev),
-        onactivate: ev => this.handleTeleportStart(ev),
+        onchange: ev => this.handleTeleportChange(ev, 'right'),
+        onactivate: ev => this.handleTeleportStart(ev, 'right'),
+      },
+/*
+      'teleport_y_left': {
+        defaultbindings: 'gamepad_6_axis_1,gamepad_6_axis_3',
+        onchange: ev => this.handleTeleportChange(ev, 'left'),
+        onactivate: ev => this.handleTeleportStart(ev, 'left'),
       },
+*/
       'teleport_trigger': {
         defaultbindings: 'gamepad_any_button_0',
         onactivate: ev => this.handleTeleportTrigger(ev),
@@ -147,6 +154,7 @@ janus.registerElement('locomotion_teleporter', {
       } else {
         startpoint = player.head.localToWorld(V(0,0,0));
         v0 = player.head.localToWorld(V(0,0,-speed)).sub(startpoint);
+        return; // Head-locked teleporter is awkward, do we really still support this?
       }
       let i = 0,
           p0 = startpoint.clone(),
@@ -210,7 +218,7 @@ janus.registerElement('locomotion_teleporter', {
     //if (!room.teleport) return;
     if (this.teleportactive) {
       let controls = this.activecontrols;
-      let xy = new THREE.Vector2(controls.teleport_x, controls.teleport_y),
+      let xy = new THREE.Vector2(controls.teleport_x, controls['teleport_y_' + this.teleporthand]),
           len = xy.length();
 
       if (len > .8) {
@@ -228,7 +236,7 @@ janus.registerElement('locomotion_teleporter', {
     if (!room.teleport) return;
     if (!this.teleportactive && Math.abs(ev.value) > .8) {
       this.teleportactive = true;
-      this.teleporthand = 'right';
+      this.teleporthand = hand || 'right';
       this.enableCursor();
       this.updateTeleportAngle();
     }
@@ -260,15 +268,17 @@ janus.registerElement('locomotion_teleporter', {
   },
   updateTeleportAngle() {
     let controls = this.activecontrols;
-    let controllerangle = Math.atan2(controls.teleport_x, controls.teleport_y);
+    let controllerangle = Math.atan2(controls.teleport_x, controls['teleport_y_' + this.teleporthand]);
     let playerangle = Math.atan2(this.pos.x, this.pos.z);
     this.teleportangle = (controllerangle + playerangle) + Math.PI;
   },
   handleMouseDown(ev) {
     if (!room.teleport) return;
     if (ev.button == 0 && (player.enabled || janus.hmd)) {
-      this.longpresstimer = setTimeout(() => { console.log('timer fired'); this.enableCursor(); }, this.longpresstime);
-      this.mousediff = [0,0];
+      if (!this.longpresstimer) {
+        //this.longpresstimer = setTimeout(() => { console.log('timer fired'); this.enableCursor(); }, this.longpresstime);
+        this.mousediff = [0,0];
+      }
       //this.active = true;
     }
   },