Refactor, fix camera collision moving first person body

Author: yohjimane

src/Layers/xrRender/r__dsgraph_build.cpp

@@ -793,7 +793,7 @@ void R_dsgraph_structure::build_subspace()
                 IGameObject* O = g_pGameLevel->CurrentViewEntity();
                 if (O)
                 {
-                    O->RenderBodyWithoutHeadAndArms(context_id, O);
+                    O->RenderFirstPersonBody(context_id, O);
                     CROS_impl* R = (CROS_impl*)O->ROS();
                     if (R)
                         R->update(O);

src/xrEngine/xr_object.h

@@ -308,7 +308,7 @@ class XR_NOVTABLE IGameObject
     virtual void ShouldProcessOnRender(bool should_process) = 0;
     virtual void OnRender() = 0;
 #endif
-    virtual void RenderBodyWithoutHeadAndArms(u32 context_id, IRenderable* root) {};
+    virtual void RenderFirstPersonBody(u32 context_id, IRenderable* root) {};
     virtual void reinit() = 0;
     virtual void reload(pcstr section) = 0;
     // network

src/xrGame/Actor.cpp

@@ -461,6 +461,22 @@ void CActor::Load(LPCSTR section)
     m_sInventoryBoxUseAction = "inventory_box_use";
     //---------------------------------------------------------------------
     m_sHeadShotParticle = READ_IF_EXISTS(pSettings, r_string, section, "HeadShotParticle", 0);
+
+    // initialize bones for first person body
+    m_firstPersonBodyBonesToHide =
+    {
+        { Visual()->dcast_PKinematics()->LL_BoneID("bip01_head"), true},
+        { Visual()->dcast_PKinematics()->LL_BoneID("bip01_neck"), true },
+        { Visual()->dcast_PKinematics()->LL_BoneID("bip01_l_clavicle"), true },
+        { Visual()->dcast_PKinematics()->LL_BoneID("bip01_r_clavicle"), true },
+    };
+
+    m_firstPersonBodyBonesToIgnoreAnims =
+    {
+        { Visual()->dcast_PKinematics()->LL_BoneID("bip01_spine"), true },
+        { Visual()->dcast_PKinematics()->LL_BoneID("bip01_spine1"), true },
+        { Visual()->dcast_PKinematics()->LL_BoneID("bip01_spine2"), true },
+    };
 }
 
 void CActor::PHHit(SHit& H) { m_pPhysics_support->in_Hit(H, false); }
@@ -1513,42 +1529,23 @@ bool CActor::renderable_ShadowGenerate()
 }
 
 extern float g_first_person_body_offset;
-void CActor::RenderBodyWithoutHeadAndArms(u32 context_id, IRenderable* root)
+void CActor::RenderFirstPersonBody(u32 context_id, IRenderable* root)
 {
-    if (!(psActorFlags.test(AF_FIRST_PERSON_BODY)) || cam_active != eacFirstEye)
-        return;
-
-    if (!m_firstPersonBody) // initialize our fp body and bone sets
+    if (!m_firstPersonBody && psActorFlags.test(AF_FIRST_PERSON_BODY) && cam_active == eacFirstEye) // initialize first person body if necessary
     {
         m_firstPersonBody = GEnv.Render->model_Duplicate(Visual());
-        IKinematics* kinematics = m_firstPersonBody->dcast_PKinematics();
-
-        m_firstPersonBodyBonesToHide =
-        {
-            { kinematics->LL_BoneID("bip01_head"), true },
-            { kinematics->LL_BoneID("bip01_neck"), true },
-            { kinematics->LL_BoneID("bip01_l_clavicle"), true },
-            { kinematics->LL_BoneID("bip01_r_clavicle"), true },
-        };
-
-        m_firstPersonBodyBonesToIgnoreAnims =
-        {
-            { kinematics->LL_BoneID("bip01_spine"), true },
-            { kinematics->LL_BoneID("bip01_spine1"), true },
-            { kinematics->LL_BoneID("bip01_spine2"), true },
-        };
-
         g_SetAnimation(mstate_real, true); // Yohji: hacky way to reset anim state / bones when our visual changes
-
         return;
     }
 
     IKinematics* kinematics = m_firstPersonBody->dcast_PKinematics();
+    IKinematics* realBodyK = Visual()->dcast_PKinematics();
 
+    // adjust body position
     Fvector camdir = { cam_Active()->Direction().x, 0.f, cam_Active()->Direction().z }; // ignore Y (vertical) value
     Fmatrix trans = XFORM();
     trans.c.add(camdir.normalize().mul(g_first_person_body_offset)); // push model back so it doesn't look weird (default value: -0.75f)
-    XFORM().translate_over(trans.c); // move our original body to where our first person body is, so shadow render in correct place
+    XFORM().translate_over(trans.c); // move our original body to where our first person body is, so shadow renders in correct place
 
     // Add body to render
     GEnv.Render->add_Visual(context_id, root, m_firstPersonBody, trans);
@@ -1561,14 +1558,18 @@ void CActor::RenderBodyWithoutHeadAndArms(u32 context_id, IRenderable* root)
         if (m_firstPersonBodyBonesToIgnoreAnims[i])
             continue;
 
-        kinematics->LL_GetTransform(i).set(Visual()->dcast_PKinematics()->LL_GetTransform(i));
-        kinematics->LL_GetTransform_R(i).set(Visual()->dcast_PKinematics()->LL_GetTransform_R(i));
+        kinematics->LL_GetTransform(i).set(realBodyK->LL_GetTransform(i));
+        kinematics->LL_GetTransform_R(i).set(realBodyK->LL_GetTransform_R(i));
     }
 
     // Hide bones
     for (auto [boneId, vis] : m_firstPersonBodyBonesToHide)
         kinematics->LL_SetBoneVisible(boneId, !vis, true);
 
