three-player-controller 0.3.8 → 0.4.0

package/README.md

@@ -8,11 +8,7 @@
 
 # 示例
 
-- [glb 场景](https://hh-hang.github.io/three-player-controller/index.html)
-
-- [3dtiles 场景](https://hh-hang.github.io/three-player-controller/3dtilesScene.html)
-
-- [3dtiles 自定义](https://hh-hang.github.io/three-player-controller/3dtilesCustomize.html)
+- [示例](https://hh-hang.github.io/three-player-controller/index.html)
 
 ### 普通控制
 
@@ -256,7 +252,7 @@ type PlayerControllerOptions = {
         gravity?: number;
         jumpHeight?: number;
         speed?: number;
-        playerFlySpeed?: number;
+        flySpeed?: number;
         rotateY?: number;
         headObjName?: string;
         flyEnabled?: boolean;
@@ -299,7 +295,7 @@ type PlayerControllerOptions = {
 | `playerModel.speed` | `number` | 否 | `300` | 移动速度基准值 |
 | `playerModel.gravity` | `number` | 否 | `-2400` | 重力加速度基准值 |
 | `playerModel.jumpHeight` | `number` | 否 | `600` | 跳跃高度基准值 |
-| `playerModel.playerFlySpeed` | `number` | 否 | `2100` | 飞行速度基准值 |
+| `playerModel.flySpeed` | `number` | 否 | `2100` | 飞行速度基准值 |
 | `playerModel.flyEnabled` | `boolean` | 否 | `true` | 是否允许飞行模式 |
 | `initPos` | `THREE.Vector3` | 否 | `(0,0,0)` | 初始位置 |
 | `mouseSensity` | `number` | 否 | `5` | 鼠标灵敏度 |
@@ -416,4 +412,4 @@ player.playAnimation("attack", { force: true });
 [three](https://github.com/mrdoob/three.js)
 
 [npm]: https://img.shields.io/npm/v/three-player-controller
-[npm-url]: https://www.npmjs.com/package/three-player-controller
+[npm-url]: https://www.npmjs.com/package/three-player-controller

package/dist/index.d.mts

@@ -109,13 +109,23 @@ declare function playerController(): {
     update: (dt?: number) => Promise<void>;
     destroy: () => void;
     reset: (pos?: THREE.Vector3) => void;
-    setInput: (i: any) => void;
+    setInput: (i: Parameters<(input: Partial<{
+        moveX: 1 | 0 | -1;
+        moveY: 1 | 0 | -1;
+        lookDeltaX: number;
+        lookDeltaY: number;
+        jump: boolean;
+        shift: boolean;
+        toggleView: boolean;
+        toggleFly: boolean;
+        toggleVehicle: boolean;
+    }>) => void>[0]) => void;
     changeView: () => void;
     getPosition: () => THREE.Vector3;
-    getCenterScreenRaycastHit: () => THREE.Intersection<THREE.Object3D<THREE.Object3DEventMap>>;
-    getCurrentPersonAnimationName: () => string;
-    getPerson: () => THREE.Object3D<THREE.Object3DEventMap>;
-    getActiveVehicle: () => VehicleInstance;
+    getCenterScreenRaycastHit: () => THREE.Intersection<THREE.Object3D<THREE.Object3DEventMap>> | undefined;
+    getCurrentPersonAnimationName: () => string | null;
+    getPerson: () => THREE.Object3D<THREE.Object3DEventMap> | null;
+    getActiveVehicle: () => VehicleInstance | null;
     getAllVehicles: () => VehicleInstance[];
     switchPlayerModel: (model: PlayerModelOptions) => Promise<void>;
     setPlayerScale: (scale: number) => void;

package/dist/index.d.ts

@@ -109,13 +109,23 @@ declare function playerController(): {
     update: (dt?: number) => Promise<void>;
     destroy: () => void;
     reset: (pos?: THREE.Vector3) => void;
-    setInput: (i: any) => void;
+    setInput: (i: Parameters<(input: Partial<{
+        moveX: 1 | 0 | -1;
+        moveY: 1 | 0 | -1;
+        lookDeltaX: number;
+        lookDeltaY: number;
+        jump: boolean;
+        shift: boolean;
+        toggleView: boolean;
+        toggleFly: boolean;
+        toggleVehicle: boolean;
+    }>) => void>[0]) => void;
     changeView: () => void;
     getPosition: () => THREE.Vector3;
-    getCenterScreenRaycastHit: () => THREE.Intersection<THREE.Object3D<THREE.Object3DEventMap>>;
-    getCurrentPersonAnimationName: () => string;
-    getPerson: () => THREE.Object3D<THREE.Object3DEventMap>;
-    getActiveVehicle: () => VehicleInstance;
+    getCenterScreenRaycastHit: () => THREE.Intersection<THREE.Object3D<THREE.Object3DEventMap>> | undefined;
+    getCurrentPersonAnimationName: () => string | null;
+    getPerson: () => THREE.Object3D<THREE.Object3DEventMap> | null;
+    getActiveVehicle: () => VehicleInstance | null;
     getAllVehicles: () => VehicleInstance[];
     switchPlayerModel: (model: PlayerModelOptions) => Promise<void>;
     setPlayerScale: (scale: number) => void;

package/dist/index.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -1037,13 +1038,12 @@ var PlayerController = class {
     }
     const w = window.innerWidth;
     const h = window.innerHeight;
-    this.camera.setViewOffset(w, h, -w * -0.15, 0, w, h);
+    this.camera.setViewOffset(w, h, w * 0.15, 0, w, h);
   }
   // 初始化加载器
   async initLoader() {
     const dracoLoader = new import_DRACOLoader.DRACOLoader();
-    dracoLoader.setDecoderPath("https://unpkg.com/three@0.180.0/examples/jsm/libs/draco/gltf/");
-    dracoLoader.setDecoderConfig({ type: "js" });
+    dracoLoader.setDecoderPath("https://unpkg.com/three@0.182.0/examples/jsm/libs/draco/gltf/");
     this.loader.setDRACOLoader(dracoLoader);
   }
   // 初始化物理引擎
@@ -1116,12 +1116,12 @@ var PlayerController = class {
         action.setEffectiveWeight(0);
         this.personActions.set(actionName, action);
       }
-      this.personActions.get("idle").setEffectiveWeight(1);
-      this.personActions.get("idle").play();
+      this.personActions.get("idle")?.setEffectiveWeight(1);
+      this.personActions.get("idle")?.play();
       this.actionState = this.personActions.get("idle");
-      this.personMixer.addEventListener("finished", (ev) => {
+      this.personMixerFinishedCb = (ev) => {
         const done = ev.action;
-        if (done === this.personActions.get("jumping")) {
+        if (done === this.personActions?.get("jumping")) {
           if (this.fwdPressed) {
             this.playPersonAnimationByName(this.shiftPressed ? "running" : "walking");
             return;
@@ -1137,7 +1137,8 @@ var PlayerController = class {
           this.playPersonAnimationByName("idle");
         }
         if (done === this.personActions?.get("enterCar")) this.onEnterCarAnimFinished();
-      });
+      };
+      this.personMixer.addEventListener("finished", this.personMixerFinishedCb);
       this.personMixer.update(0);
       this.person.updateMatrixWorld(true);
       const { size } = this.getBbox(this.person);
@@ -1192,6 +1193,10 @@ var PlayerController = class {
       this.personHead = null;
     }
     if (this.personMixer) {
+      if (this.personMixerFinishedCb) {
+        this.personMixer.removeEventListener("finished", this.personMixerFinishedCb);
+        this.personMixerFinishedCb = void 0;
+      }
       this.personMixer.stopAllAction();
       this.personMixer.uncacheRoot(this.personMixer.getRoot());
       this.personMixer = void 0;
@@ -1442,15 +1447,13 @@ var PlayerController = class {
   changeView() {
     this.isFirstPerson = !this.isFirstPerson;
     if (this.isFirstPerson) {
-      const camWorldDir = new THREE4.Vector3();
-      this.camera.getWorldDirection(camWorldDir);
-      const flatDir = new THREE4.Vector3(camWorldDir.x, 0, camWorldDir.z).normalize();
+      const playerFwd = new THREE4.Vector3(0, 0, 1).applyQuaternion(this.player.quaternion);
+      const flatDir = new THREE4.Vector3(playerFwd.x, 0, playerFwd.z).normalize();
       if (flatDir.lengthSq() > 1e-3) {
         const yAngle = Math.atan2(flatDir.x, flatDir.z);
-        this.player.rotation.set(0, yAngle + Math.PI, 0);
+        this.player.rotation.set(0, yAngle, 0);
       }
-      const vertAngle = Math.asin(THREE4.MathUtils.clamp(-camWorldDir.y, -1, 1));
-      this.setFirstPersonCamera(vertAngle);
+      this.setFirstPersonCamera();
       this.setOverShoulderView(false);
     } else {
       this.controls.enabled = true;
@@ -1648,7 +1651,7 @@ var PlayerController = class {
       return;
     }
     merged.boundsTree = new import_three_mesh_bvh.MeshBVH(merged, { maxDepth: 100 });
-    this.collider = new THREE4.Mesh(merged, new THREE4.MeshBasicMaterial({ opacity: 0.5, transparent: true, wireframe: true, depthTest: true }));
+    this.collider = new THREE4.Mesh(merged, new THREE4.MeshBasicMaterial({ opacity: 0.5, transparent: true, wireframe: true, depthTest: true, side: THREE4.DoubleSide }));
     if (this.displayCollider) this.scene.add(this.collider);
     if (this.displayVisualizer) {
       if (this.visualizer) this.scene.remove(this.visualizer);
@@ -1686,7 +1689,7 @@ var PlayerController = class {
       return;
     }
     merged.boundsTree = new import_three_mesh_bvh.MeshBVH(merged);
-    this.dynamicCollider = new THREE4.Mesh(merged, new THREE4.MeshBasicMaterial({ opacity: 0.5, transparent: true, wireframe: true, depthTest: true }));
+    this.dynamicCollider = new THREE4.Mesh(merged, new THREE4.MeshBasicMaterial({ opacity: 0.5, transparent: true, wireframe: true, depthTest: true, side: THREE4.DoubleSide }));
     if (this.displayCollider) this.scene.add(this.dynamicCollider);
   }
   // ==================== 控制器过渡 ====================
@@ -1921,16 +1924,17 @@ var PlayerController = class {
         if (!this.spacePressed) {
           this.playerVelocity.set(0, 0, 0);
           this.playerIsOnGround = true;
-          this.player.position.y = hits[0].point.y + h;
+          this.player.position.y = THREE4.MathUtils.lerp(this.player.position.y, hits[0].point.y + h, Math.min(1, 15 * delta));
         }
       } else if (dist >= minH) {
         this.playerVelocity.set(0, 0, 0);
         this.playerIsOnGround = true;
         this.player.position.y = hits[0].point.y + h;
       } else {
+        const targetY = hits[0].point.y + h;
         this.playerVelocity.set(0, 0, 0);
-        this.player.position.y = hits[0].point.y + h;
         this.playerIsOnGround = true;
+        this.player.position.y = THREE4.MathUtils.lerp(this.player.position.y, targetY, Math.min(1, 15 * delta));
       }
     }
     this.player.updateMatrixWorld();
@@ -1951,7 +1955,14 @@ var PlayerController = class {
             const distance = tri.closestPointToSegment(this.tempSegment, this.tempVector, this.tempVector2);
             if (distance < capsuleInfo.radius) {
               const normal = tri.getNormal(new THREE4.Vector3());
-              if (normal.y > 0.5 && !this.isFlying) return;
+              if (!this.isFlying && Math.abs(normal.y) > 0.5) return;
+              if (!this.isFlying && Math.abs(normal.y) <= 0.5) {
+                const e = this.collider.matrixWorld.elements;
+                const contactWorldY = e[1] * this.tempVector.x + e[5] * this.tempVector.y + e[9] * this.tempVector.z + e[13];
+                const s = this.playerModel.scale;
+                const feetY = this.player.position.y - this.playerCapsuleHeight * s * 0.75;
+                if (contactWorldY < feetY + this.playerCapsuleHeight * s * 0.25) return;
+              }
               const dir = this.tempVector2.sub(this.tempVector).normalize();
               const depth = capsuleInfo.radius - distance;
               this.tempSegment.start.addScaledVector(dir, depth);
@@ -2046,13 +2057,14 @@ var PlayerController = class {
   }
   // 屏幕中心射线
   getCenterScreenRaycastHit() {
+    if (!this.collider) return void 0;
     this.camera.updateMatrixWorld();
     this.centerRay.setFromCamera(this.centerMouse, this.camera);
     return this.centerRay.intersectObject(this.collider, false)[0];
   }
   // 获取当前人物动画名称
   getCurrentPersonAnimationName() {
-    return this.actionState._clip.name;
+    return this.actionState?.getClip()?.name ?? null;
   }
   // 更新动画混合器
   updateMixers(delta) {
@@ -2219,6 +2231,7 @@ var PlayerController = class {
     for (const v of this.vehicles) {
       this.scene.remove(v.vehicleGroup);
       v.pathPlanner?.dispose();
+      v.vehicleController?.destroy?.();
     }
     this.vehicles = [];
     this.activeVehicle = null;