Merge RenderDeviceRender into dsgraph_structure.

Author: nitrocaster

src/Include/xrAPI/xrAPI.h

@@ -11,8 +11,8 @@
 
 
 #ifndef _EDITOR
-class IRender_interface;
-extern XRAPI_API IRender_interface*	Render;
+class IRender;
+extern XRAPI_API IRender*	Render;
 
 class IRenderFactory;
 extern XRAPI_API IRenderFactory*	RenderFactory;

src/Include/xrRender/FactoryPtr.h

@@ -58,13 +58,11 @@ class FactoryPtr
 	FACTORY_PTR_INSTANCIATE(UIShader)
 	FACTORY_PTR_INSTANCIATE(StatGraphRender)
 	FACTORY_PTR_INSTANCIATE(ConsoleRender)
-	FACTORY_PTR_INSTANCIATE(RenderDeviceRender)
 #	ifdef DEBUG
 		FACTORY_PTR_INSTANCIATE(ObjectSpaceRender)
 #	endif // DEBUG
 	FACTORY_PTR_INSTANCIATE(ApplicationRender)
 	FACTORY_PTR_INSTANCIATE(WallMarkArray)
-	FACTORY_PTR_INSTANCIATE(StatsRender);
 #endif // _EDITOR
 
 #ifndef _EDITOR

src/Include/xrRender/Kinematics.h

@@ -34,37 +34,37 @@ class IKinematics
 	virtual		void					EnumBoneVertices	(SEnumVerticesCallback &C, u16 bone_id) = 0;
 
 	// Low level interface
-	virtual u16					_BCL	LL_BoneID(LPCSTR  B) = 0;
-	virtual u16					_BCL	LL_BoneID(const shared_str& B) = 0;
-	virtual LPCSTR				_BCL	LL_BoneName_dbg(u16 ID) = 0;
+	virtual u16						LL_BoneID(LPCSTR  B) = 0;
+	virtual u16						LL_BoneID(const shared_str& B) = 0;
+	virtual LPCSTR					LL_BoneName_dbg(u16 ID) = 0;
 
-	virtual CInifile*			_BCL	LL_UserData() = 0;
+	virtual CInifile*				LL_UserData() = 0;
 	virtual accel*						LL_Bones() = 0;
 
-	virtual ICF CBoneInstance&	_BCL	LL_GetBoneInstance(u16 bone_id) = 0;
+	virtual ICF CBoneInstance&		LL_GetBoneInstance(u16 bone_id) = 0;
 
-	virtual CBoneData&			_BCL	LL_GetData(u16 bone_id) = 0;
+	virtual CBoneData&				LL_GetData(u16 bone_id) = 0;
 
-virtual	const IBoneData&		_BCL	GetBoneData(u16 bone_id) const = 0;
+virtual	const IBoneData&			GetBoneData(u16 bone_id) const = 0;
 
-	virtual u16					_BCL	LL_BoneCount()const = 0;
+	virtual u16						LL_BoneCount()const = 0;
 	virtual u16							LL_VisibleBoneCount() = 0;
 
-	virtual ICF			Fmatrix& _BCL	LL_GetTransform(u16 bone_id) = 0;
-	virtual ICF const	Fmatrix& _BCL	LL_GetTransform(u16 bone_id) const = 0;
+	virtual ICF			Fmatrix& 	LL_GetTransform(u16 bone_id) = 0;
+	virtual ICF const	Fmatrix& 	LL_GetTransform(u16 bone_id) const = 0;
 
 	virtual ICF Fmatrix&				LL_GetTransform_R(u16 bone_id) = 0;
 	virtual Fobb&						LL_GetBox(u16 bone_id) = 0;
-	virtual const Fbox&			_BCL	GetBox()const = 0;
+	virtual const Fbox&				GetBox()const = 0;
 	virtual void						LL_GetBindTransform(xr_vector<Fmatrix>& matrices) = 0;
 	virtual int 						LL_GetBoneGroups(xr_vector<xr_vector<u16> >& groups) = 0;
 
