Merge branch 'master' of https://github.com/gecko0307/dagon

gecko0307 · Oct 10, 2021 · 0e7f387 · 0e7f387
2 parents ddc35ca + 2dc926c
commit 0e7f387
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/extensions/newton/src/dagon/ext/newton/rigidbody.d b/extensions/newton/src/dagon/ext/newton/rigidbody.d
@@ -159,9 +159,9 @@ class NewtonRigidBody: Owner
         torque += t;
     }
 
-    void createUpVectorConstraint(Vector3f up)
+    NewtonJoint* createUpVectorConstraint(Vector3f up)
     {
-        NewtonJoint* joint = NewtonConstraintCreateUpVector(world.newtonWorld, up.arrayof.ptr, newtonBody);
+        return NewtonConstraintCreateUpVector(world.newtonWorld, up.arrayof.ptr, newtonBody);
     }
 
     void velocity(Vector3f v) @property
@@ -176,6 +176,11 @@ class NewtonRigidBody: Owner
         return v;
     }
 
+    void addImpulse(Vector3f deltaVelocity, Vector3f impulsePoint, double dt)
+    {
+        NewtonBodyAddImpulse(newtonBody, deltaVelocity.arrayof.ptr, impulsePoint.arrayof.ptr, dt);
+    }
+
     void onCollision(NewtonRigidBody otherBody)
     {
         collisionCallback(this, otherBody);

diff --git a/src/dagon/ui/firstpersonview.d b/src/dagon/ui/firstpersonview.d
@@ -57,6 +57,8 @@ class FirstPersonViewComponent: EntityComponent
     float pitchLimitMax = 60.0f;
     float pitchLimitMin = -60.0f;
 
+    Quaternionf baseOrientation = Quaternionf.identity;
+
     this(EventManager em, Entity e)
     {
         super(em, e);
@@ -100,12 +102,12 @@ class FirstPersonViewComponent: EntityComponent
         auto rotPitch = rotationQuaternion(Vector3f(1.0f,0.0f,0.0f), degtorad(pitch));
         auto rotTurn = rotationQuaternion(Vector3f(0.0f,1.0f,0.0f), degtorad(turn));
 
-        Quaternionf q = rotTurn * rotPitch;
+        Quaternionf orientation = baseOrientation * rotTurn * rotPitch;
 
         entity.transformation =
-            translationMatrix(entity.position) *
-            q.toMatrix4x4 *
-            scaleMatrix(entity.scaling);
+            (translationMatrix(entity.position) *
+            orientation.toMatrix4x4 *
+            scaleMatrix(entity.scaling));
 
         entity.invTransformation = entity.transformation.inverse;