Refactor GameObject class hierarchy.

Author: nitrocaster

src/Layers/xrRender/LightTrack.cpp

@@ -183,7 +183,7 @@ void	CROS_impl::update	(IRenderable* O)
 	VERIFY				(dynamic_cast<CROS_impl*>			(O->renderable_ROS()));
 	//float	dt			=	Device.fTimeDelta;
 
-	CObject*	_object	= dynamic_cast<CObject*>	(O);
+	IGameObject*	_object	= dynamic_cast<IGameObject*>	(O);
 
 	// select sample, randomize position inside object
 	vis_data &vis = O->GetRenderData().visual->getVisData();
@@ -360,7 +360,7 @@ void	CROS_impl::update_smooth	(IRenderable* O)
 	}
 }
 
-void CROS_impl::calc_sun_value(Fvector& position, CObject* _object)
+void CROS_impl::calc_sun_value(Fvector& position, IGameObject* _object)
 {
 
 #if RENDER==R_R1
@@ -377,7 +377,7 @@ void CROS_impl::calc_sun_value(Fvector& position, CObject* _object)
 	}
 }
 
-void CROS_impl::calc_sky_hemi_value(Fvector& position, CObject* _object)
+void CROS_impl::calc_sky_hemi_value(Fvector& position, IGameObject* _object)
 {
 	// hemi-tracing
 	if	(MODE & IRender_ObjectSpecific::TRACE_HEMI)	
@@ -419,7 +419,7 @@ void CROS_impl::calc_sky_hemi_value(Fvector& position, CObject* _object)
 
 void CROS_impl::prepare_lights(Fvector& position, IRenderable* O)
 {
-	CObject*	_object	= dynamic_cast<CObject*>	(O);
+	IGameObject*	_object	= dynamic_cast<IGameObject*>	(O);
 	float	dt			=	Device.fTimeDelta;
 
 	vis_data &vis = O->GetRenderData().visual->getVisData();

src/Layers/xrRender/LightTrack.h

@@ -111,10 +111,10 @@ class	CROS_impl			: public IRender_ObjectSpecific
 	static inline void accum_hemi(float* hemi_cube, Fvector3& dir, float scale);
 
 	//Calculates sun part of ambient occlusion
-	void calc_sun_value(Fvector& position, CObject* _object);
+	void calc_sun_value(Fvector& position, IGameObject* _object);
 
 	//Calculates sky part of ambient occlusion
-	void calc_sky_hemi_value(Fvector& position, CObject* _object);
+	void calc_sky_hemi_value(Fvector& position, IGameObject* _object);
 
 	//prepares static or hemisphere lights for ambient occlusion calculations
 	void prepare_lights(Fvector& position, IRenderable* O);

src/Layers/xrRenderDX10/3DFluid/dx103DFluidObstacles.cpp

@@ -204,7 +204,7 @@ void dx103DFluidObstacles::ProcessDynamicObstacles( const dx103DFluidData &Fluid
 		// renderable
 		//IRenderable*	renderable		= spatial->dcast_Renderable	();
 		//if (0==renderable)				continue;					// unknown, but renderable object (r1_glow???)
-		CObject*		pObject = spatial->dcast_CObject();
+		IGameObject*		pObject = spatial->dcast_GameObject();
 		if (!pObject) continue;
 
 		const IObjectPhysicsCollision* pCollision = pObject->physics_collision();

src/Layers/xrRenderPC_R1/FStaticRender.cpp

@@ -266,7 +266,7 @@ void					CRender::set_Object				(IRenderable*		O )
 	VERIFY					(g_bRendering);
 	val_pObject				= O;		// NULL is OK, trust me :)
 	if (val_pObject)		{
-		VERIFY(dynamic_cast<CObject*>(O)||dynamic_cast<CPS_Instance*>(O));
+		VERIFY(dynamic_cast<IGameObject*>(O)||dynamic_cast<CPS_Instance*>(O));
 		if (O->GetRenderData().pROS) { VERIFY(dynamic_cast<CROS_impl*>(O->GetRenderData().pROS)); }
 	}
 	if (PHASE_NORMAL==phase)	{
@@ -288,7 +288,7 @@ void					CRender::apply_object			(IRenderable*		O )
 	if (0==O)			return	;
 	if (PHASE_NORMAL==phase	&& O->renderable_ROS())		{
 		CROS_impl& LT		= *((CROS_impl*)O->GetRenderData().pROS);
-		VERIFY(dynamic_cast<CObject*>(O)||dynamic_cast<CPS_Instance*>(O));
+		VERIFY(dynamic_cast<IGameObject*>(O)||dynamic_cast<CPS_Instance*>(O));
 		VERIFY(dynamic_cast<CROS_impl*>(O->GetRenderData().pROS));
 		float o_hemi		= 0.5f*LT.get_hemi						();
 		float o_sun			= 0.5f*LT.get_sun						();
@@ -445,7 +445,7 @@ void CRender::Calculate				()
 				if (lstRenderables.size())		uID_LTRACK	= uLastLTRACK%lstRenderables.size();
 
 				// update light-vis for current entity / actor
-				CObject*	O					= g_pGameLevel->CurrentViewEntity();
+				IGameObject*	O					= g_pGameLevel->CurrentViewEntity();
 				if (O)		{
 					CROS_impl*	R					= (CROS_impl*) O->ROS();
 					if (R)		R->update			(O);

src/Layers/xrRenderPC_R1/GlowManager.cpp

@@ -197,7 +197,7 @@ void CGlowManager::Render			()
 void CGlowManager::render_sw		()
 {
 	// 0. save main view and disable
-	CObject*	o_main		= g_pGameLevel->CurrentViewEntity();
+	IGameObject*	o_main		= g_pGameLevel->CurrentViewEntity();
 
 	// 1. Test some number of glows
 	Fvector start	= Device.vCameraPosition;

src/Layers/xrRenderPC_R1/LightProjector.cpp

@@ -80,7 +80,7 @@ void CLightProjector::set_object    (IRenderable* O)
             else                    {
                 spatial->spatial_updatesector   ();
                 if (0==spatial->GetSpatialData().sector) {
-                    CObject*        obj = dynamic_cast<CObject*>(O);
+                    IGameObject*        obj = dynamic_cast<IGameObject*>(O);
                     if (obj)        Msg ("! Invalid object '%s' position. Outside of sector structure.",obj->cName().c_str());
                     current         = 0;
                 }
@@ -218,7 +218,7 @@ void CLightProjector::calculate ()
         v.sub       (v_Cs,v_C);;
 #ifdef DEBUG
         if ((v.x*v.x+v.y*v.y+v.z*v.z)<=flt_zero)    {
-            CObject* OO = dynamic_cast<CObject*>(R.O);
+            IGameObject* OO = dynamic_cast<IGameObject*>(R.O);
             Msg("Object[%s] Visual[%s] has invalid position. ",*OO->cName(),*OO->cNameVisual());
             Fvector cc;
             OO->Center(cc);

src/Layers/xrRenderPC_R2/r2_R_render.cpp

@@ -42,7 +42,7 @@ void CRender::render_main	(Fmatrix&	m_ViewProjection, bool _fportals)
 				if (lstRenderables.size())		uID_LTRACK	= uLastLTRACK%lstRenderables.size();
 
 				// update light-vis for current entity / actor
-				CObject*	O					= g_pGameLevel->CurrentViewEntity();
+				IGameObject*	O					= g_pGameLevel->CurrentViewEntity();
 				if (O)		{
 					CROS_impl*	R					= (CROS_impl*) O->ROS();
 					if (R)		R->update			(O);

src/Layers/xrRenderPC_R3/r3_R_render.cpp

@@ -44,7 +44,7 @@ void CRender::render_main	(Fmatrix&	m_ViewProjection, bool _fportals)
 				if (lstRenderables.size())		uID_LTRACK	= uLastLTRACK%lstRenderables.size();
 
 				// update light-vis for current entity / actor
-				CObject*	O					= g_pGameLevel->CurrentViewEntity();
+				IGameObject*	O					= g_pGameLevel->CurrentViewEntity();
 				if (O)		{
 					CROS_impl*	R					= (CROS_impl*) O->ROS();
 					if (R)		R->update			(O);

src/Layers/xrRenderPC_R4/r4_R_render.cpp

@@ -45,7 +45,7 @@ void CRender::render_main	(Fmatrix&	m_ViewProjection, bool _fportals)
 				if (lstRenderables.size())		uID_LTRACK	= uLastLTRACK%lstRenderables.size();
 
 				// update light-vis for current entity / actor
-				CObject*	O					= g_pGameLevel->CurrentViewEntity();
+				IGameObject*	O					= g_pGameLevel->CurrentViewEntity();
 				if (O)		{
 					CROS_impl*	R					= (CROS_impl*) O->ROS();
 					if (R)		R->update			(O);

src/xrCDB/ISpatial.cpp

@@ -260,7 +260,7 @@ void			ISpatial_DB::insert		(ISpatial* S)
 	BOOL		bValid	= _valid(S->GetSpatialData().sphere.R) && _valid(S->GetSpatialData().sphere.P);
 	if (!bValid)	
 	{
-		CObject*	O	= dynamic_cast<CObject*>(S);
+        IGameObject*	O	= dynamic_cast<IGameObject*>(S);
 		if	(O)			Debug.fatal(DEBUG_INFO,"Invalid OBJECT position or radius (%s)",O->cName().c_str());
 		else			{
 			CPS_Instance* P = dynamic_cast<CPS_Instance*>(S);