Revert "Actor shadow added" (compilation/conventions).

This reverts commit 049dfca.
OpenXRay · Sep 27, 2014 · 759ef01 · 759ef01
1 parent 3fceb1e
commit 759ef01
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 41 deletions.
diff --git a/src/Layers/xrRender/r__dsgraph_render.cpp b/src/Layers/xrRender/r__dsgraph_render.cpp
@@ -715,9 +715,6 @@ void	R_dsgraph_structure::r_dsgraph_render_subspace	(IRender_Sector* _sector, CF
 				renderable->renderable_Render	();
 			}
 		}
-  #if RENDER!=R_R1
-    if (g_pGameLevel && (phase==RImplementation.PHASE_SMAP) && ps_common_flags.test(RFLAG_ACTOR_SHADOW)) g_pGameLevel->pHUD->Render_Actor_Shadow(); // Actor Shadow
-  #endif      
 	}
 
 	// Restore

diff --git a/src/Layers/xrRender/xrRender_console.cpp b/src/Layers/xrRender/xrRender_console.cpp
@@ -701,9 +701,7 @@ void		xrRender_initconsole	()
 #endif // DEBUG
 
 	CMD2(CCC_tf_Aniso,	"r__tf_aniso",			&ps_r__tf_Anisotropic		); //	{1..16}
-
-  CMD3(CCC_Mask,  "r__actor_shadow", &ps_common_flags, RFLAG_ACTOR_SHADOW );  //Swartz27
-
+
 	// R1
 	CMD4(CCC_Float,		"r1_ssa_lod_a",			&ps_r1_ssaLOD_A,			16,		96		);
 	CMD4(CCC_Float,		"r1_ssa_lod_b",			&ps_r1_ssaLOD_B,			16,		64		);

diff --git a/src/Layers/xrRender/xrRender_console.h b/src/Layers/xrRender/xrRender_console.h
@@ -195,11 +195,6 @@ enum
 	R2FLAGEXT_SUN_OLD				= (1<<9),
 };
 
-enum
-{
-  RFLAG_ACTOR_SHADOW = (1<<0),
-};
-
 extern void						xrRender_initconsole	();
 extern BOOL						xrRender_test_hw		();
 extern void						xrRender_apply_tf		();

diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.cpp b/src/Layers/xrRenderPC_R1/FStaticRender.cpp
@@ -439,8 +439,7 @@ void CRender::Calculate				()
 
 			// Determine visibility for dynamic part of scene
 			set_Object							(0);
-			//g_hud->Render_First					( );	// R1 shadows
-      if (ps_common_flags.test(RFLAG_ACTOR_SHADOW)) g_hud->Render_First ( ); // R1 shadows
+			g_hud->Render_First					( );	// R1 shadows
 			g_hud->Render_Last					( );	
 			u32 uID_LTRACK						= 0xffffffff;
 			if (phase==PHASE_NORMAL)			{

diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.h b/src/Layers/xrRenderPC_R1/FStaticRender.h
@@ -207,7 +207,6 @@ class CRender													:	public R_dsgraph_structure
 	virtual void					rmNear					();
 	virtual void					rmFar					();
 	virtual void					rmNormal				();
-  virtual u32           active_phase    () {return phase;};
 
 	// Constructor/destructor/loader
 	CRender							();

diff --git a/src/Layers/xrRenderPC_R2/r2.h b/src/Layers/xrRenderPC_R2/r2.h
@@ -306,7 +306,6 @@ class CRender													:	public R_dsgraph_structure
 	virtual void					rmNear						();
 	virtual void					rmFar						();
 	virtual void					rmNormal					();
-  virtual u32           active_phase      () {return phase;};
 
 	// Constructor/destructor/loader
 	CRender							();

diff --git a/src/Layers/xrRenderPC_R3/r3.h b/src/Layers/xrRenderPC_R3/r3.h
@@ -340,7 +340,6 @@ class CRender	:	public R_dsgraph_structure
 	virtual void					rmNear						();
 	virtual void					rmFar						();
 	virtual void					rmNormal					();
-  virtual u32           active_phase      () {return phase;};
 
 	// Constructor/destructor/loader
 	CRender							();

diff --git a/src/Layers/xrRenderPC_R4/r4.h b/src/Layers/xrRenderPC_R4/r4.h
@@ -341,8 +341,7 @@ class CRender	:	public R_dsgraph_structure
 	virtual void					rmNear						();
 	virtual void					rmFar						();
 	virtual void					rmNormal					();
-  virtual u32           active_phase      () {return phase;};
-
+
 	// Constructor/destructor/loader
 	CRender							();
 	virtual ~CRender				();

diff --git a/src/xrGame/Actor.cpp b/src/xrGame/Actor.cpp
@@ -1375,14 +1375,11 @@ void CActor::renderable_Render	()
 {
 	VERIFY(_valid(XFORM()));
 	inherited::renderable_Render			();
-  if ((cam_active==eacFirstEye && // first eye cam
-    ::Render->get_generation() == ::Render->GENERATION_R2 && // R2
-    ::Render->active_phase() == 1) // shadow map rendering on R2	
-    ||
-    !(IsFocused() && (cam_active==eacFirstEye) &&
-    ((!m_holder) || (m_holder && m_holder->allowWeapon() && m_holder->HUDView())))
-    )  
+	if(1/*!HUDview()*/)
+	{
 		CInventoryOwner::renderable_Render	();
+	}
+	VERIFY(_valid(XFORM()));
 }
 
 BOOL CActor::renderable_ShadowGenerate	() 

diff --git a/src/xrGame/Actor.h b/src/xrGame/Actor.h
@@ -311,7 +311,7 @@ struct SDefNewsMsg{
 	CActorCameraManager&	Cameras				() 	{VERIFY(m_pActorEffector); return *m_pActorEffector;}
 	IC CCameraBase*			cam_Active			()	{return cameras[cam_active];}
 	IC CCameraBase*			cam_FirstEye		()	{return cameras[eacFirstEye];}
-  IC EActorCameras    active_cam      ()  {return cam_active;} // KD: need to know which cam active outside actor methods
+
 protected:
 	virtual	void			cam_Set					(EActorCameras style);
 	void					cam_Update				(float dt, float fFOV);

diff --git a/src/xrGame/HUDManager.cpp b/src/xrGame/HUDManager.cpp
@@ -208,19 +208,6 @@ void CHUDManager::Render_Last()
 	::Render->set_HUD				(FALSE);
 }
 
-void CHUDManager::Render_Actor_Shadow() // added by KD
-{
-  if (0==pUIGame) return;
-    CObject* O = g_pGameLevel->CurrentViewEntity();
-  if (0==O) return;
-    CActor* A = smart_cast<CActor*> (O);
-  if (!A) return;
-  if (A->active_cam() != eacFirstEye) return; // KD: we need to render actor shadow only in first eye cam mode because
-  // in other modes actor model already in scene graph and renders well
-  ::Render->set_Object (O->H_Root());
-  O->renderable_Render ();
-}
-
 #include "player_hud.h"
 bool   CHUDManager::RenderActiveItemUIQuery()
 {

diff --git a/src/xrGame/HUDManager.h b/src/xrGame/HUDManager.h
@@ -22,8 +22,7 @@ class CHUDManager :
 	virtual		void		OnEvent				(EVENT E, u64 P1, u64 P2);
 
 	virtual		void		Render_First		();
-	virtual		void		Render_Last			();	 
-  virtual   void    Render_Actor_Shadow (); // added by KD    
+	virtual		void		Render_Last			();	   
 	virtual		void		OnFrame				();
 
 	virtual		void		RenderUI			();