repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 8120cabcd48137623af1b9d60e8af91c83acb20e:
path_to: 
revision_to: 

commit 8120cabcd48137623af1b9d60e8af91c83acb20e
Author: James Baicoianu 
Date:   Fri Jun 26 09:22:38 2020 -0700

    Improved teleporter with snap turning

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
@@ -2,12 +2,28 @@ janus.registerElement('locomotion_teleporter', {
   active: false,
   longpresstime: 350,
   deadzone: 5,
+  xrplayer: null,

   create() {
     this.marker = this.createObject('Object', {
+    });
+    this.ring = this.marker.createObject('object', {
+      id: 'pipe',
+      col: V(0,0,155),
+      emissive: V(0,0,155),
+      scale: V(.5,.01,.5)
+    });
+    this.cylinder = this.marker.createObject('object', {
       id: 'cylinder',
-      col: V(0,0,155,.5),
-      scale: V(.5,1.6,.5)
+      col: V(0,0,155,.2),
+      scale: V(.5,1.5,.5)
+    });
+    this.pointer = this.marker.createObject('Object', {
+      id: 'pyramid',
+      col: 'red',
+      rotation: V(90,0,0),
+      scale: V(.1,.5,.0125),
+      pos: V(0,.01,0)
     });
     this.light = this.createObject('Light', {
       col: '#009',
@@ -36,10 +52,93 @@ janus.registerElement('locomotion_teleporter', {
     this.particles.particle_vel = V(-.4, 0, -.4); // FIXME - particle velocity isn't being set on spawn
     this.sound = room.createObject('Sound', { id: 'teleport2' }, this);

-    this.setRoom(this.room);
+    //this.setRoom(this.room);
     this.disableCursor();
     window.addEventListener('mousemove', this.handleMouseMove);
     window.addEventListener('touchmove', this.handleTouchMove, true);
+
+    this.activecontrols = this.addControlContext('teleporter', {
+      'teleport_x': {
+        defaultbindings: 'gamepad_any_axis_0,gamepad_any_axis_2',
+        onchange: ev => this.handleTeleportChange(ev),
+        onactivate: ev => this.handleTeleportTurn(ev),
+      },
+      'teleport_y': {
+        defaultbindings: 'gamepad_any_axis_1,gamepad_any_axis_3',
+        onchange: ev => this.handleTeleportChange(ev),
+        onactivate: ev => this.handleTeleportStart(ev),
+      },
+      'teleport_trigger': {
+        defaultbindings: 'gamepad_any_button_0',
+        onactivate: ev => this.handleTeleportTrigger(ev),
+      },
+    });
+    this.activateControlContext('teleporter');
+  },
+  update() {
+    if (this.active) {
+      //this.orientation.copy(player.orientation);
+      let controls = this.activecontrols;
+      let angle = Math.atan2(controls.teleport_x, controls.teleport_y);
+      this.pointer.rotation = V(90, 0, -angle * 180 / Math.PI);
+//console.log('bleh', angle, this.pointer.rotation);
+      let hand = this.xrplayer.trackedobjects.hand_right; // FIXME - figure out hand based on which controller is triggering the teleporter
+      let hits = hand.raycast(V(0,0,-1));
+      if (hits.length > 0) {
+        let hit = hits[0];
+        if (hit.distance < 200) {
+          this.pos = player.worldToLocal(hits[0].point);
+        }
+      }
+    }
+  },
+  castTeleportRay() {
+    
+  },
+  handleTeleportChange(ev) {
+    let controls = this.activecontrols;
+    let xy = new THREE.Vector2(controls.teleport_x, controls.teleport_y),
+        len = xy.length();
+
+/*
+    if (len > .9 && !this.teleportactive) {
+      this.teleportactive = true;
+      console.log('it worked', xy);
+      this.pos = player.localToWorld(V(0,0,-2));
+      this.enableCursor();
+    } else if (len < .01 && this.teleportactive) {
+      this.teleportactive = false;
+      console.log('ok stop', xy);
+      this.disableCursor();
+    }
+*/
+    if (len < .01 && this.teleportactive) {
+      this.teleportactive = false;
+      this.disableCursor();
+    }
+  },
+  handleTeleportStart(ev) {
+    if (!this.teleportactive && ev.value < 0) {
+      this.teleportactive = true;
+      this.enableCursor();
+    }
+  },
+  handleTeleportTurn(ev) {
+    if (!this.teleportactive) {
+      let turn = new THREE.Quaternion();
+      turn.setFromEuler(new THREE.Euler(0, Math.PI / 4 * (ev.value > 0 ? -1 : 1), 0));
+      player.orientation.multiply(turn);
+    }
+  },
+  handleTeleportTrigger(ev) {
+    console.log('triggered', ev);
+    if (this.active) {
+      let pos = player.localToWorld(this.pos.clone());
+      player.pos = pos;
+      let controls = this.activecontrols;
+      let angle = Math.atan2(controls.teleport_x, controls.teleport_y);
+      this.xrplayer.orientation._target.setFromEuler(new THREE.Euler(0, Math.PI + angle, 0)); // FIXME - should do a proper coordinate space transform here rather than hardcoding 180 degrees
+    }
   },
   setRoom(room) {
     if (!room.addEventListener) room = room.getProxyObject();
@@ -102,7 +201,7 @@ janus.registerElement('locomotion_teleporter', {
     this.disableCursor();
   },
   enableCursor() {
-    this.pos = player.cursor_pos;
+    //this.pos = player.cursor_pos;
     this.visible = true;
     this.active = true;
     this.particles.start();
@@ -112,9 +211,11 @@ janus.registerElement('locomotion_teleporter', {
     this.active = false;
     this.particles.stop();
   },
+/*
   update() {
     if (this.active) {
       this.pos = player.cursor_pos;
     }
   }
+*/
 });

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