-	virtual u16					_BCL	LL_GetBoneRoot() = 0;
+	virtual u16						LL_GetBoneRoot() = 0;
 	virtual void						LL_SetBoneRoot(u16 bone_id) = 0;
 
-	virtual BOOL				_BCL	LL_GetBoneVisible(u16 bone_id) = 0;
+	virtual BOOL					LL_GetBoneVisible(u16 bone_id) = 0;
 	virtual void						LL_SetBoneVisible(u16 bone_id, BOOL val, BOOL bRecursive) = 0;
-	virtual u64					_BCL	LL_GetBonesVisible() = 0;
+	virtual u64						LL_GetBonesVisible() = 0;
 	virtual void						LL_SetBonesVisible(u64 mask) = 0;
 
 	// Main functionality
@@ -80,13 +80,13 @@ virtual	const IBoneData&		_BCL	GetBoneData(u16 bone_id) const = 0;
 	virtual void*						GetUpdateCallbackParam() = 0;
 	//UpdateCallback						Update_Callback;
 	//void*								Update_Callback_Param;
-	virtual IRenderVisual*		_BCL 	dcast_RenderVisual() = 0;
+	virtual IRenderVisual*		 	dcast_RenderVisual() = 0;
 	virtual IKinematicsAnimated*		dcast_PKinematicsAnimated() = 0;
 
 	// debug
 #ifdef DEBUG
 	virtual void						DebugRender			(Fmatrix& XFORM) = 0;
-	virtual shared_str			_BCL	getDebugName		() = 0;
+	virtual shared_str				getDebugName		() = 0;
 #endif
 };
 

src/Include/xrRender/KinematicsAnimated.h

@@ -100,8 +100,8 @@ class IKinematicsAnimated
 
 	virtual const CPartition&			partitions		() const = 0;
 
-	virtual IRenderVisual*	_BCL dcast_RenderVisual() = 0;
-	virtual IKinematics*	_BCL dcast_PKinematics() = 0;
+	virtual IRenderVisual*	 dcast_RenderVisual() = 0;
+	virtual IKinematics*	 dcast_PKinematics() = 0;
 
 	virtual float						get_animation_length (MotionID motion_ID) = 0;
 //#ifdef DEBUG

src/Include/xrRender/RenderDeviceRender.h

@@ -49,13 +49,11 @@ class IRenderFactory
 	RENDER_FACTORY_INTERFACE(UIShader)
 	RENDER_FACTORY_INTERFACE(StatGraphRender)
 	RENDER_FACTORY_INTERFACE(ConsoleRender)
-	RENDER_FACTORY_INTERFACE(RenderDeviceRender)
 #	ifdef DEBUG
 		RENDER_FACTORY_INTERFACE(ObjectSpaceRender)
 #	endif // DEBUG
 	RENDER_FACTORY_INTERFACE(ApplicationRender)
 	RENDER_FACTORY_INTERFACE(WallMarkArray)
-	RENDER_FACTORY_INTERFACE(StatsRender)
 #endif // _EDITOR
 
 #ifndef _EDITOR

src/Include/xrRender/RenderFactory.h

@@ -12,14 +12,14 @@ class IRenderVisual
 public:
 	virtual ~IRenderVisual() {;}
 
-	virtual vis_data&	_BCL	getVisData() = 0;
+	virtual vis_data&		getVisData() = 0;
 	virtual u32					getType() = 0;
 
 #ifdef DEBUG
-	virtual shared_str	_BCL	getDebugName() = 0;
+	virtual shared_str		getDebugName() = 0;
 #endif
 
-	virtual	IKinematics*	_BCL	dcast_PKinematics			()				{ return 0;	}
+	virtual	IKinematics*		dcast_PKinematics			()				{ return 0;	}
 	virtual	IKinematicsAnimated*	dcast_PKinematicsAnimated	()				{ return 0;	}
 	virtual IParticleCustom*		dcast_ParticleCustom		()				{ return 0;	}
 };

