Revert posOverride from 900c327, offset camera instead of body to resolve IK bugs

Author: yohjimane

src/xrGame/Actor.cpp

@@ -83,7 +83,6 @@ constexpr float default_feedback_duration = 0.2f;
 
 extern float cammera_into_collision_shift;
 extern int g_first_person_death;
-extern float g_first_person_body_offset;
 
 string32 ACTOR_DEFS::g_quick_use_slots[4] = {};
 // skeleton
@@ -1517,16 +1516,7 @@ void CActor::shedule_Update(u32 DT)
 void CActor::renderable_Render(u32 context_id, IRenderable* root)
 {
     VERIFY(_valid(XFORM()));
-
-    if (FirstPersonBodyActive())
-    {
-        ScopeLock lock{ &render_lock };
-        GEnv.Render->add_Visual(context_id, root, Visual(), firstPersonBodyXform);
-        Visual()->getVisData().hom_frame = Device.dwFrame;
-    }
-    else
-        inherited::renderable_Render(context_id, root);
-
+    inherited::renderable_Render(context_id, root);
     CInventoryOwner::renderable_Render(context_id, root);
 }
 
@@ -1567,11 +1557,10 @@ void CActor::RenderFirstPersonBody(u32 context_id, IRenderable* root)
 
     // adjust body position
     Fvector camdir = { cam_Active()->Direction().x, 0.f, cam_Active()->Direction().z }; // ignore Y (vertical) value
-    firstPersonBodyXform = XFORM();
-    firstPersonBodyXform.translate_add(camdir.normalize().mul(g_first_person_body_offset));
+    m_firstPersonBodyXform = XFORM();
 
     // Add body to render
-    GEnv.Render->add_Visual(context_id, root, m_firstPersonBody, firstPersonBodyXform);
+    GEnv.Render->add_Visual(context_id, root, m_firstPersonBody, m_firstPersonBodyXform);
     m_firstPersonBody->getVisData().hom_frame = Device.dwFrame;
 
     // Copy transforms from actual body visual, excluding bones we don't want to animate
@@ -1588,23 +1577,25 @@ void CActor::RenderFirstPersonBody(u32 context_id, IRenderable* root)
     for (auto [boneId, vis] : m_firstPersonBodyBonesToHide)
         kinematics->LL_SetBoneVisible(boneId, !vis, true);
 
-    // Update head position
-    headPosition.set(firstPersonBodyXform);
-    headPosition.mulB_43(realBodyK->LL_GetTransform_R(realBodyK->LL_BoneID("bip01_head")));
+    // Update camera position
+    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)
 
 #ifdef DEBUG
     Fvector ypr;
-    firstPersonBodyXform.getHPB(ypr);
+    m_firstPersonBodyXform.getHPB(ypr);
     string1024 text;
     CGameFont* F = UI().Font().pFontArial14;
     F->SetAligment(CGameFont::alLeft);
     F->OutSetI(-.9, 0);
     F->SetColor(color_rgba(255, 0, 0, 255));
-    xr_sprintf(text, "first person body position [%3.3f %3.3f %3.3f]", firstPersonBodyXform.c.x, firstPersonBodyXform.c.y, firstPersonBodyXform.c.z);
+    xr_sprintf(text, "first person body position [%3.3f %3.3f %3.3f]", m_firstPersonBodyXform.c.x, m_firstPersonBodyXform.c.y, m_firstPersonBodyXform.c.z);
+    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, "first person body direction [%3.3f %3.3f %3.3f]", firstPersonBodyXform.k.x, firstPersonBodyXform.k.y, firstPersonBodyXform.k.z);
+    xr_sprintf(text, "head position [%3.3f %3.3f %3.3f]", m_firstPersonCameraXform.c.x, m_firstPersonCameraXform.c.y, m_firstPersonCameraXform.c.z);
     F->OutNext(text);
-    xr_sprintf(text, "head position [%3.3f %3.3f %3.3f]", headPosition.c.x, headPosition.c.y, headPosition.c.z);
+    xr_sprintf(text, "head direction [%3.3f %3.3f %3.3f]", m_firstPersonCameraXform.k.x, m_firstPersonCameraXform.k.y, m_firstPersonCameraXform.k.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);
     F->OutNext(text);

src/xrGame/Actor.h

@@ -109,8 +109,8 @@ class CActor : public CEntityAlive,
     IRenderVisual* m_firstPersonBody{};
     xr_unordered_map<u16, bool> m_firstPersonBodyBonesToHide;
     xr_unordered_map<u16, bool> m_firstPersonBodyBonesToIgnoreAnims;
-    Fmatrix firstPersonBodyXform{};
-    Fmatrix headPosition{};
+    Fmatrix m_firstPersonBodyXform{};
+    Fmatrix m_firstPersonCameraXform{};
     Lock render_lock{};
 
     void feel_sound_new(IGameObject* who, int type, const CSound_UserDataPtr& user_data,

src/xrGame/ActorCameras.cpp

@@ -24,6 +24,9 @@
 #include "xrPhysics/ActorCameraCollision.h"
 #include "IKLimbsController.h"
 #include "GamePersistent.h"
+#include "Actor.h"
+
+extern Fvector g_first_person_cam_offset;
 
 void CActor::cam_Set(EActorCameras style)
 {
@@ -318,7 +321,6 @@ void CActor::cam_Update(float dt, float fFOV)
     }
 
     Fvector point = { 0, CurrentHeight + current_ik_cam_shift, 0 };
-
     Fvector dangle = {0, 0, 0};
     Fmatrix xform;
     xform.setXYZ(0, r_torso.yaw, 0);
@@ -360,6 +362,22 @@ 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 (!g_Alive()) //first person death cam
+        {
+            point = m_firstPersonCameraXform.c;
+            dangle = m_firstPersonCameraXform.k;
+        }
+        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));
+        }
+    }
+
     C->Update(point, dangle);
     C->f_fov = fFOV;
 
