@pmndrs/viverse 0.1.8 → 0.1.10

package/README.md

@@ -1,5 +1,5 @@
 <h1 align="center">@pmndrs/viverse</h1>
-<h3 align="center">Toolkit for building Three.js Apps for Viverse and beyond.</h3>
+<h3 align="center">Toolkit for building Three.js Apps for VIVERSE and beyond.</h3>
 <br/>
 
 <p align="center">

package/dist/physics/index.d.ts

@@ -24,9 +24,9 @@ export type BvhCharacterPhysicsOptions = {
      */
     linearDamping?: number;
     /**
-     * @default 0.25;
+     * @default 0.5;
      */
-    slopeGroundingThreshold?: number;
+    maxGroundSlope?: number;
 } | boolean;
 /**
  * assumes the target object origin is at its bottom
@@ -37,7 +37,8 @@ export declare class BvhCharacterPhysics {
     private destroyed;
     private readonly stateVelocity;
     readonly inputVelocity: Vector3;
-    isGrounded: boolean;
+    private notGroundedSeconds;
+    get isGrounded(): boolean;
     constructor(character: Object3D, world: BvhPhysicsWorld);
     applyVelocity(velocity: Vector3): void;
     /**
@@ -45,6 +46,6 @@ export declare class BvhCharacterPhysics {
      */
     update(fullDelta: number, options?: BvhCharacterPhysicsOptions): void;
     destroy(): void;
-    shapecastCapsule(position: Vector3, options: Exclude<BvhCharacterPhysicsOptions, boolean>): void;
+    shapecastCapsule(position: Vector3, maxGroundSlope: number, options: Exclude<BvhCharacterPhysicsOptions, boolean>): boolean;
 }
 export * from './world.js';

package/dist/physics/index.js

@@ -7,8 +7,8 @@ const triPoint = new Vector3();
 const capsulePoint = new Vector3();
 const collisionFreePosition = new Vector3();
 const position = new Vector3();
-const collisionDelta = new Vector3();
 const invertedParentMatrix = new Matrix4();
+const YAxis = new Vector3(0, 1, 0);
 /**
  * assumes the target object origin is at its bottom
  */
