@onerjs/core 8.49.1 → 8.49.3

package/Physics/v2/characterController.js

@@ -151,34 +151,6 @@ export class PhysicsCharacterController {
          * default 0.5
          */
         this.stepHeight = 0.5;
-        /**
-         * The normal threshold for ground detection during step up.
-         * Used to determine if a contact surface is ground-like (facing upward).
-         * Value is the cosine of the maximum angle from vertical.
-         * For example, 0.5 means surfaces with angle less than 60 degrees from vertical are considered ground.
-         * default 0.5
-         */
-        this.stepGroundNormalThreshold = 0.5;
-        /**
-         * The ratio of stepHeight used for checking height during step up.
-         * Determines at what fraction of the step height to perform the obstruction check.
-         * For example, 0.5 means check at half the step height.
-         * default 0.5
-         */
-        this.stepUpCheckHeightRatio = 0.5;
-        /**
-         * The minimum distance to check for step up obstruction.
-         * This prevents the character from trying to step up when the obstruction is too close.
-         * default 0.1
-         */
-        this.stepUpCheckDistance = 0.1;
-        /**
-         * The ratio of horizontal displacement to check after stepping up.
-         * Determines how far forward to check for clearance after stepping up.
-         * For example, 0.5 means check half the step check distance forward.
-         * default 0.5
-         */
-        this.stepUpCheckHorizontalRatio = 0.5;
         /**
          * Observable for trigger entered and trigger exited events
          */
@@ -210,8 +182,6 @@ export class PhysicsCharacterController {
         const hknp = hk._hknp;
         this._startCollector = hknp.HP_QueryCollector_Create(16)[1];
         this._castCollector = hknp.HP_QueryCollector_Create(16)[1];
-        this._stepCollector = hknp.HP_QueryCollector_Create(16)[1];
-        this._stepUpCollector = hknp.HP_QueryCollector_Create(16)[1];
     }
     /**
      * Dispose the character controller
@@ -226,8 +196,6 @@ export class PhysicsCharacterController {
         const hknp = hk._hknp;
         hknp.HP_QueryCollector_Release(this._startCollector);
         hknp.HP_QueryCollector_Release(this._castCollector);
-        hknp.HP_QueryCollector_Release(this._stepCollector);
-        hknp.HP_QueryCollector_Release(this._stepUpCollector);
     }
     /**
      * Get shape used for collision
@@ -1212,85 +1180,6 @@ export class PhysicsCharacterController {
     _getInvMass(body) {
         return 1 / body.body.getMassProperties(body.index).mass;
     }
-    _hasGroundContact() {
-        if (this._manifold.length === 0) {
-            return false;
-        }
-        for (let i = 0; i < this._manifold.length; i++) {
-            const contact = this._manifold[i];
-            if (contact.normal.dot(this.up) > this.stepGroundNormalThreshold) {
-                return true;
-            }
-        }
-        return false;
-    }
-    _tryStepUp(deltaTime, displacement, stepOffset) {
-        if (stepOffset <= 0 || displacement.lengthSquared() < 1e-6) {
-            return false;
-        }
-        const horizontalDisp = this._tmpVecs[30];
-        horizontalDisp.copyFrom(displacement);
-        horizontalDisp.y = 0;
-        if (horizontalDisp.lengthSquared() < 1e-6) {
-            return false;
-        }
-        horizontalDisp.normalizeToRef(horizontalDisp);
-        const hk = this._scene.getPhysicsEngine().getPhysicsPlugin();
-        const hknp = hk._hknp;
-        const stepUpHeight = stepOffset * this.stepUpCheckHeightRatio;
-        const checkPos = this._tmpVecs[31];
-        checkPos.copyFrom(this._position);
-        const scaledVec = this._tmpVecs[26];
-        this.up.scaleToRef(stepUpHeight, scaledVec);
-        checkPos.addInPlace(scaledVec);
-        const stepCheckDist = Math.max(this.stepUpCheckDistance, stepOffset);
-        const checkNative = [checkPos.x, checkPos.y, checkPos.z];
-        const orientation = [this._orientation.x, this._orientation.y, this._orientation.z, this._orientation.w];
-        const castPath = this._tmpVecs[29];
-        horizontalDisp.scaleToRef(stepCheckDist, castPath);
-        const endNative = [checkPos.x + castPath.x, checkPos.y + castPath.y, checkPos.z + castPath.z];
-        const query = [this._shape._pluginData, orientation, checkNative, endNative, false, [this._body._pluginData.hpBodyId[0]]];
-        hknp.HP_World_ShapeCastWithCollector(hk.world, this._stepCollector, query);
-        const numHits = hknp.HP_QueryCollector_GetNumHits(this._stepCollector)[1];
-        if (numHits > 0) {
-            for (let i = 0; i < numHits; i++) {
-                const [fraction, , hitWorld] = hknp.HP_QueryCollector_GetShapeCastResult(this._stepCollector, i)[1];
-                if (fraction >= 1.0) {
-                    continue;
-                }
-                const normal = this._tmpVecs[28];
-                normal.set(hitWorld[4][0], hitWorld[4][1], hitWorld[4][2]);
-                const verticalComponent = normal.dot(this.up);
-                if (verticalComponent < this.stepGroundNormalThreshold) {
-                    continue;
-                }
-                const stepUpPos = this._tmpVecs[27];
-                stepUpPos.copyFrom(this._position);
-                this.up.scaleToRef(stepOffset, scaledVec);
-                stepUpPos.addInPlace(scaledVec);
-                const stepUpCheck = [
-                    this._shape._pluginData,
-                    orientation,
-                    [stepUpPos.x, stepUpPos.y, stepUpPos.z],
-                    [
-                        stepUpPos.x + castPath.x * this.stepUpCheckHorizontalRatio,
-                        stepUpPos.y + castPath.y * this.stepUpCheckHorizontalRatio,
-                        stepUpPos.z + castPath.z * this.stepUpCheckHorizontalRatio,
-                    ],
-                    false,
-                    [this._body._pluginData.hpBodyId[0]],
-                ];
-                hknp.HP_World_ShapeCastWithCollector(hk.world, this._stepUpCollector, stepUpCheck);
-                const numStepUpHits = hknp.HP_QueryCollector_GetNumHits(this._stepUpCollector)[1];
-                if (numStepUpHits === 0) {
-                    this.up.scaleToRef(stepOffset, scaledVec);
-                    this._position.addInPlace(scaledVec);
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
     _integrateManifolds(deltaTime, gravity) {
         const hk = this._scene.getPhysicsEngine().getPhysicsPlugin();
         const epsSqrd = 1e-8;
@@ -1312,19 +1201,6 @@ export class PhysicsCharacterController {
             const solverDeltaTime = solveResults.deltaTime;
             newVelocity = solveResults.velocity;
             this._resolveContacts(deltaTime, gravity);
-            const displacement = this._tmpVecs[25];
-            if (this._hasGroundContact() && newDisplacement.lengthSquared() > epsSqrd && this.stepHeight > 0) {
-                const horizontalVel = this._tmpVecs[26];
-                horizontalVel.copyFrom(this._velocity);
-                horizontalVel.y = 0;
-                if (horizontalVel.lengthSquared() > epsSqrd) {
-                    if (this._tryStepUp(deltaTime, this._lastDisplacement, this.stepHeight)) {
-                        remainingTime -= solverDeltaTime;
-                        this._lastDisplacement.copyFrom(newDisplacement);
-                        continue;
-                    }
-                }
-            }
             let newContactIndex = -1;
             // todo if (updateResult == hit multiple bodies) ... cast again
             // If castCollector had hits on different bodies (so we're not sure if some non-closest body could be in our way) OR
@@ -1359,8 +1235,8 @@ export class PhysicsCharacterController {
                 const distance = newContact.fraction;
                 let fraction = distance - keepDistanceAlongMovement * displacementLengthInv;
                 fraction = Math.min(Math.max(fraction, 0.0), 1.0);
-                newDisplacement.scaleToRef(fraction, displacement);
-                this._position.addInPlace(displacement);
+                newDisplacement.scaleToRef(fraction, this._tmpVecs[31]);
+                this._position.addInPlace(this._tmpVecs[31]);
                 remainingTime -= solverDeltaTime * fraction;
             }
             else {