three-base 2.0.119 → 2.0.121

package/FPScontrol.d.ts

@@ -16,8 +16,8 @@ export default class FPScontrol extends EventDispatcher {
     STEPS_PER_FRAME: number;
     speed: number;
     camera: Camera;
-    octrees: Array<Octree>;
-    addOctree(obj: Object3D): void;
+    octreeMap: Map<number, Octree>;
+    addOctree(obj: Object3D): Octree;
     playerCollider: Capsule;
     clock: Clock;
     playerVelocity: Vector3;

package/FPScontrol.js

@@ -32,11 +32,12 @@ export default class FPScontrol extends EventDispatcher {
     speed = 1; // 速度
     camera;
     // 八叉树数组
-    octrees = [];
+    octreeMap = new Map();
     addOctree(obj) {
         const octree = new Octree();
         octree.fromGraphNode(obj);
-        this.octrees.push(octree);
+        this.octreeMap.set(obj.id, octree);
+        return octree;
     }
     // 用户自己的碰撞体积
     playerCollider = new Capsule(new Vector3(0, 0.35, 0), new Vector3(0, 1, 0), 0.35);
@@ -124,15 +125,17 @@ export default class FPScontrol extends EventDispatcher {
         this.playerCollider.translate(deltaPosition);
         this.playerCollisions();
         this.camera.position.copy(this.playerCollider.end);
-        this.camera.rotation.x = clamp(this.camera.rotation.x, degToRad(-20), degToRad(20));
+        this.camera.rotation.x = clamp(this.camera.rotation.x, degToRad(-89), degToRad(89));
     };
     // 玩家的碰撞检测
     playerCollisions() {
-        for (let octree of this.octrees) {
+        this.playerOnFloor = false;
+        // 遍历 八叉树 做碰撞检测
+        const octrees = Array.from(this.octreeMap.values());
+        for (let octree of octrees) {
             const result = octree.capsuleIntersect(this.playerCollider);
-            this.playerOnFloor = false;
             if (result) {
-                this.playerOnFloor = result.normal.y > 0;
+                this.playerOnFloor = this.playerOnFloor || result.normal.y > 0;
                 if (!this.playerOnFloor) {
                     this.playerVelocity.addScaledVector(result.normal, -result.normal.dot(this.playerVelocity));
                 }

package/package.json

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

package/pass/bloom_pass.js

@@ -89,7 +89,6 @@ export default function bloom_pass(renderer, camera, object3d, baseRenderTarget,
     bloomPass.threshold = bloom_threshold;
     bloomPass.strength = bloom_strength;
     bloomPass.radius = bloom_radius;
-    debugger;
     // 保存原帧缓冲区
     const originRenderTarget = renderer.getRenderTarget();
     // 设置选中目标的帧缓冲区