@@ -18,7 +18,10 @@ export class BvhCharacterPhysics {
     destroyed = false;
     stateVelocity = new Vector3();
     inputVelocity = new Vector3();
-    isGrounded = false;
+    notGroundedSeconds = 0;
+    get isGrounded() {
+        return this.notGroundedSeconds < 0.2;
+    }
     constructor(character, world) {
         this.character = character;
         this.world = world;
@@ -57,13 +60,17 @@ export class BvhCharacterPhysics {
                 invertedParentMatrix.identity();
             }
             //compute new position based on the state velocity, the input velocity, and the delta
-            const yMovement = this.stateVelocity.y * partialDelta;
-            position.addScaledVector(this.stateVelocity, partialDelta);
             position.addScaledVector(this.inputVelocity, partialDelta);
-            //compute collision and write the corrected position to the target
-            //TODO: rework - when are we on the ground and how to correct the shapecast
-            this.shapecastCapsule(collisionFreePosition.copy(position), options);
-            this.character.position.copy(collisionFreePosition).applyMatrix4(invertedParentMatrix);
+            position.addScaledVector(this.stateVelocity, partialDelta);
+            const isGrounded = this.shapecastCapsule(collisionFreePosition.copy(position), options.maxGroundSlope ?? 1, options) &&
+                this.stateVelocity.y < 0;
+            this.notGroundedSeconds += partialDelta;
+            if (isGrounded) {
+                this.notGroundedSeconds = 0;
+            }
+            if (!isGrounded || this.inputVelocity.lengthSq() > 0) {
+                this.character.position.copy(collisionFreePosition).applyMatrix4(invertedParentMatrix);
+            }
             //compute new velocity
             //  apply gravity
             this.stateVelocity.y += (options.gravity ?? -20) * partialDelta;
@@ -71,21 +78,15 @@ export class BvhCharacterPhysics {
             const dampingFactor = 1.0 / (1.0 + partialDelta * (options.linearDamping ?? 0.1));
             this.stateVelocity.multiplyScalar(dampingFactor);
             //  apply collision to velocity
-            collisionDelta.copy(collisionFreePosition).sub(position);
-            this.isGrounded = collisionDelta.y >= Math.abs(yMovement * (options.slopeGroundingThreshold ?? 0.6));
-            if (this.isGrounded) {
-                this.stateVelocity.set(0, (options.gravity ?? -20) * partialDelta, 0);
-            }
-            else if (collisionDelta.length() > 1e-5) {
-                collisionDelta.normalize();
-                this.stateVelocity.addScaledVector(collisionDelta, -collisionDelta.dot(this.stateVelocity));
+            if (isGrounded) {
+                this.stateVelocity.set(0, (options.gravity ?? -20) * 0.01, 0);
             }
         }
     }
     destroy() {
         this.destroyed = true;
     }
-    shapecastCapsule(position, options) {
+    shapecastCapsule(position, maxGroundSlope, options) {
         const radius = options.capsuleRadius ?? 0.4;
         const height = options.capsuleHeight ?? 1.7;
         segment.start.copy(position);
@@ -97,6 +98,7 @@ export class BvhCharacterPhysics {
         aabbox.expandByPoint(segment.end);
         aabbox.min.addScalar(-radius);
         aabbox.max.addScalar(radius);
+        let grounded = false;
         for (const bvh of this.world.getBodies()) {
             bvh.shapecast({
                 intersectsBounds: (bounds) => bounds.intersectsBox(aabbox),
@@ -104,9 +106,11 @@ export class BvhCharacterPhysics {
                     // Use your existing triangle vs segment closestPointToSegment
                     const distance = tri.closestPointToSegment(segment, triPoint, capsulePoint);
                     if (distance === 0) {
-                        const scaledDirection = capsulePoint.sub(capsulePoint.distanceTo(segment.start) < capsulePoint.distanceTo(segment.end)
-                            ? segment.start
-                            : segment.end);
+                        const isCloserToSegmentStart = capsulePoint.distanceTo(segment.start) < capsulePoint.distanceTo(segment.end);
+                        if (isCloserToSegmentStart) {
+                            grounded = true;
+                        }
+                        const scaledDirection = capsulePoint.sub(isCloserToSegmentStart ? segment.start : segment.end);
                         scaledDirection.y += radius;
                         segment.start.add(scaledDirection);
                         segment.end.add(scaledDirection);
@@ -114,6 +118,10 @@ export class BvhCharacterPhysics {
                     else if (distance < radius) {
                         const depthInsideCapsule = radius - distance;
                         const direction = capsulePoint.sub(triPoint).divideScalar(distance);
+                        const slope = Math.tan(Math.acos(direction.dot(YAxis)));
+                        if (direction.y > 0 && slope <= maxGroundSlope) {
+                            grounded = true;
+                        }
                         segment.start.addScaledVector(direction, depthInsideCapsule);
                         segment.end.addScaledVector(direction, depthInsideCapsule);
                     }
@@ -122,6 +130,7 @@ export class BvhCharacterPhysics {
         }
         position.copy(segment.start);
         position.y -= radius;
+        return grounded;
     }
 }
 export * from './world.js';

package/dist/simple-character.js

@@ -58,6 +58,7 @@ async function* SimpleCharacterTimeline(camera, character) {
         return performance.now() / 1000 - lastTimePressed < (jumpOptions?.bufferTime ?? 0.1);
     }
     function applyJumpForce() {
+        lastJump = performance.now() / 1000;
         character.physics.applyVelocity(vector.set(0, (typeof character.options.movement?.jump === 'object' ? character.options.movement?.jump.speed : undefined) ??
             8, 0));
     }
@@ -152,7 +153,7 @@ async function* SimpleCharacterTimeline(camera, character) {
                             actions.jumpForward.paused = true;
                             actions.jumpForward.fadeIn(character.options.animation?.crossFadeDuration ?? DefaultCrossFadeDuration);
                         },
-                        update: () => void character.physics.inputVelocity.multiplyScalar(DefaultCrossFadeDuration),
+                        update: () => void character.physics.inputVelocity.multiplyScalar(0.3),
                         until: timePassed((typeof character.options.movement?.jump === 'object'
                             ? character.options.movement?.jump.delay
                             : undefined) ?? DefaultJumDelay, 'seconds'),
@@ -197,7 +198,7 @@ async function* SimpleCharacterTimeline(camera, character) {
                 }),
                 transitionTo: {
                     jumpDown: {
-                        when: (_, clock) => clock.actionTime > 0.1 && character.physics.isGrounded,
+                        when: (_, clock) => clock.actionTime > 0.3 && character.physics.isGrounded,
                     },
                     finally: 'jumpLoop',
                 },
@@ -226,7 +227,7 @@ async function* SimpleCharacterTimeline(camera, character) {
                         actions.jumpDown.fadeIn(character.options.animation?.crossFadeDuration ?? DefaultCrossFadeDuration);
                     },
                     cleanup: () => actions.jumpDown.fadeOut(character.options.animation?.crossFadeDuration ?? DefaultCrossFadeDuration),
-                    until: timePassed(50, 'milliseconds'),
+                    until: timePassed(150, 'milliseconds'),
                 }),
                 transitionTo: { finally: 'moving' },
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmndrs/viverse",
-  "description": "Toolkit for building Three.js Apps for Viverse and beyond.",
+  "description": "Toolkit for building Three.js Apps for VIVERSE and beyond.",
   "author": "Bela Bohlender",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://github.com/pmndrs/viverse",
@@ -21,7 +21,7 @@
   "peerDependencies": {
     "three": "*"
   },
-  "version": "0.1.8",
+  "version": "0.1.10",
   "type": "module",
   "dependencies": {
     "@pixiv/three-vrm": "^3.4.2",