Fix cutscene hands dissapearing if too far from start

mnelenpridumivat · Dec 29, 2024 · 916132a · 916132a
1 parent bb73e1a
commit 916132a
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 50 deletions.
diff --git a/src/Editors/xrECore/Editor/ExportSkeleton.cpp b/src/Editors/xrECore/Editor/ExportSkeleton.cpp
@@ -1083,6 +1083,7 @@ bool CExportSkeleton::ExportMotionKeys(IWriter& F)
 		// free temp storage
 		for (int itm_idx=0; itm_idx<b_lst.size(); ++itm_idx)
 		{
+
 			bm_item& BM 	= items[itm_idx];
 			// check T
 			R_ASSERT		(dwLen);

diff --git a/src/Layers/xrRender/r__dsgraph_build.cpp b/src/Layers/xrRender/r__dsgraph_build.cpp
@@ -32,7 +32,7 @@ ICF	float	CalcSSA				(float& distSQ, Fvector& C, float R)
 	return	R/distSQ;
 }
 
-void R_dsgraph_structure::r_dsgraph_insert_dynamic	(dxRender_Visual *pVisual, Fvector& Center)
+void R_dsgraph_structure::r_dsgraph_insert_dynamic	(dxRender_Visual *pVisual, Fvector& Center, bool Force)
 {
 	CRender&	RI			=	RImplementation;
 
@@ -46,7 +46,7 @@ void R_dsgraph_structure::r_dsgraph_insert_dynamic	(dxRender_Visual *pVisual, Fv
 
 	float distSQ			;
 	float SSA				=	CalcSSA		(distSQ,Center,pVisual);
-	if (SSA<=r_ssaDISCARD)		return;
+	if (SSA<=r_ssaDISCARD && !Force)		return;
 
 	// Distortive geometry should be marked and R2 special-cases it
 	// a) Allow to optimize RT order
@@ -883,7 +883,7 @@ IC bool IsValuableToRender(dxRender_Visual* pVisual, bool isStatic, bool sm,
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-void CRender::add_leafs_Dynamic	(dxRender_Visual *pVisual, bool ignore)
+void CRender::add_leafs_Dynamic	(dxRender_Visual *pVisual, bool ignore, bool Force)
 {
 	PROF_EVENT("add_leafs_Dynamic")
 	if (0==pVisual)				return;
@@ -938,7 +938,7 @@ void CRender::add_leafs_Dynamic	(dxRender_Visual *pVisual, bool ignore)
 #endif
 				I = pV->children.begin		();
 				E = pV->children.end		();
-				for (; I!=E; I++)	add_leafs_Dynamic	(*I, ignore);
+				for (; I!=E; I++)	add_leafs_Dynamic	(*I, ignore, Force);
 			}
 		}
 		return;
@@ -948,7 +948,7 @@ void CRender::add_leafs_Dynamic	(dxRender_Visual *pVisual, bool ignore)
 			// Calculate distance to it's center
 			Fvector							Tpos;
 			val_pTransform->transform_tiny	(Tpos, pVisual->vis.sphere.P);
-			r_dsgraph_insert_dynamic		(pVisual,Tpos);
+			r_dsgraph_insert_dynamic		(pVisual,Tpos, Force);
 		}
 		return;
 	}
