Needle Engine 3.20.3

Files changed (5) hide show

src/engine-components/AnimatorController.ts +12 -9
src/engine/engine_physics_rapier.ts +31 -4
src/engine/engine_types.ts +4 -0
src/engine-components/ui/EventSystem.ts +2 -2
src/engine-components/RigidBody.ts +25 -1

src/engine-components/AnimatorController.ts CHANGED Viewed

@@ -235,11 +235,11 @@
         // if (!this._activeState) return;
         const dt = this.animator.context.time.deltaTime;
         if (this.animator.applyRootMotion) {
-            this.rootMotionHandler?.onBeforeUpdate();
+            this.rootMotionHandler?.onBeforeUpdate(weight);
         }
         this._mixer.update(dt);
         if (this.animator.applyRootMotion) {
-            this.rootMotionHandler?.onAfterUpdate();
+            this.rootMotionHandler?.onAfterUpdate(weight);
         }
     }
@@ -881,14 +881,14 @@
     // private lastPos: Vector3 = new Vector3();
-    onBeforeUpdate() {
+    onBeforeUpdate(_weight: number) {
         this.positionChange.set(0, 0, 0);
         this.rotationChange.set(0, 0, 0, 1);
     }
-    onAfterUpdate(): boolean {
+    onAfterUpdate(weight: number): boolean {
         if (!this.action) return false;
-        const weight = this.action.getEffectiveWeight();
+        weight *= this.action.getEffectiveWeight();
         if (weight <= 0) return false;
         this.positionChange.multiplyScalar(weight);
         this.rotationChange.slerp(RootMotionAction.identityQuaternion, 1 - weight);
@@ -937,19 +937,22 @@
     }
-    onBeforeUpdate() {
+    onBeforeUpdate(weight: number) {
         // capture the position of the object
         this.basePosition.copy(this.root.position);
         this.baseQuaternion.copy(this.root.quaternion);
         for (const hand of this.handler)
-            hand.onBeforeUpdate();
+            hand.onBeforeUpdate(weight);
     }
     private summedPosition: Vector3 = new Vector3();
     private summedRotation: Quaternion = new Quaternion();
-    onAfterUpdate() {
+    onAfterUpdate(weight: number) {
+        if (weight <= 0) return;
+        // TODO: blend weight properly with root motion (when using timeline blending with animator)
         // apply the accumulated changes
         this.root.position.copy(this.basePosition);
         this.root.quaternion.copy(this.baseQuaternion);
@@ -957,7 +960,7 @@
         this.summedPosition.set(0, 0, 0);
         this.summedRotation.set(0, 0, 0, 1);
         for (const entry of this.handler) {
-            if (entry.onAfterUpdate()) {
+            if (entry.onAfterUpdate(weight)) {
                 this.summedPosition.add(entry.positionChange);
                 this.summedRotation.multiply(entry.rotationChange);
             }

src/engine/engine_physics_rapier.ts CHANGED Viewed

@@ -229,9 +229,12 @@
         this._hasCreatedWorld = true;
         if (RAPIER === undefined) {
             if (debugPhysics) console.log("Import Rapier");
-            RAPIER = await import("@dimforge/rapier3d-compat");
+            const _rapier  = await import("@dimforge/rapier3d-compat");
             if (debugPhysics) console.log("Init Rapier");
-            await RAPIER.init()
+            await _rapier.init();
+            // only assign after all loads are done to avoid a race condition
+            // where RAPIER is already set and then used while actually still waiting for initialization.
+            RAPIER = _rapier;
         }
         if (debugPhysics) console.log("Physics engine initialized, creating world...");
         this._world = new World(this._gravity);
@@ -668,7 +671,7 @@
         // otherwise rapier will compute the mass properties based on the collider shape and density
         // https://rapier.rs/docs/user_guides/javascript/rigid_bodies#mass-properties
         if (useExplicitMassProperties) {
-            // desc.setDensity(0);
+            desc.setDensity(0);
         }
         const col = this.world.createCollider(desc, rigidBody);
@@ -696,7 +699,7 @@
             const rb = collider.attachedRigidbody;
             rigidBody = rb[$bodyKey];
-            useExplicitMassProperties = true;
+            useExplicitMassProperties = rb.autoMass === false;
             if (!rigidBody) {
                 const kinematic = rb.isKinematic && !debugColliderPlacement;
                 if (debugPhysics)
@@ -744,6 +747,30 @@
         rigidbody.setAngularDamping(rb.angularDrag);
         rigidbody.setGravityScale(rb.useGravity ? rb.gravityScale : 0, true);
+        // https://rapier.rs/docs/user_guides/javascript/rigid_bodies#dominance
+        if (rb.dominanceGroup <= 127 && rb.dominanceGroup >= -127)
+            rigidbody.setDominanceGroup(Math.floor(rb.dominanceGroup))
+        else rigidbody.setDominanceGroup(0);
+        if (rb.autoMass) {
+            rigidbody.setAdditionalMass(0, false);
+            for (let i = 0; i < rigidbody.numColliders(); i++) {
+                const col = rigidbody.collider(i);
+                col.setDensity(1);
+            }
+            rigidbody.recomputeMassPropertiesFromColliders();
+            console.log(rigidbody.mass())
+        }
+        else {
+            rigidbody.setAdditionalMass(rb.mass, false);
+            for (let i = 0; i < rigidbody.numColliders(); i++) {
+                const col = rigidbody.collider(i);
+                col.setDensity(0);
+            }
+            rigidbody.recomputeMassPropertiesFromColliders();
+            console.log(rigidbody.mass())
+        }
         // https://rapier.rs/docs/user_guides/javascript/rigid_bodies#mass-properties
         // rigidbody.setAdditionalMass(rb.mass, true);
         // for (let i = 0; i < rigidbody.numColliders(); i++) {

src/engine/engine_types.ts CHANGED Viewed

@@ -247,11 +247,15 @@
 export declare interface IRigidbody extends IComponent {
     constraints: RigidbodyConstraints;
     isKinematic: boolean;
+    /** When true the mass will automatically calculated by attached colliders */
+    autoMass: boolean;
     mass: number;
     drag: number;
     angularDrag: number;
     useGravity: boolean;
     gravityScale: number;
+    dominanceGroup: number;
     collisionDetectionMode: CollisionDetectionMode;
     lockPositionX: boolean;

src/engine-components/ui/EventSystem.ts CHANGED Viewed

@@ -97,8 +97,8 @@
             if (!res) {
                 const rc = GameObject.addNewComponent(this.context.scene, ObjectRaycaster);
                 this.raycaster.push(rc);
-                if (isDevEnvironment())
-                    console.warn("Added an ObjectRaycaster to the scene because no raycaster was found", this);
+                if (isDevEnvironment() || debug)
+                    console.warn("Added an ObjectRaycaster to the scene because no raycaster was found");
             }
         }
     }

src/engine-components/RigidBody.ts CHANGED Viewed

@@ -133,9 +133,26 @@
 export class Rigidbody extends Behaviour implements IRigidbody {
+    /** When true the mass will be automatically calculated by the attached colliders */
     @validate()
+    autoMass: boolean = true;
     @serializable()
-    mass: number = 1;
+    set mass(value: number) {
+        if (value === this._mass) return;
+        this._mass = value;
+        this._propertiesChanged = true;
+        // When setting the mass manually we disable autoMass
+        if (this.__didAwake) {
+            this.autoMass = false;
+        }
+    }
+    get mass() {
+        if (this.autoMass)
+            return this.context.physics.engine?.getBody(this)?.mass() ?? -1;
+        return this._mass;
+    }
+    private _mass: number = 0;
     @validate()
     @serializable()
@@ -219,8 +236,15 @@
     get gravityScale() {
         return this._gravityScale;
     }
+    @validate()
     private _gravityScale: number = 1;
+    /** Rigidbodies with higher dominance will be immune to forces originating from contacts with rigidbodies of lower dominance.
+     * Read more here: https://rapier.rs/docs/user_guides/javascript/rigid_bodies#dominance
+     */
+    @validate()
+    dominanceGroup : number = 0;
     private static tempPosition: THREE.Vector3 = new THREE.Vector3();
     private _propertiesChanged: boolean = false;
     private _currentVelocity: THREE.Vector3 = new THREE.Vector3();