Better first person death cam WIP

Author: yohjimane

src/xrGame/Actor.cpp

@@ -1532,7 +1532,7 @@ bool CActor::FirstPersonBodyEnabled()
 
 bool CActor::FirstPersonBodyActive() 
 {
-    return m_firstPersonBody && FirstPersonBodyEnabled();
+    return m_firstPersonBody;
 }
 
 void CActor::RenderFirstPersonBody(u32 context_id, IRenderable* root)
@@ -1553,7 +1553,6 @@ void CActor::RenderFirstPersonBody(u32 context_id, IRenderable* root)
     IKinematics* realBodyK = Visual()->dcast_PKinematics();
 
     // adjust body position
-    Fvector camdir = { cam_Active()->Direction().x, 0.f, cam_Active()->Direction().z }; // ignore Y (vertical) value
     m_firstPersonBodyXform = XFORM();
 
     // Add body to render
@@ -1604,13 +1603,20 @@ void CActor::RenderFirstPersonBody(u32 context_id, IRenderable* root)
         kinematics->LL_SetBoneVisible(boneId, hide ? FALSE : TRUE, TRUE);
     }
 
-    // Update camera position
+    // Update FP camera position
+    Fmatrix head_bone_xform;
+    Fmatrix BoneMatrixRes;
+    Fmatrix BoneMatrix;
+    Fobb BoneOBB = kinematics->LL_GetBox(kinematics->LL_BoneID("bip01_head"));
+    BoneOBB.xform_full(head_bone_xform);
+    BoneMatrixRes.mul(kinematics->LL_GetTransform(kinematics->LL_BoneID("bip01_head")), head_bone_xform);
+    head_bone_xform.mul(m_firstPersonBodyXform, BoneMatrixRes);
+
+    //m_firstPersonCameraXform.set(head_bone_xform);
     m_firstPersonCameraXform.set(m_firstPersonBodyXform);
-    m_firstPersonCameraXform.mulB_43(realBodyK->LL_GetTransform(realBodyK->LL_BoneID("eyelid_1"))); // should be a bone that is inbetween the eye bones (maybe more accurate than using bip01_head)
+    m_firstPersonCameraXform.mulB_43(realBodyK->LL_GetTransform(realBodyK->LL_BoneID("bip01_head")));
 
 #ifdef DEBUG
-    Fvector ypr;
-    m_firstPersonBodyXform.getHPB(ypr);
     string1024 text;
     CGameFont* F = UI().Font().pFontArial14;
     F->SetAligment(CGameFont::alLeft);
@@ -1620,13 +1626,17 @@ void CActor::RenderFirstPersonBody(u32 context_id, IRenderable* root)
     F->OutNext(text);
     xr_sprintf(text, "first person body direction [%3.3f %3.3f %3.3f]", m_firstPersonBodyXform.k.x, m_firstPersonBodyXform.k.y, m_firstPersonBodyXform.k.z);
     F->OutNext(text);
-    xr_sprintf(text, "head position [%3.3f %3.3f %3.3f]", m_firstPersonCameraXform.c.x, m_firstPersonCameraXform.c.y, m_firstPersonCameraXform.c.z);
+    xr_sprintf(text, "m_firstPersonCameraXform pos [%3.3f %3.3f %3.3f]", m_firstPersonCameraXform.c.x, m_firstPersonCameraXform.c.y, m_firstPersonCameraXform.c.z);
+    F->OutNext(text);
+    xr_sprintf(text, "m_firstPersonCameraXform dir [%3.3f %3.3f %3.3f]", m_firstPersonCameraXform.k.x, m_firstPersonCameraXform.k.y, m_firstPersonCameraXform.k.z);
+    F->OutNext(text);
+    xr_sprintf(text, "m_firstPersonCameraXform norm [%3.3f %3.3f %3.3f]", m_firstPersonCameraXform.j.x, m_firstPersonCameraXform.j.y, m_firstPersonCameraXform.j.z);
     F->OutNext(text);
-    xr_sprintf(text, "head direction [%3.3f %3.3f %3.3f]", m_firstPersonCameraXform.k.x, m_firstPersonCameraXform.k.y, m_firstPersonCameraXform.k.z);
+    xr_sprintf(text, "cameras[eacFirstEye] vPosition [%3.3f %3.3f %3.3f]", cameras[eacFirstEye]->vPosition.x, cameras[eacFirstEye]->vPosition.y, cameras[eacFirstEye]->vPosition.z);
     F->OutNext(text);
-    xr_sprintf(text, "camera position [%3.3f %3.3f %3.3f]", cam_Active()->Position().x, cam_Active()->Position().y, cam_Active()->Position().z);
+    xr_sprintf(text, "cameras[eacFirstEye] vDirection [%3.3f %3.3f %3.3f]", cameras[eacFirstEye]->vDirection.x, cameras[eacFirstEye]->vDirection.y, cameras[eacFirstEye]->vDirection.z);
     F->OutNext(text);
-    xr_sprintf(text, "camera direction [%3.3f %3.3f %3.3f]", cam_Active()->Direction().x, cam_Active()->Direction().y, cam_Active()->Direction().z);
+    xr_sprintf(text, "cameras[eacFirstEye] vNormal [%3.3f %3.3f %3.3f]", cameras[eacFirstEye]->vNormal.x, cameras[eacFirstEye]->vNormal.y, cameras[eacFirstEye]->vNormal.z);
     F->OutNext(text);
 #endif // DEBUG
 }

