three-base 2.0.121 → 2.0.123

package/FPScontrol.d.ts

@@ -17,6 +17,7 @@ export default class FPScontrol extends EventDispatcher {
     speed: number;
     camera: Camera;
     octreeMap: Map<number, Octree>;
+    octree: Octree;
     addOctree(obj: Object3D): Octree;
     playerCollider: Capsule;
     clock: Clock;

package/FPScontrol.js

@@ -4,7 +4,7 @@
  * @Last Modified by: xiaosihan
  * @Last Modified time: 2024-11-07 21:57:39
  */
-import { Clock, EventDispatcher, Vector3 } from "three";
+import { Clock, EventDispatcher, Vector3, } from "three";
 import { Capsule } from "three/examples/jsm/math/Capsule";
 import { Octree } from "three/examples/jsm/math/Octree";
 import { clamp, degToRad } from "three/src/math/MathUtils";
@@ -33,6 +33,30 @@ export default class FPScontrol extends EventDispatcher {
     camera;
     // 八叉树数组
     octreeMap = new Map();
+    octree = (() => {
+        const octree = new Octree();
+        octree.getCapsuleTriangles = (capsule, triangles) => {
+            const octrees = Array.from(this.octreeMap.values());
+            for (let octree of octrees) {
+                for (let i = 0; i < octree.subTrees.length; i++) {
+                    const subTree = octree.subTrees[i];
+                    if (!capsule.intersectsBox(subTree.box))
+                        continue;
+                    if (subTree.triangles.length > 0) {
+                        for (let j = 0; j < subTree.triangles.length; j++) {
+                            if (triangles.indexOf(subTree.triangles[j]) === -1)
+                                triangles.push(subTree.triangles[j]);
+                        }
+                    }
+                    else {
+                        subTree.getCapsuleTriangles(capsule, triangles);
+                    }
+                }
+            }
+            return triangles;
+        };
+        return octree;
+    })();
     addOctree(obj) {
         const octree = new Octree();
         octree.fromGraphNode(obj);
@@ -131,16 +155,13 @@ export default class FPScontrol extends EventDispatcher {
     playerCollisions() {
         this.playerOnFloor = false;
         // 遍历 八叉树 做碰撞检测
-        const octrees = Array.from(this.octreeMap.values());
-        for (let octree of octrees) {
-            const result = octree.capsuleIntersect(this.playerCollider);
-            if (result) {
-                this.playerOnFloor = this.playerOnFloor || result.normal.y > 0;
-                if (!this.playerOnFloor) {
-                    this.playerVelocity.addScaledVector(result.normal, -result.normal.dot(this.playerVelocity));
-                }
-                this.playerCollider.translate(result.normal.multiplyScalar(result.depth));
+        const result = this.octree.capsuleIntersect(this.playerCollider);
+        if (result) {
+            this.playerOnFloor = result.normal.y > 0;
+            if (!this.playerOnFloor) {
+                this.playerVelocity.addScaledVector(result.normal, -result.normal.dot(this.playerVelocity));
             }
+            this.playerCollider.translate(result.normal.multiplyScalar(result.depth));
         }
     }
     // 更新控制器的位置
@@ -150,7 +171,7 @@ export default class FPScontrol extends EventDispatcher {
             this.playerCollider.end.set(0, 1, 10);
             this.playerCollider.radius = 0.35;
             this.camera.position.copy(this.playerCollider.end);
-            // this.camera.position.set(0, 3, 0);
+            //   this.camera.position.set(0, 3, 0);
         }
     };
     // 更新

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-base",
-  "version": "2.0.121",
+  "version": "2.0.123",
   "description": "three 3d three-base",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"