@pmndrs/viverse 0.1.15 → 0.1.17

package/dist/animation/index.js

@@ -5,10 +5,8 @@ import { loadVrmModelMixamoAnimations as loadModelMixamoAnimations } from './mix
 import { scaleAnimationClipTime, trimAnimationClip } from './utils.js';
 import { loadVrmModelVrmaAnimations } from './vrma.js';
 import { cached } from '../utils.js';
-const parentWorldVector = new Vector3();
 const restRotationInverse = new Quaternion();
 const parentRestWorldRotation = new Quaternion();
-const parentRestWorldRotationInverse = new Quaternion();
 const quaternion = new Quaternion();
 const vector = new Vector3();
 const nonVrmRotationOffset = new Quaternion().setFromEuler(new Euler(0, Math.PI, 0));
@@ -18,7 +16,9 @@ export function fixModelAnimationClip(model, clip, clipScene, removeXZMovement,
         throw new Error('Failed to determine hips bone name for VRM animation. Please check the bone map or animation file.');
     }
     const clipSceneHips = clipScene.getObjectByName(hipsBoneName);
-    const vrmHipsPosition = model instanceof VRM ? model.humanoid.normalizedRestPose.hips?.position : clipSceneHips?.position;
+    const vrmHipsPosition = model instanceof VRM
+        ? model.humanoid.normalizedRestPose.hips?.position
+        : model.scene.getObjectByName('hips')?.position.toArray();
     if (clipSceneHips == null || vrmHipsPosition == null) {
         throw new Error('Failed to load VRM animation: missing animation hips object or VRM hips position.');
     }
@@ -32,14 +32,18 @@ export function fixModelAnimationClip(model, clip, clipScene, removeXZMovement,
         const vrmBoneName = boneMap?.[boneName] ?? boneName;
         const vrmNodeName = model instanceof VRM ? model.humanoid.getNormalizedBoneNode(vrmBoneName)?.name : vrmBoneName;
         const bone = clipScene.getObjectByName(boneName);
-        if (vrmNodeName == null || bone == null || bone.parent == null) {
+        if (vrmNodeName == null || bone == null) {
             continue;
         }
-        bone.getWorldQuaternion(restRotationInverse).invert();
-        bone.parent.getWorldQuaternion(parentRestWorldRotation);
-        parentRestWorldRotationInverse.copy(parentRestWorldRotation).invert();
-        bone.parent.getWorldPosition(parentWorldVector);
         if (track instanceof QuaternionKeyframeTrack) {
+            if (bone.parent != null) {
+                bone.getWorldQuaternion(restRotationInverse).invert();
+                bone.parent.getWorldQuaternion(parentRestWorldRotation);
+            }
+            else {
+                restRotationInverse.identity();
+                parentRestWorldRotation.identity();
+            }
             // Store rotations of rest-pose.
             for (let i = 0; i < track.values.length; i += 4) {
                 quaternion.fromArray(track.values, i);

package/dist/physics/index.js

@@ -2,6 +2,7 @@ import { Box3, Line3, Matrix4, Vector3 } from 'three';
 //for this is a kinematic character controller
 const triPoint = new Vector3();
 const capsulePoint = new Vector3();
+const centerHelper = new Vector3();
 const collisionFreePosition = new Vector3();
 const position = new Vector3();
 const invertedParentMatrix = new Matrix4();
@@ -83,7 +84,8 @@ export class BvhCharacterPhysics {
             }
         }
         this.updateBoundingShapes(options);
-        this.world.updateSensors((bounds) => bounds.intersectsBox(this.aabbox), (triangle) => triangle.closestPointToSegment(this.segment) < this.radius);
+        centerHelper.addVectors(this.segment.start, this.segment.end).multiplyScalar(0.5);
+        this.world.updateSensors(centerHelper, (bounds) => bounds.intersectsBox(this.aabbox), (triangle) => triangle.closestPointToSegment(this.segment) < this.radius);
     }
     updateBoundingShapes(options) {
         //compute the bounding capsule and bounding box

package/dist/physics/world.d.ts

@@ -1,4 +1,4 @@
-import { Box3, Object3D, Ray } from 'three';
+import { Box3, Object3D, Ray, Vector3 } from 'three';
 import { ExtendedTriangle } from 'three-mesh-bvh';
 export declare class BvhPhysicsWorld {
     private bodies;
@@ -13,7 +13,7 @@ export declare class BvhPhysicsWorld {
     private computeBvhEntries;
     removeBody(object: Object3D): void;
     private computeMatrix;
-    updateSensors(intersectsBounds: (box: Box3) => boolean, intersectsTriangle: (triangle: ExtendedTriangle) => boolean): void;
+    updateSensors(playerCenter: Vector3, intersectsBounds: (box: Box3) => boolean, intersectsTriangle: (triangle: ExtendedTriangle) => boolean): void;
     shapecast(intersectsBounds: (box: Box3) => boolean, intersectsTriangle: (triangle: ExtendedTriangle) => void): void;
     private shapecastEntry;
     raycast(ray: Ray, far: number): number | undefined;

package/dist/physics/world.js

@@ -1,4 +1,4 @@
-import { Box3, InstancedMesh, Matrix4, Ray, Vector3 } from 'three';
+import { Box3, DoubleSide, InstancedMesh, Matrix4, Ray, Vector3 } from 'three';
 import { computeBoundsTree, StaticGeometryGenerator, ExtendedTriangle } from 'three-mesh-bvh';
 const rayHelper = new Ray();
 const farPointHelper = new Vector3();
@@ -70,11 +70,20 @@ export class BvhPhysicsWorld {
         target.premultiply(object.matrixWorld);
         return true;
     }
-    updateSensors(intersectsBounds, intersectsTriangle) {
-        console.log('update sensors', this.sensors.length);
+    updateSensors(playerCenter, intersectsBounds, intersectsTriangle) {
         for (const entry of this.sensors) {
-            const intersected = this.shapecastEntry(entry, intersectsBounds, intersectsTriangle);
-            console.log(intersected);
+            //check surface intersection
+            let intersected = this.shapecastEntry(entry, intersectsBounds, intersectsTriangle);
+            if (!intersected) {
+                //check if we are entirely inside
+                rayHelper.origin.copy(playerCenter);
+                rayHelper.direction.set(0, -1, 0);
+                if (this.computeMatrix(entry, matrixHelper)) {
+                    matrixHelper.invert();
+                    rayHelper.applyMatrix4(matrixHelper);
+                }
+                intersected = entry.bvh.raycast(rayHelper, DoubleSide).length % 2 == 1;
+            }
             if (entry.intersected === intersected) {
                 continue;
             }

package/package.json

@@ -21,7 +21,7 @@
   "peerDependencies": {
     "three": "*"
   },
-  "version": "0.1.15",
+  "version": "0.1.17",
   "type": "module",
   "dependencies": {
     "@pixiv/three-vrm": "^3.4.2",