src/xrGame/Actor.h

@@ -111,6 +111,8 @@ class CActor : public CEntityAlive,
     xr_unordered_map<u16, bool> m_firstPersonBodyBonesToIgnoreAnims;
     Fmatrix m_firstPersonBodyXform{};
     Fmatrix m_firstPersonCameraXform{};
+    Fvector m_firstPersonCameraRot{};
+
     Lock render_lock{};
 
     void feel_sound_new(IGameObject* who, int type, const CSound_UserDataPtr& user_data,

src/xrGame/ActorCameras.cpp

@@ -362,37 +362,46 @@ void CActor::cam_Update(float dt, float fFOV)
 
     CCameraBase* C = cam_Active();
 
-    if (psActorFlags.test(AF_FIRST_PERSON_BODY) && eacFirstEye == cam_active) // override camera position / direction for first person body
+    if (FirstPersonBodyActive()) // update camera position with offset for first person body
     {
-        if (!g_Alive()) //first person death cam
-        {
-            point = m_firstPersonCameraXform.c;
-        }
-        else
-        {
-            point = m_firstPersonCameraXform.c;
-            point.y += g_first_person_cam_offset.y;
-            Fvector camdir = { cam_Active()->Direction().x, 0.f, cam_Active()->Direction().z }; // ignore Y (vertical) value
-            point.add(camdir.normalize().mul(g_first_person_cam_offset.z));
-        }
+        point = m_firstPersonCameraXform.c;
+        point.y += g_first_person_cam_offset.y;
+        Fvector camdir = { cam_Active()->Direction().x, 0.f, cam_Active()->Direction().z };
+        point.add(camdir.normalize().mul(g_first_person_cam_offset.z));
     }
 
     C->Update(point, dangle);
-
-    if (psActorFlags.test(AF_FIRST_PERSON_BODY) && eacFirstEye == cam_active && !g_Alive()) // manually update position for first person death because it gets overridden in `Update`
-        C->vDirection.set(m_firstPersonCameraXform.k);
-
     C->f_fov = fFOV;
 
     if (eacFirstEye != cam_active)
     {
         cameras[eacFirstEye]->Update(point, dangle);
         cameras[eacFirstEye]->f_fov = fFOV;
     }
-    if (Level().CurrentEntity() == this)
+    
+    if (FirstPersonBodyActive() && !g_Alive()) // override camera position / direction for first person body on death
     {
-        collide_camera(*cameras[eacFirstEye], _viewport_near, this);
+        Fvector point2 = m_firstPersonCameraXform.c;
+        point2.y += g_first_person_cam_offset.y;
+        Fvector camdir = { cameras[eacFirstEye]->Direction().x, 0.f, cameras[eacFirstEye]->Direction().z };
+        if (!fis_zero(g_first_person_cam_offset.z))
+            point2.add(camdir.normalize().mul(g_first_person_cam_offset.z));
+
+        _viewport_near = VIEWPORT_NEAR - 0.08f;
+        cameras[eacFirstEye]->Update(point2, dangle);
+        cameras[eacFirstEye]->f_fov = fFOV;
+        if (m_firstPersonCameraXform.k.magnitude() > 0.f)
+        {
+            point2.mad(m_firstPersonCameraXform.i, .15f);
+            cameras[eacFirstEye]->vDirection.set(m_firstPersonCameraXform.k);
+            cameras[eacFirstEye]->vNormal.set(m_firstPersonCameraXform.i);
+            cameras[eacFirstEye]->vPosition.set(point2);
+        }
     }
+
+    else if (Level().CurrentEntity() == this)
+        collide_camera(*cameras[eacFirstEye], _viewport_near, this);
+
     if (psActorFlags.test(AF_PSP))
     {
         Cameras().UpdateFromCamera(C);

src/xrGame/CameraFirstEye.cpp

@@ -75,6 +75,10 @@ void CCameraFirstEye::Update(Fvector& point, Fvector& noise_dangle)
 
 void CCameraFirstEye::Move(int cmd, float val, float factor)
 {
+    CActor* pActor = smart_cast<CActor*>(parent);
+    if (pActor && !pActor->g_Alive() && pActor->FirstPersonBodyEnabled())
+        return;
+
     if (bClampPitch)
     {
         while (pitch < lim_pitch[0])

src/xrGame/CharacterPhysicsSupport.cpp

@@ -723,7 +723,9 @@ bool CCharacterPhysicsSupport::CollisionCorrectObjPos(const Fvector& start_from,
         activation_res, vbox, activation_pos, mXFORM, not_collide_characters, set_rotation, &m_EntityAlife);
     //////////////////
 
-    m_EntityAlife.Position().sub(activation_res, shift);
+    auto actor = smart_cast<CActor*>(&m_EntityAlife);
+    if (!(actor && actor->FirstPersonBodyEnabled() && !actor->g_Alive()))
+        m_EntityAlife.Position().sub(activation_res, shift);
 
     if (m_pPhysicsShell)
         m_pPhysicsShell->EnableCollision();