@@ -1046,7 +1046,7 @@ void CRender::add_leafs_Static(dxRender_Visual *pVisual)
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL CRender::add_Dynamic(dxRender_Visual *pVisual, u32 planes)
+BOOL CRender::add_Dynamic(dxRender_Visual *pVisual, u32 planes, bool Force)
 {
 	PROF_EVENT("add_Dynamic")
 	if (!pVisual->_ignore_optimization &&
@@ -1124,7 +1124,7 @@ BOOL CRender::add_Dynamic(dxRender_Visual *pVisual, u32 planes)
 #endif
 				I = pV->children.begin		();
 				E = pV->children.end		();
-				for (; I!=E; I++)	add_leafs_Dynamic	(*I);
+				for (; I!=E; I++)	add_leafs_Dynamic	(*I, false, Force);
 			}
 			/*
 			I = pV->children.begin		();

diff --git a/src/Layers/xrRender/r__dsgraph_structure.h b/src/Layers/xrRender/r__dsgraph_structure.h
@@ -159,7 +159,7 @@ class	R_dsgraph_structure										: public IRender_interface, public pureFrame
 
 	void		r_pmask											(bool _1, bool _2, bool _wm=false)				{ pmask[0]=_1; pmask[1]=_2;	pmask_wmark = _wm; }
 
-	void		r_dsgraph_insert_dynamic						(dxRender_Visual	*pVisual, Fvector& Center);
+	void		r_dsgraph_insert_dynamic						(dxRender_Visual	*pVisual, Fvector& Center, bool Force = false);
 	void		r_dsgraph_insert_static							(dxRender_Visual	*pVisual);
 
 	void		r_dsgraph_render_landscape						(u32 pass, bool bClear);

diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.cpp b/src/Layers/xrRenderPC_R1/FStaticRender.cpp
@@ -231,10 +231,10 @@ BOOL					CRender::occ_visible			(vis_data& P)		{ return HOM.visible(P);								}
 BOOL					CRender::occ_visible			(sPoly& P)			{ return HOM.visible(P);								}
 BOOL					CRender::occ_visible			(Fbox& P)			{ return HOM.visible(P);								}
 ENGINE_API	extern BOOL g_bRendering;
-void					CRender::add_Visual				(IRenderVisual* V, bool ignore_opt)
+void					CRender::add_Visual				(IRenderVisual* V, bool ignore_opt, bool Force)
 {
 	VERIFY				(g_bRendering);
-	add_leafs_Dynamic	((dxRender_Visual*)V, ignore_opt);
+	add_leafs_Dynamic	((dxRender_Visual*)V, ignore_opt, Force);
 }
 void					CRender::add_Geometry			(IRenderVisual* V ){ add_Static((dxRender_Visual*)V,View->getMask());						}
 void					CRender::add_StaticWallmark		(ref_shader& S, const Fvector& P, float s, CDB::TRI* T, Fvector* verts)

diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.h b/src/Layers/xrRenderPC_R1/FStaticRender.h
@@ -94,9 +94,9 @@ class CRender													:	public R_dsgraph_structure
 	void								LoadSectors				(IReader *fs);
 	void								LoadSWIs				(CStreamReader	*fs);
 
-	BOOL								add_Dynamic				(dxRender_Visual	*pVisual, u32 planes);		// normal processing
+	BOOL								add_Dynamic				(dxRender_Visual	*pVisual, u32 planes, bool Force = false);		// normal processing
 	void								add_Static				(dxRender_Visual	*pVisual, u32 planes);
-	void								add_leafs_Dynamic		(dxRender_Visual	*pVisual, bool ignore = false); // if detected node's full visibility
+	void								add_leafs_Dynamic		(dxRender_Visual	*pVisual, bool ignore = false, bool Force = false); // if detected node's full visibility
 	void								add_leafs_Static		(dxRender_Visual	*pVisual);						// if detected node's full visibility
 
 public:
@@ -158,7 +158,7 @@ class CRender													:	public R_dsgraph_structure
 	virtual void					flush					();
 	virtual void					set_Object				(IRenderable*		O	);
 	virtual	void					add_Occluder			(Fbox2&	bb_screenspace	);			// mask screen region as oclluded
-	virtual void					add_Visual				(IRenderVisual*	V, bool ignore_opt = false);			// add visual leaf (no culling performed at all)
+	virtual void					add_Visual				(IRenderVisual*	V, bool ignore_opt = false, bool Force = false);			// add visual leaf (no culling performed at all)
 	virtual void					add_Geometry			(IRenderVisual*	V	);			// add visual(s)	(all culling performed)
 
 	// wallmarks

diff --git a/src/Layers/xrRenderPC_R2/r2.cpp b/src/Layers/xrRenderPC_R2/r2.cpp
@@ -415,7 +415,7 @@ BOOL					CRender::occ_visible			(vis_data& P)		{ return HOM.visible(P);								}
 BOOL					CRender::occ_visible			(sPoly& P)			{ return HOM.visible(P);								}
 BOOL					CRender::occ_visible			(Fbox& P)			{ return HOM.visible(P);								}
 
-void					CRender::add_Visual				(IRenderVisual*		V, bool ignore_opt)	{ add_leafs_Dynamic((dxRender_Visual*)V, ignore_opt);								}
+void					CRender::add_Visual				(IRenderVisual*		V, bool ignore_opt, bool Force)	{ add_leafs_Dynamic((dxRender_Visual*)V, ignore_opt, Force);								}
 void					CRender::add_Geometry			(IRenderVisual*		V )	{ add_Static((dxRender_Visual*)V,View->getMask());					}
 void					CRender::add_StaticWallmark		(ref_shader& S, const Fvector& P, float s, CDB::TRI* T, Fvector* verts)
 {

diff --git a/src/Layers/xrRenderPC_R2/r2.h b/src/Layers/xrRenderPC_R2/r2.h
@@ -137,9 +137,9 @@ class CRender													:	public R_dsgraph_structure
 	void							LoadSectors					(IReader	*fs);
 	void							LoadSWIs					(CStreamReader	*fs);
 
-	BOOL							add_Dynamic					(dxRender_Visual*pVisual, u32 planes);		// normal processing
+	BOOL							add_Dynamic					(dxRender_Visual*pVisual, u32 planes, bool Force = false);		// normal processing
 	void							add_Static					(dxRender_Visual*pVisual, u32 planes);
-	void							add_leafs_Dynamic			(dxRender_Visual*pVisual, bool ignore = false); // if detected node's full visibility
+	void							add_leafs_Dynamic			(dxRender_Visual*pVisual, bool ignore = false, bool Force = false); // if detected node's full visibility
 	void							add_leafs_Static			(dxRender_Visual*pVisual);						// if detected node's full visibility
 
 public:
@@ -245,7 +245,7 @@ class CRender													:	public R_dsgraph_structure
 	virtual void					flush						();
 	virtual void					set_Object					(IRenderable*		O	);
 	virtual	void					add_Occluder				(Fbox2&	bb_screenspace	);			// mask screen region as oclluded
-	virtual void					add_Visual					(IRenderVisual*	V, bool ignore_opt = false);			// add visual leaf	(no culling performed at all)
+	virtual void					add_Visual					(IRenderVisual*	V, bool ignore_opt = false, bool Force = false);			// add visual leaf	(no culling performed at all)
 	virtual void					add_Geometry				(IRenderVisual*	V	);			// add visual(s)	(all culling performed)
 
 	// wallmarks

diff --git a/src/Layers/xrRenderPC_R4/r4.cpp b/src/Layers/xrRenderPC_R4/r4.cpp
@@ -463,8 +463,8 @@ BOOL CRender::occ_visible(Fbox& P) {
 	return HOM.visible(P);
 }
 
-void CRender::add_Visual(IRenderVisual* V, bool ignore_opt) {
-	add_leafs_Dynamic((dxRender_Visual*)V, ignore_opt);
+void CRender::add_Visual(IRenderVisual* V, bool ignore_opt, bool Force) {
+	add_leafs_Dynamic((dxRender_Visual*)V, ignore_opt, Force);
 }
 void CRender::add_Geometry(IRenderVisual* V) {
 	add_Static((dxRender_Visual*)V, View->getMask());

diff --git a/src/Layers/xrRenderPC_R4/r4.h b/src/Layers/xrRenderPC_R4/r4.h
@@ -137,9 +137,9 @@ class CRender	:	public R_dsgraph_structure
 	void							LoadSWIs					(CStreamReader	*fs);
 	void							Load3DFluid					();
 
-	BOOL							add_Dynamic					(dxRender_Visual*pVisual, u32 planes);		// normal processing
+	BOOL							add_Dynamic					(dxRender_Visual*pVisual, u32 planes, bool Force = false);		// normal processing
 	void							add_Static					(dxRender_Visual*pVisual, u32 planes);
-	void							add_leafs_Dynamic			(dxRender_Visual*pVisual, bool ignore = false);	// if detected node's full visibility
+	void							add_leafs_Dynamic			(dxRender_Visual*pVisual, bool ignore = false, bool Force = false);	// if detected node's full visibility
 	void							add_leafs_Static			(dxRender_Visual*pVisual);						// if detected node's full visibility
 
 public:
@@ -260,7 +260,7 @@ class CRender	:	public R_dsgraph_structure
 	virtual void					flush						();
 	virtual void					set_Object					(IRenderable*		O	);
 	virtual	void					add_Occluder				(Fbox2&	bb_screenspace	);			// mask screen region as oclluded
-	virtual void					add_Visual					(IRenderVisual*	V, bool ignore_opt = false);			// add visual leaf	(no culling performed at all)
+	virtual void					add_Visual					(IRenderVisual*	V, bool ignore_opt = false, bool Force = false);			// add visual leaf	(no culling performed at all)
 	virtual void					add_Geometry				(IRenderVisual*	V	);			// add visual(s)	(all culling performed)
 
 	// wallmarks

diff --git a/src/xrEngine/Render.h b/src/xrEngine/Render.h
@@ -246,7 +246,7 @@ class	ENGINE_API	IRender_interface
 	virtual void					flush					()											{};	
 	virtual void					set_Object				(IRenderable*		O	)					{};
 	virtual	void					add_Occluder			(Fbox2&	bb_screenspace	)					{};	// mask screen region as oclluded (-1..1, -1..1)
-	virtual void					add_Visual				(IRenderVisual*	V, bool ignore_opt = false)	{};	// add visual leaf	(no culling performed at all)
+	virtual void					add_Visual				(IRenderVisual*	V, bool ignore_opt = false, bool Force = false)	{};	// add visual leaf	(no culling performed at all)
 	virtual void					add_Geometry			(IRenderVisual*	V	)					{};	// add visual(s)	(all culling performed)
 	virtual void					add_StaticWallmark		(const wm_shader& S, const Fvector& P, float s, CDB::TRI* T, Fvector* V) {};
 

diff --git a/src/xrGame/Actor.cpp b/src/xrGame/Actor.cpp
@@ -1724,7 +1724,6 @@ void CActor::OnHUDDraw	(CCustomHUD* Z)
 	if(auto pGameObject = smart_cast<CGameObject*>(Holder())) {
 		pGameObject->OnHUDDraw(Z);
 	}
-	CCutsceneManager::GetInstance().Update();
 #if 0//ndef NDEBUG
 	if (Level().CurrentControlEntity() == this && g_ShowAnimationInfo)
 	{

diff --git a/src/xrGame/CutsceneManager.cpp b/src/xrGame/CutsceneManager.cpp
@@ -34,11 +34,6 @@ void CCutsceneManager::PlayCutscene(LPCSTR section)
 
 	R_ASSERT3(M2.valid(), "model has no motion [idle] ", pSettings->r_string(section, "anim"));
 
-	//u16 root_id = Self.HudModelKinematics->LL_GetBoneRoot();
-	//CBoneInstance& root_binst = Self.HudModelKinematics->LL_GetBoneInstance(root_id);
-	//root_binst.set_callback_overwrite(true);
-	//root_binst.mTransform.identity();
-
 	u16 pc = Self.HudModelKinematicsAnimated->partitions().count();
 	for (u16 pid = 0; pid < pc; ++pid)
 	{
@@ -54,27 +49,10 @@ void CCutsceneManager::Update()
 		::Render->set_HUD(false);
 		Fmatrix	m_transform;
 		m_transform.identity();
-		//m_transform.i = Device.vCameraRight;
-		//m_transform.j = Device.vCameraTop;// -Device.vCameraDirection;//Device.vCameraTop;
-		//m_transform.k = Device.vCameraDirection;// Device.vCameraTop; //Device.vCameraDirection;
-		//m_transform.c = Device.vCameraPosition;
-		//::Render->set_Transform(&m_transform);
-		//Actor()->Cameras().hud_camera_Matrix(m_transform);
-		//auto Pos = m_transform.c;
-		//m_transform.rotateX(90);
-		//m_transform.c.y += 100;
-		//m_transform = HudModelKinematics->LL_GetTransform(HudModelKinematics->LL_GetBoneRoot());
-		//m_transform.build_camera_dir(Device.vCameraPosition, Device.vCameraDirection, Device.vCameraTop);
-		::Render->set_Transform(&m_transform);
 		HudModelKinematics->CalculateBones(true);
-		::Render->add_Visual(HudModel, true);
+
+		::Render->set_Transform(&m_transform);
+		::Render->add_Visual(HudModel, true, true);
 		::Render->set_HUD(bHud);
-		for (u16 i = 0; i < HudModelKinematics->LL_BoneCount(); ++i) {
-			Fmatrix l_ball = HudModelKinematics->LL_GetTransform(i);
-			auto Pos = l_ball.c;
-			l_ball.scale(0.01, 0.01, 0.01);
-			l_ball.c = Pos;
-			Level().debug_renderer().draw_ellipse(l_ball, color_xrgb(0, 255, 255));
-		}
 	}
 }
diff --git a/src/xrGame/HUDManager.cpp b/src/xrGame/HUDManager.cpp
@@ -17,6 +17,7 @@
 #include "PHDebug.h"
 #endif
 #include "../../xrUI/UIFontDefines.h"
+#include <CutsceneManager.h>
 
 extern CUIGameCustom* CurrentGameUI() {return HUD().GetGameUI();}
 
@@ -90,12 +91,15 @@ bool need_render_hud()
 
 void CHUDManager::Render_Last()
 {
+	CObject* O = g_pGameLevel->CurrentViewEntity();
+	::Render->set_Object(O->H_Root());
+	CCutsceneManager::GetInstance().Update();
+
 	if (!psHUD_Flags.is(HUD_WEAPON|HUD_WEAPON_RT|HUD_WEAPON_RT2|HUD_DRAW_RT2))return;
 	if (0==pUIGame)					return;
 
 	if(!need_render_hud())			return;
 
-	CObject*	O					= g_pGameLevel->CurrentViewEntity();
 	// hud itself
 	::Render->set_HUD				(TRUE);
 	::Render->set_Object			(O->H_Root());