make camera control more natural

static/demo.min.js

@@ -111,6 +111,9 @@
         let rollX = this.gamepads[pad].axes[2];
         let rollY = this.gamepads[pad].axes[3];
 
+        let buttons = this.gamepads[pad].buttons;
+        this.rStick.z = buttons[11].pressed ? 1 : 0;
+
         if (panX < -this.SPACEMOUSE_THRESHOLD ||
             panX > this.SPACEMOUSE_THRESHOLD) {
           this.lStick.x = panX;
@@ -418,10 +421,6 @@
       let endTime = performance.now();
       let elapsedTime = endTime - startTime;
 
-      // if (gamepad.connected) {
-      //   gamepad.update();
-      // }
-
       if (!guiParams.Pause && elapsedTime > fpsInterval) {
         startTime = endTime - (elapsedTime % fpsInterval);
 
@@ -454,11 +453,16 @@
           taskVector[1] = (b * targetDelta[0] + d * targetDelta[1]) * M2F;
         } else if (guiParams.Task == "joystick") {
 
-          if (gamepad.connected) {
-            gamepad.update();
-            heading = Math.atan2(gamepad.lStick.x, gamepad.lStick.y);
-            speed = Math.min(Math.max(gamepad.lStick.length(), 0.2), 0.8);
-          }
+          let dz = camera.position.z - controls.target.z;
+          let dx = camera.position.x - controls.target.x;
+          let cameraAngle = Math.atan2(dz, dx);
+
+          if (gamepad.connected) { gamepad.update(); }
+
+          heading = Math.atan2(gamepad.lStick.x, gamepad.lStick.y) + (cameraAngle - Math.PI);
+          speed = Math.min(Math.max(gamepad.lStick.length(), 0.2), 0.8);
+          cameraAngle += gamepad.rStick.x * 5 / 360 * Math.PI;
+          if (gamepad.rStick.z == 1) { cameraAngle = Math.PI; }
 
           target.position.x = rootXYZ[0] + (2 * speed + 0.6) * Math.cos(heading);
           target.position.z = rootXYZ[2] + (2 * speed + 0.6) * Math.sin(heading);
@@ -467,10 +471,6 @@
           taskVector[0] = speed * Math.cos(targetAngle);
           taskVector[1] = speed * Math.sin(targetAngle);
 
-          let dz = camera.position.z - controls.target.z;
-          let dx = camera.position.x - controls.target.x;
-          let cameraAngle = Math.atan2(dz, dx) + gamepad.rStick.x * 10 / 360 * Math.PI;
-
           let cx = rootXYZ[0] + Math.cos(cameraAngle) * 30;
           let cz = rootXYZ[2] + Math.sin(cameraAngle) * 30; 
           camera.position.set(cx, 10, cz);