repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 196a0dd7f91259ce02e24f69b447d262772b073a:
path_to: 
revision_to: 

commit 196a0dd7f91259ce02e24f69b447d262772b073a
Author: James Baicoianu 
Date:   Sat Mar 13 15:35:04 2021 -0800

    Fix per-room teleporter disabling

diff --git a/media/assets/webui/apps/locomotion/teleporter.js b/media/assets/webui/apps/locomotion/teleporter.js

--- a/media/assets/webui/apps/locomotion/teleporter.js
+++ b/media/assets/webui/apps/locomotion/teleporter.js
@@ -198,6 +198,7 @@ janus.registerElement('locomotion_teleporter', {
     room.addEventListener('mouseup', (ev) => this.handleMouseUp(ev));
   },
   handleTeleportChange(ev) {
+    //if (!room.teleport) return;
     if (this.teleportactive) {
       let controls = this.activecontrols;
       let xy = new THREE.Vector2(controls.teleport_x, controls.teleport_y),
@@ -214,6 +215,7 @@ janus.registerElement('locomotion_teleporter', {
     }
   },
   handleTeleportStart(ev) {
+    if (!room.teleport) return;
     if (!this.teleportactive && Math.abs(ev.value) > .8) {
       this.teleportactive = true;
       this.enableCursor();
@@ -229,11 +231,13 @@ janus.registerElement('locomotion_teleporter', {
     }
   },
   handleTeleportTrigger(ev) {
+    if (!room.teleport) return;
     if (this.active) {

     }
   },
   teleport() {
+    //if (!room.teleport) return;
     let pos = player.localToWorld(this.pos.clone());
     player.pos = pos;
     player.vel = V(0,0,.01); // "wake up" physics engine
@@ -292,7 +296,7 @@ janus.registerElement('locomotion_teleporter', {
     }
   },
   handleMouseUp(ev) {
-    if (!room.teleport) return;
+    //if (!room.teleport) return;
     if (this.longpresstimer) {
       clearTimeout(this.longpresstimer);
       this.longpresstimer = false;
@@ -309,6 +313,7 @@ janus.registerElement('locomotion_teleporter', {
     this.disableCursor();
   },
   enableCursor() {
+    if (!room.teleport) return;
     this.visible = true;
     this.particles.visible = true;
     if (this.laser.room !== room) room.appendChild(this.laser);

-----END OF PAGE-----