NewtonCharacterComponent.enableGravity; FirstPersonViewComponent.dire…

…ction, FirstPersonViewComponent.directionHorizontal, FirstPersonViewComponent.right, FirstPersonViewComponent.up
gecko0307 · Jan 15, 2025 · 31a95bf · 31a95bf
1 parent 858c12e
commit 31a95bf
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/extensions/newton/src/dagon/ext/newton/character.d b/extensions/newton/src/dagon/ext/newton/character.d
@@ -50,11 +50,14 @@ class NewtonCharacterComponent: EntityComponent, NewtonRaycaster
     NewtonSphereShape upperShape;
     NewtonCompoundShape shape;
     NewtonRigidBody rbody;
-    float height;
-    float mass;
+
+    Vector3f gravity = Vector3f(0.0f, -20.0f, 0.0f);
+
     Vector3f targetVelocity = Vector3f(0.0f, 0.0f, 0.0f);
     Matrix4x4f prevTransformation;
 
+    float mass;
+    float height;
     float halfHeight;
     float shapeRadius;
     float minEyeHeight;
@@ -110,7 +113,7 @@ class NewtonCharacterComponent: EntityComponent, NewtonRaycaster
         prevTransformation = Matrix4x4f.identity;
 
         rbody.createUpVectorConstraint(Vector3f(0.0f, 1.0f, 0.0f));
-        rbody.gravity = Vector3f(0.0f, -20.0f, 0.0f);
+        rbody.gravity = gravity;
         NewtonBodySetAutoSleep(rbody.newtonBody, false);
 
         rbody.contactCallback = &onContact;
@@ -286,6 +289,14 @@ class NewtonCharacterComponent: EntityComponent, NewtonRaycaster
             targetEyeHeight = maxEyeHeight;
         }
     }
+
+    void enableGravity(bool mode)
+    {
+        if (mode)
+            rbody.gravity = gravity;
+        else
+            rbody.gravity = Vector3f(0.0f, 0.0f, 0.0f);
+    }
 }
 
 NewtonCharacterComponent makeCharacter(Entity entity, NewtonPhysicsWorld world, float height, float radius, float mass)

diff --git a/src/dagon/ui/firstpersonview.d b/src/dagon/ui/firstpersonview.d
@@ -59,8 +59,16 @@ class FirstPersonViewComponent: EntityComponent
     float pitch = 0.0f;
     float turn = 0.0f;
 
+    Quaternionf orientationV = Quaternionf.identity;
+    Quaternionf orientationH = Quaternionf.identity;
+
     Quaternionf baseOrientation = Quaternionf.identity;
 
+    Vector3f direction = Vector3f(0.0f, 0.0f, 1.0f);
+    Vector3f directionHorizontal = Vector3f(0.0f, 0.0f, 1.0f);
+    Vector3f right = Vector3f(1.0f, 0.0f, 0.0f);
+    Vector3f up = Vector3f(0.0f, 1.0f, 0.0f);
+
     this(EventManager em, Entity e)
     {
         super(em, e);
@@ -147,10 +155,10 @@ class FirstPersonViewComponent: EntityComponent
             prevMouseY = eventManager.mouseY;
         }
 
-        auto rotPitch = rotationQuaternion(Vector3f(1.0f,0.0f,0.0f), degtorad(pitch));
-        auto rotTurn = rotationQuaternion(Vector3f(0.0f,1.0f,0.0f), degtorad(turn));
+        orientationV = rotationQuaternion(Vector3f(1.0f, 0.0f, 0.0f), degtorad(pitch));
+        orientationH = rotationQuaternion(Vector3f(0.0f, 1.0f, 0.0f), degtorad(turn));
 
-        Quaternionf orientation = baseOrientation * rotTurn * rotPitch;
+        Quaternionf orientation = baseOrientation * orientationH * orientationV;
 
         entity.transformation =
             (translationMatrix(entity.position) *
@@ -171,6 +179,11 @@ class FirstPersonViewComponent: EntityComponent
             entity.invAbsoluteTransformation = entity.invTransformation;
             entity.prevAbsoluteTransformation = entity.prevTransformation;
         }
+
+        direction = orientation.rotate(Vector3f(0.0f, 0.0f, 1.0f));
+        directionHorizontal = orientationH.rotate(Vector3f(0.0f, 0.0f, 1.0f));
+        right = orientationH.rotate(Vector3f(1.0f, 0.0f, 0.0f));
+        up = orientationH.rotate(Vector3f(01.0f, 1.0f, 0.0f));
     }
 
     override void onFocusGain()