+    // Update head position
+    headPosition.set(trans);
+    headPosition.mulB_43(realBodyK->LL_GetTransform(realBodyK->LL_BoneID("bip01_head")));
+
 #ifdef DEBUG
     Fvector ypr;
     trans.getHPB(ypr);
@@ -1577,7 +1578,11 @@ void CActor::RenderBodyWithoutHeadAndArms(u32 context_id, IRenderable* root)
     F->SetAligment(CGameFont::alLeft);
     F->OutSetI(-.9, 0);
     F->SetColor(color_rgba(255, 0, 0, 255));
-    xr_sprintf(text, "fp legs position [%3.3f %3.3f %3.3f] rotation [%3.3f %3.3f %3.3f]", trans.c.x, trans.c.y, trans.c.z, ypr.x, ypr.y, ypr.z);
+    xr_sprintf(text, "first person body position [%3.3f %3.3f %3.3f]", trans.c.x, trans.c.y, trans.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);
+    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);
 #endif // DEBUG
 }

src/xrGame/Actor.h

@@ -102,10 +102,13 @@ class CActor : public CEntityAlive,
     // Render
     void renderable_Render(u32 context_id, IRenderable* root) override;
     virtual bool renderable_ShadowGenerate();
-    virtual void RenderBodyWithoutHeadAndArms(u32 context_id, IRenderable* root);
+    // First person body
+    virtual void RenderFirstPersonBody(u32 context_id, IRenderable* root);
     IRenderVisual* m_firstPersonBody{};
     xr_unordered_map<u16, bool> m_firstPersonBodyBonesToHide;
     xr_unordered_map<u16, bool> m_firstPersonBodyBonesToIgnoreAnims;
+    Fmatrix headPosition{};
+
     void feel_sound_new(IGameObject* who, int type, const CSound_UserDataPtr& user_data,
         const Fvector& position, float power) override;
     virtual Feel::Sound* dcast_FeelSound() { return this; }

src/xrGame/ActorCameras.cpp

@@ -370,7 +370,10 @@ void CActor::cam_Update(float dt, float fFOV)
     }
     if (Level().CurrentEntity() == this)
     {
-        collide_camera(*cameras[eacFirstEye], _viewport_near, this);
+        if (m_firstPersonBody)
+            collide_camera(*cameras[eacFirstEye], _viewport_near, this, headPosition.c);
+        else
+            collide_camera(*cameras[eacFirstEye], _viewport_near, this);
     }
     if (psActorFlags.test(AF_PSP))
     {

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)
+void collide_camera(CCameraBase& camera, float _viewport_near, IPhysicsShellHolder* l_actor, Fvector posOverride)
 {
     // CPhysicsShellHolder* l_actor = smart_cast<CPhysicsShellHolder*>( Level().CurrentEntity() );
     VERIFY(l_actor);
@@ -366,6 +366,9 @@ 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
-    roote->GetGlobalPositionDynamic(&camera.vPosition);
+    if (posOverride.magnitude() > 0.f)
+        roote->GetGlobalPositionDynamic(&posOverride);
+    else
+        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);
+XRPHYSICS_API void collide_camera(CCameraBase& camera, float _viewport_near, IPhysicsShellHolder* l_actor, Fvector posOverride = Fvector{});