Disallow jumping while forcefully crouching

gecko0307 · Jan 15, 2025 · 858c12e · 858c12e
1 parent 6a52171
commit 858c12e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,7 @@ Dagon 0.19.0 - TBD
   - New package `dagon.collision` - basic collision detection system
 - **Extensions**
   - `dagon:newton`:
-    - `NewtonCharacterComponent` improvements
+    - `NewtonCharacterComponent` improvements: new method `crouch` and better ground check. The origin of the character is now its feet point instead of the barycenter
     - `NewtonRigidBody.sensorCallback`, `NewtonRigidBody.contactCallback`
   - `dagon:ftfont`:
     - Rename the Windows library to `freetype-6.dll`.

diff --git a/extensions/newton/src/dagon/ext/newton/character.d b/extensions/newton/src/dagon/ext/newton/character.d
@@ -68,7 +68,7 @@ class NewtonCharacterComponent: EntityComponent, NewtonRaycaster
     bool isJumping = false;
     bool isFalling = false;
     bool isCrouching = false;
-    bool forcefullyCrouching = false;
+    bool isForcefullyCrouching = false;
 
     Vector3f groundPosition = Vector3f(0.0f, 0.0f, 0.0f);
     Vector3f groundContactPosition = Vector3f(0.0f, 0.0f, 0.0f);
@@ -224,19 +224,19 @@ class NewtonCharacterComponent: EntityComponent, NewtonRaycaster
 
         if (shouldCrouch)
         {
-            if (!isCrouching && !forcefullyCrouching)
+            if (!isCrouching && !isForcefullyCrouching)
             {
-                forcefullyCrouching = true;
+                isForcefullyCrouching = true;
                 NewtonBodySetCollision(rbody.newtonBody, lowerShape.newtonCollision);
             }
 
             targetEyeHeight = minEyeHeight;
         }
         else
         {
-            if (!isCrouching && forcefullyCrouching)
+            if (!isCrouching && isForcefullyCrouching)
             {
-                forcefullyCrouching = false;
+                isForcefullyCrouching = false;
                 NewtonBodySetCollision(rbody.newtonBody, shape.newtonCollision);
                 targetEyeHeight = maxEyeHeight;
             }
@@ -252,7 +252,7 @@ class NewtonCharacterComponent: EntityComponent, NewtonRaycaster
 
     void jump(float height)
     {
-        if (onGround)
+        if (onGround && !isCrouching && !isForcefullyCrouching)
         {
             onGround = false;
             float jumpSpeed = sqrt(2.0f * height * -rbody.gravity.y);