@@ -370,10 +388,7 @@ void CActor::cam_Update(float dt, float fFOV)
     }
     if (Level().CurrentEntity() == this)
     {
-        if (m_firstPersonBody)
-            collide_camera(*cameras[eacFirstEye], _viewport_near, this, headPosition.c);
-        else
-            collide_camera(*cameras[eacFirstEye], _viewport_near, this);
+        collide_camera(*cameras[eacFirstEye], _viewport_near, this);
     }
     if (psActorFlags.test(AF_PSP))
     {

src/xrGame/CameraFirstEye.h

@@ -9,6 +9,7 @@ class CCameraFirstEye : public CCameraBase
     Fvector lookat_point;
     bool lookat_active;
     void UpdateLookat();
+    void UpdateFirstPerson(Fvector& point, Fvector& noise_dangle);
 
 public:
     CCameraFirstEye(IGameObject* p, u32 flags = 0);

src/xrGame/Weapon.cpp

@@ -32,7 +32,6 @@
 #define ROTATION_TIME 0.25f
 
 BOOL b_toggle_weapon_aim = FALSE;
-extern float g_first_person_body_offset;
 
 static class CUIWpnScopeXmlManager : public CUIResetNotifier, public pureAppEnd
 {
@@ -189,13 +188,6 @@ void CWeapon::UpdateXForm()
         mRes.mulA_43(E->XFORM());
     }
 
-    if (auto actorOwner = smart_cast<CActor*>(H_Parent()))
-        if (actorOwner->FirstPersonBodyActive())
-        {
-            Fvector camdir = { actorOwner->cam_Active()->Direction().x, 0.f, actorOwner->cam_Active()->Direction().z }; // ignore Y (vertical) value
-            mRes.c.add(camdir.normalize().mul(g_first_person_body_offset)); // push model back so it doesn't look weird (default value: -0.75f)
-        }
-
     UpdatePosition(mRes);
 }
 

src/xrGame/console_commands.cpp

@@ -112,7 +112,7 @@ int g_first_person_death = 0;
 int g_normalize_mouse_sens = 0;
 int g_normalize_upgrade_mouse_sens = 0;
 
-float g_first_person_body_offset = -0.75f;
+Fvector g_first_person_cam_offset = { 0.f, 0.f, 0.f };
 
 void register_mp_console_commands();
 //-----------------------------------------------------------
@@ -2298,7 +2298,7 @@ void CCC_RegisterCommands()
 
     CMD3(CCC_Mask, "ai_use_torch_dynamic_lights", &g_uCommonFlags, flAiUseTorchDynamicLights);
 
-    CMD4(CCC_Float, "g_first_person_body_offset", &g_first_person_body_offset, -10.f, 10.f);
+    CMD4(CCC_Vector3, "g_first_person_cam_offset", &g_first_person_cam_offset, Fvector().set(-10, -10, -10), Fvector().set(10, 10, 10));
 
 #ifndef MASTER_GOLD
     CMD4(CCC_Vector3, "psp_cam_offset", &CCameraLook2::m_cam_offset, Fvector().set(-1000, -1000, -1000),

src/xrPhysics/ActorCameraCollision.cpp

@@ -332,7 +332,7 @@ bool test_camera_collide(
     return test_camera_box(box_size, xform, l_actor);
 }
 
-void collide_camera(CCameraBase& camera, float _viewport_near, IPhysicsShellHolder* l_actor, Fvector posOverride)
+void collide_camera(CCameraBase& camera, float _viewport_near, IPhysicsShellHolder* l_actor)
 {
     // CPhysicsShellHolder* l_actor = smart_cast<CPhysicsShellHolder*>( Level().CurrentEntity() );
     VERIFY(l_actor);
@@ -366,9 +366,6 @@ void collide_camera(CCameraBase& camera, float _viewport_near, IPhysicsShellHold
     if (dbg_draw_camera_collision)
         shell->dbg_draw_geometry(1, color_xrgb(0, 255, 0));
 #endif
-    if (posOverride.magnitude() > 0.f)
-        roote->GetGlobalPositionDynamic(&posOverride);
-    else
-        roote->GetGlobalPositionDynamic(&camera.vPosition);
+    roote->GetGlobalPositionDynamic(&camera.vPosition);
     camera.vPosition.mad(camera.Direction(), -_viewport_near / 2.f);
 }

src/xrPhysics/ActorCameraCollision.h

@@ -10,4 +10,4 @@ extern XRPHYSICS_API float camera_collision_character_shift_z;
 #endif
 XRPHYSICS_API bool test_camera_box(const Fvector& box_size, const Fmatrix& xform, IPhysicsShellHolder* l_actor);
 XRPHYSICS_API bool test_camera_collide(CCameraBase& camera, float _viewport_near, IPhysicsShellHolder* l_actor, Fvector& vPosOffset, float fBoxSizeMod);  //--#SM+#--
-XRPHYSICS_API void collide_camera(CCameraBase& camera, float _viewport_near, IPhysicsShellHolder* l_actor, Fvector posOverride = Fvector{});
+XRPHYSICS_API void collide_camera(CCameraBase& camera, float _viewport_near, IPhysicsShellHolder* l_actor);