src/Include/xrRender/RenderVisual.h

@@ -4,7 +4,7 @@
 #include "stdafx.h"
 #include "Include/xrAPI/xrAPI.h"
 
-XRAPI_API IRender_interface*	Render = NULL;
+XRAPI_API IRender*	Render = NULL;
 XRAPI_API IRenderFactory*	RenderFactory = NULL;
 XRAPI_API CDUInterface*	DU = NULL;
 XRAPI_API xr_token*	vid_mode_token = NULL;

src/Include/xrRender/StatsRender.h

@@ -5,8 +5,6 @@
 #include "blenders\Blender_Recorder.h"
 #include "blenders\Blender.h"
 
-#include "dxRenderDeviceRender.h"
-
 void fix_texture_name(LPSTR fn);
 
 void	CBlender_Compile::r_Pass		(LPCSTR _vs, LPCSTR _ps, bool bFog, BOOL bZtest, BOOL bZwrite,	BOOL bABlend, D3DBLEND abSRC, D3DBLEND abDST, BOOL aTest, u32 aRef)
@@ -24,17 +22,17 @@ void	CBlender_Compile::r_Pass		(LPCSTR _vs, LPCSTR _ps, bool bFog, BOOL bZtest,
 	PassSET_LightFog		(FALSE,bFog);
 
 	// Create shaders
-	SPS* ps					= DEV->_CreatePS			(_ps);
-	SVS* vs					= DEV->_CreateVS			(_vs);
+    SPS* ps = RImplementation.Resources->_CreatePS(_ps);
+    SVS* vs = RImplementation.Resources->_CreateVS(_vs);
 	dest.ps					= ps;
 	dest.vs					= vs;
 #if defined(USE_DX10) || defined(USE_DX11)
-	SGS* gs					= DEV->_CreateGS			("null");
+	SGS* gs					= RImplementation.Resources->_CreateGS			("null");
 	dest.gs					= gs;
 #	ifdef USE_DX11
-	dest.hs = DEV->_CreateHS("null");
-	dest.ds = DEV->_CreateDS("null");
-	dest.cs = DEV->_CreateCS("null");
+    dest.hs = RImplementation.Resources->_CreateHS("null");
+    dest.ds = RImplementation.Resources->_CreateDS("null");
+    dest.cs = RImplementation.Resources->_CreateCS("null");
 #	endif
 #endif	//	USE_DX10
 	ctable.merge			(&ps->constants);
@@ -90,7 +88,7 @@ u32		CBlender_Compile::i_Sampler		(LPCSTR _name)
 }
 void	CBlender_Compile::i_Texture		(u32 s, LPCSTR name)
 {
-	if (name)	passTextures.push_back	(mk_pair(s, ref_texture(DEV->_CreateTexture(name))));
+    if (name)	passTextures.push_back(mk_pair(s, ref_texture(RImplementation.Resources->_CreateTexture(name))));
 }
 void	CBlender_Compile::i_Projective	(u32 s, bool b)
 {
@@ -169,13 +167,13 @@ void	CBlender_Compile::r_Sampler_clw	(LPCSTR name, LPCSTR texture, bool b_ps1x_P
 void	CBlender_Compile::r_End			()
 {
 	SetMapping				();
-	dest.constants			= DEV->_CreateConstantTable(ctable);
-	dest.state				= DEV->_CreateState		(RS.GetContainer());
-	dest.T					= DEV->_CreateTextureList	(passTextures);
+	dest.constants			= RImplementation.Resources->_CreateConstantTable(ctable);
+	dest.state				= RImplementation.Resources->_CreateState		(RS.GetContainer());
+	dest.T					= RImplementation.Resources->_CreateTextureList	(passTextures);
 	dest.C					= 0;
 #ifdef _EDITOR
 	dest.M					= 0;
 #endif
-	SH->passes.push_back(DEV->_CreatePass(dest));
+    SH->passes.push_back(RImplementation.Resources->_CreatePass(dest));
 }
 #endif	//	USE_DX10