Refactor xrDebug.

src/Layers/xrRender/AnimationKeyCalculate.h

@@ -206,7 +206,7 @@ IC void MixInterlerp( CKey &Result, const CKey	*R, const CBlend* const BA[MAX_BL
 			else				w = w1/ws;
 #ifdef DEBUG
 			//.					if (fis_zero(w0+w1) || (!_valid(w))){
-			//.						Debug.fatal		(DEBUG_INFO,"TO ALEXMX VERY IMPORTANT: (TOTAL: %f) w: %f, w0: %f, w1: %f, ws:%f, BIS: %d",w0+w1,w,w0,w1,ws,BLEND_INST.Blend.size());
+			//.						xrDebug::Fatal		(DEBUG_INFO,"TO ALEXMX VERY IMPORTANT: (TOTAL: %f) w: %f, w0: %f, w1: %f, ws:%f, BIS: %d",w0+w1,w,w0,w1,ws,BLEND_INST.Blend.size());
 			//.					}
 #endif
 			KEY_Interp	(Result,R[0],R[1], clampr(w,0.f,1.f));
@@ -245,7 +245,7 @@ IC void MixInterlerp( CKey &Result, const CKey	*R, const CBlend* const BA[MAX_BL
 
 #ifdef DEBUG
 				//.						if ((total==0) || (!_valid(S[cnt].w/total))){
-				//.							Debug.fatal		(DEBUG_INFO,"TO ALEXMX VERY IMPORTANT: (TOTAL: %f) w: %f, total: %f, count: %d, real count: %d",total,S[cnt].w,total,count,BLEND_INST.Blend.size());
+				//.							xrDebug::Fatal		(DEBUG_INFO,"TO ALEXMX VERY IMPORTANT: (TOTAL: %f) w: %f, total: %f, count: %d, real count: %d",total,S[cnt].w,total,count,BLEND_INST.Blend.size());
 				//.						}
 #endif
 

src/Layers/xrRender/Blender_BmmD.cpp

@@ -87,7 +87,7 @@ void	CBlender_BmmD::Compile	(CBlender_Compile& C)
 		}
 		C.PassEnd			();
 	} else {
-		if (C.L_textures.size()<2)	Debug.fatal	(DEBUG_INFO,"Not enought textures for shader, base tex: %s",*C.L_textures[0]);
+		if (C.L_textures.size()<2)	xrDebug::Fatal	(DEBUG_INFO,"Not enought textures for shader, base tex: %s",*C.L_textures[0]);
 		switch (C.iElement)
 		{
 		case SE_R1_NORMAL_HQ:	

src/Layers/xrRender/Blender_Lm(EbB).cpp

@@ -85,7 +85,7 @@ void	CBlender_LmEbB::Compile(CBlender_Compile& C)
 		}
 		C.PassEnd			();
 	} else {
-		if (C.L_textures.size()<2)	Debug.fatal	(DEBUG_INFO,"Not enought textures for shader, base tex: %s",*C.L_textures[0]);
+		if (C.L_textures.size()<2)	xrDebug::Fatal	(DEBUG_INFO,"Not enought textures for shader, base tex: %s",*C.L_textures[0]);
 		switch (C.iElement)
 		{
 		case SE_R1_NORMAL_HQ:

src/Layers/xrRender/HW.cpp

@@ -75,7 +75,7 @@ void CHW::Reset		(HWND hwnd)
 	while	(TRUE)	{
 		HRESULT _hr							= HW.pDevice->Reset	(&DevPP);
 		if (SUCCEEDED(_hr))					break;
-		Msg		("! ERROR: [%dx%d]: %s",DevPP.BackBufferWidth,DevPP.BackBufferHeight,Debug.error2string(_hr));
+		Msg		("! ERROR: [%dx%d]: %s",DevPP.BackBufferWidth,DevPP.BackBufferHeight,xrDebug::ErrorToString(_hr));
 		Sleep	(100);
 	}
 	R_CHK				(pDevice->GetRenderTarget			(0,&pBaseRT));

src/Layers/xrRender/ModelPool.cpp

@@ -114,7 +114,7 @@ dxRender_Visual*	CModelPool::Instance_Load		(const char* N, BOOL allow_register)
 				Msg("!Can't find model file '%s'.",name);
                 return 0;
 #else            
-				Debug.fatal(DEBUG_INFO,"Can't find model file '%s'.",name);
+				xrDebug::Fatal(DEBUG_INFO,"Can't find model file '%s'.",name);
 #endif
 			}
 	} else {

src/Layers/xrRender/ParticleGroup.cpp

@@ -248,7 +248,7 @@ void CParticleGroup::SItem::StartFreeChild(CParticleEffect* emitter, LPCSTR nm,
 #ifdef _EDITOR        
         Msg			("!Can't use looped effect '%s' as 'On Birth' child for group.",nm);
 #else
-        Debug.fatal	(DEBUG_INFO,"Can't use looped effect '%s' as 'On Birth' child for group.",nm);
+        xrDebug::Fatal	(DEBUG_INFO,"Can't use looped effect '%s' as 'On Birth' child for group.",nm);
 #endif
     }
 }

src/Layers/xrRender/ResourceManager.cpp

@@ -57,7 +57,7 @@ IBlender* CResourceManager::_GetBlender		(LPCSTR Name)
 		return 0;
 	}
 #endif
-	if (I==m_blenders.end())	{ Debug.fatal(DEBUG_INFO,"Shader '%s' not found in library.",Name); return 0; }
+	if (I==m_blenders.end())	{ xrDebug::Fatal(DEBUG_INFO,"Shader '%s' not found in library.",Name); return 0; }
 #endif
 	else					return I->second;
 }

src/Layers/xrRender/SkeletonAnimated.cpp

@@ -369,7 +369,7 @@ CBlend*	CKinematicsAnimated::PlayCycle		(LPCSTR  N, BOOL bMixIn, PlayCallback Ca
 {
 	MotionID motion_ID		= ID_Cycle(N);
 	if (motion_ID.valid())	return PlayCycle(motion_ID,bMixIn,Callback,CallbackParam,channel);
-	else					{ Debug.fatal(DEBUG_INFO,"! MODEL: can't find cycle: %s", N); return 0; }
+	else					{ xrDebug::Fatal(DEBUG_INFO,"! MODEL: can't find cycle: %s", N); return 0; }
 }
 CBlend*	CKinematicsAnimated::PlayCycle		(MotionID motion_ID,  BOOL bMixIn, PlayCallback Callback, LPVOID CallbackParam,u8 channel /*= 0*/)
 {	
@@ -702,7 +702,7 @@ void CKinematicsAnimated::Load(const char* N, IReader *data, u32 dwFlags)
                     Msg			("!Can't find motion file '%s'.",nm);
                     return;
 #else
-                    Debug.fatal	(DEBUG_INFO,"Can't find motion file '%s'.",nm);
+                    xrDebug::Fatal	(DEBUG_INFO,"Can't find motion file '%s'.",nm);
 #endif
                 }
             }
@@ -741,7 +741,7 @@ void CKinematicsAnimated::Load(const char* N, IReader *data, u32 dwFlags)
                     Msg			("!Can't find motion file '%s'.",nm);
                     return;
 #else
-                    Debug.fatal	(DEBUG_INFO,"Can't find motion file '%s'.",nm);
+                    xrDebug::Fatal	(DEBUG_INFO,"Can't find motion file '%s'.",nm);
 #endif
                 }
             }

src/Layers/xrRender/SkeletonX.cpp

@@ -337,7 +337,7 @@ void CSkeletonX::_Load	(const char* N, IReader *data, u32& dwVertCount)
 			}
 		}break;
 	default:
-		Debug.fatal	(DEBUG_INFO,"Invalid vertex type in skinned model '%s'",N);
+		xrDebug::Fatal	(DEBUG_INFO,"Invalid vertex type in skinned model '%s'",N);
 		break;
 	}
 #ifdef _EDITOR

src/Layers/xrRender/Texture.cpp

@@ -313,7 +313,7 @@ ID3DBaseTexture*	CRender::texture_load(LPCSTR fRName, u32& ret_msize)
 	R_ASSERT(FS.exist(fn,"$game_textures$",	"ed\\ed_not_existing_texture",".dds"));
 	goto _DDS;
 
-//	Debug.fatal(DEBUG_INFO,"Can't find texture '%s'",fname);
+//	xrDebug::Fatal(DEBUG_INFO,"Can't find texture '%s'",fname);
 
 #endif
 

src/Layers/xrRender/blenders/Blender_Recorder.cpp

@@ -54,7 +54,7 @@ void	CBlender_Compile::_cpp_Compile	(ShaderElement* _SH)
 		base		=	BT->oT_Name;
 		if (id>=0)	
 		{
-			if (id>=int(lst.size()))	Debug.fatal(DEBUG_INFO,"Not enought textures for shader. Base texture: '%s'.",*lst[0]);
+			if (id>=int(lst.size()))	xrDebug::Fatal(DEBUG_INFO,"Not enought textures for shader. Base texture: '%s'.",*lst[0]);
 			base	=	*lst [id];
 		}
 		if (!RImplementation.Resources->m_textures_description.GetDetailTexture(base,detail_texture,detail_scaler))	bDetail	= FALSE;
@@ -71,7 +71,7 @@ void	CBlender_Compile::_cpp_Compile	(ShaderElement* _SH)
 			base		=	BT->oT_Name;
 			if (id>=0)	
 			{
-				if (id>=int(lst.size()))	Debug.fatal(DEBUG_INFO,"Not enought textures for shader. Base texture: '%s'.",*lst[0]);
+				if (id>=int(lst.size()))	xrDebug::Fatal(DEBUG_INFO,"Not enought textures for shader. Base texture: '%s'.",*lst[0]);
 				base	=	*lst [id];
 			}
 		}
@@ -310,7 +310,7 @@ void	CBlender_Compile::Stage_Texture	(LPCSTR name, u32 ,	u32	 fmin, u32 fmip, u3
 	int id		=	ParseName(name);
 	LPCSTR N	=	name;
 	if (id>=0)	{
-		if (id>=int(lst.size()))	Debug.fatal(DEBUG_INFO,"Not enought textures for shader. Base texture: '%s'.",*lst[0]);
+		if (id>=int(lst.size()))	xrDebug::Fatal(DEBUG_INFO,"Not enought textures for shader. Base texture: '%s'.",*lst[0]);
 		N = *lst [id];
 	}
     passTextures.push_back(mk_pair(Stage(), ref_texture(RImplementation.Resources->_CreateTexture(N))));

src/Layers/xrRender/r__sector.cpp

@@ -97,7 +97,7 @@ void	CPortal::Setup	(Fvector* V, int vcnt, CSector* face, CSector* back)
 
 	/*
 	if (_abs(1-P.n.magnitude())<EPS)
-	Debug.fatal		(DEBUG_INFO,"Degenerated portal found at {%3.2f,%3.2f,%3.2f}.",VPUSH(poly[0]));
+	xrDebug::Fatal		(DEBUG_INFO,"Degenerated portal found at {%3.2f,%3.2f,%3.2f}.",VPUSH(poly[0]));
 	*/
 }
 

src/Layers/xrRender/r_constants_cache.h

@@ -75,7 +75,7 @@ class	R_constant_array
 			break;
 		default:
 #ifdef DEBUG
-			Debug.fatal		(DEBUG_INFO,"Invalid constant run-time-type for '%s'",*C->name);
+			xrDebug::Fatal		(DEBUG_INFO,"Invalid constant run-time-type for '%s'",*C->name);
 #else
 			NODEFAULT;
 #endif
@@ -123,7 +123,7 @@ class	R_constant_array
 			break;
 		default:
 #ifdef DEBUG
-			Debug.fatal		(DEBUG_INFO,"Invalid constant run-time-type for '%s'",*C->name);
+			xrDebug::Fatal		(DEBUG_INFO,"Invalid constant run-time-type for '%s'",*C->name);
 #else
 			NODEFAULT;
 #endif

src/Layers/xrRenderDX10/dx10ConstantBuffer_impl.h

@@ -47,7 +47,7 @@ IC void dx10ConstantBuffer::set(R_constant* C, R_constant_load& L, const Fmatrix
 		break;
 	default:
 #ifdef DEBUG
-		Debug.fatal		(DEBUG_INFO,"Invalid constant run-time-type for '%s'",*C->name);
+		xrDebug::Fatal		(DEBUG_INFO,"Invalid constant run-time-type for '%s'",*C->name);
 #else
 		NODEFAULT;
 #endif
@@ -154,7 +154,7 @@ IC void dx10ConstantBuffer::seta(R_constant* C, R_constant_load& L, u32 e, const
 		break;
 	default:
 #ifdef DEBUG
-		Debug.fatal		(DEBUG_INFO,"Invalid constant run-time-type for '%s'",*C->name);
+		xrDebug::Fatal		(DEBUG_INFO,"Invalid constant run-time-type for '%s'",*C->name);
 #else
 		NODEFAULT;
 #endif

src/Layers/xrRenderDX10/dx10HW.cpp

@@ -528,7 +528,7 @@ void CHW::Reset (HWND hwnd)
 	while	(TRUE)	{
 		HRESULT _hr							= HW.pDevice->Reset	(&DevPP);
 		if (SUCCEEDED(_hr))					break;
-		Msg		("! ERROR: [%dx%d]: %s",DevPP.BackBufferWidth,DevPP.BackBufferHeight,Debug.error2string(_hr));
+		Msg		("! ERROR: [%dx%d]: %s",DevPP.BackBufferWidth,DevPP.BackBufferHeight,xrDebug::ErrorToString(_hr));
 		Sleep	(100);
 	}
 	R_CHK				(pDevice->GetRenderTarget			(0,&pBaseRT));
@@ -567,7 +567,7 @@ void CHW::Reset (HWND hwnd)
 	while	(TRUE)	{
 		HRESULT _hr							= HW.pDevice->Reset	(&DevPP);
 		if (SUCCEEDED(_hr))					break;
-		Msg		("! ERROR: [%dx%d]: %s",DevPP.BackBufferWidth,DevPP.BackBufferHeight,Debug.error2string(_hr));
+		Msg		("! ERROR: [%dx%d]: %s",DevPP.BackBufferWidth,DevPP.BackBufferHeight,xrDebug::ErrorToString(_hr));
 		Sleep	(100);
 	}
 	R_CHK				(pDevice->GetRenderTarget			(0,&pBaseRT));

src/Layers/xrRenderDX10/dx10Texture.cpp

@@ -334,7 +334,7 @@ ID3DBaseTexture*	CRender::texture_load(LPCSTR fRName, u32& ret_msize, bool bStag
 	R_ASSERT(FS.exist(fn,"$game_textures$",	"ed\\ed_not_existing_texture",".dds"));
 	goto _DDS;
 
-	//	Debug.fatal(DEBUG_INFO,"Can't find texture '%s'",fname);
+	//	xrDebug::Fatal(DEBUG_INFO,"Can't find texture '%s'",fname);
 
 #endif
 

src/Layers/xrRenderDX10/dx10r_constants_cache.cpp

@@ -124,7 +124,7 @@ void R_constants::flush_cache()
 #ifdef DEBUG
 				if (F.r_hi() > HW.Caps.geometry.dwRegisters)
 				{
-					Debug.fatal(DEBUG_INFO,"Internal error setting VS-constants: overflow\nregs[%d],hi[%d]",
+					xrDebug::Fatal(DEBUG_INFO,"Internal error setting VS-constants: overflow\nregs[%d],hi[%d]",
 						HW.Caps.geometry.dwRegisters,F.r_hi()
 						);
 				}

src/Layers/xrRenderDX9/dx9r_constants_cache.cpp

@@ -33,7 +33,7 @@ void R_constants::flush_cache()
 #ifdef DEBUG
 				if (F.r_hi() > HW.Caps.geometry.dwRegisters)
 				{
-					Debug.fatal(DEBUG_INFO,"Internal error setting VS-constants: overflow\nregs[%d],hi[%d]",
+					xrDebug::Fatal(DEBUG_INFO,"Internal error setting VS-constants: overflow\nregs[%d],hi[%d]",
 						HW.Caps.geometry.dwRegisters,F.r_hi()
 						);
 				}

src/Layers/xrRenderDX9/dx9r_constants_cache.h

@@ -63,7 +63,7 @@ class	R_constant_array
 			break;
 		default:
 #ifdef DEBUG
-			Debug.fatal		(DEBUG_INFO,"Invalid constant run-time-type for '%s'",*C->name);
+			xrDebug::Fatal		(DEBUG_INFO,"Invalid constant run-time-type for '%s'",*C->name);
 #else
 			NODEFAULT;
 #endif
@@ -111,7 +111,7 @@ class	R_constant_array
 			break;
 		default:
 #ifdef DEBUG
-			Debug.fatal		(DEBUG_INFO,"Invalid constant run-time-type for '%s'",*C->name);
+			xrDebug::Fatal		(DEBUG_INFO,"Invalid constant run-time-type for '%s'",*C->name);
 #else
 			NODEFAULT;
 #endif

src/Layers/xrRenderGL/glr_constants_cache.h

@@ -31,7 +31,7 @@ class	ECORE_API  R_constants
 			break;
 		default:
 #ifdef DEBUG
-			Debug.fatal(DEBUG_INFO, "Invalid constant run-time-type for '%s'", *C->name);
+			xrDebug::Fatal(DEBUG_INFO, "Invalid constant run-time-type for '%s'", *C->name);
 #else
 			NODEFAULT;
 #endif
@@ -52,7 +52,7 @@ class	ECORE_API  R_constants
 			break;
 		default:
 #ifdef DEBUG
-			Debug.fatal(DEBUG_INFO, "Invalid constant run-time-type for '%s'", *C->name);
+			xrDebug::Fatal(DEBUG_INFO, "Invalid constant run-time-type for '%s'", *C->name);
 #else
 			NODEFAULT;
 #endif
@@ -73,7 +73,7 @@ class	ECORE_API  R_constants
 			break;
 		default:
 #ifdef DEBUG
-			Debug.fatal(DEBUG_INFO, "Invalid constant run-time-type for '%s'", *C->name);
+			xrDebug::Fatal(DEBUG_INFO, "Invalid constant run-time-type for '%s'", *C->name);
 #else
 			NODEFAULT;
 #endif

src/Layers/xrRenderPC_R1/BlenderDefault.cpp

@@ -60,7 +60,7 @@ void	CBlender_default::Compile(CBlender_Compile& C)
 		}
 		C.PassEnd			();
 	} else {
-		if (C.L_textures.size()<3)	Debug.fatal	(DEBUG_INFO,"Not enought textures for shader, base tex: %s",*C.L_textures[0]);
+		if (C.L_textures.size()<3)	xrDebug::Fatal	(DEBUG_INFO,"Not enought textures for shader, base tex: %s",*C.L_textures[0]);
 		switch (C.iElement)
 		{
 		case SE_R1_NORMAL_HQ:

src/Layers/xrRenderPC_R1/Blender_default_aref.cpp

@@ -72,7 +72,7 @@ void CBlender_default_aref::Compile(CBlender_Compile& C)
 		}
 		C.PassEnd			();
 	} else {
-		if (C.L_textures.size()<2)	Debug.fatal	(DEBUG_INFO,"Not enought textures for shader, base tex: %s",*C.L_textures[0]);
+		if (C.L_textures.size()<2)	xrDebug::Fatal	(DEBUG_INFO,"Not enought textures for shader, base tex: %s",*C.L_textures[0]);
 		switch (C.iElement)
 		{
 		case SE_R1_NORMAL_HQ:

src/utils/ETools/ETools.cpp

@@ -11,7 +11,7 @@ BOOL APIENTRY DllMain( HANDLE hModule,
 { 
 	switch(fdwReason) {
 		case DLL_PROCESS_ATTACH:
-			Debug._initialize	(false);
+			xrDebug::Initialize	(false);
 			Core._initialize	("XRayEditorTools",0,FALSE);
 			//FPU::m64r	();
 			break;

src/utils/xrAI/xrAI.cpp

@@ -195,7 +195,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
                      LPSTR     lpCmdLine,
                      int       nCmdShow)
 {
-    Debug._initialize       (false);
+    xrDebug::Initialize       (false);
     Core._initialize        ("xrai",0);
     HMODULE                 hFactory;
     LPCSTR                  g_name  = "xrSE_Factory";

src/utils/xrCompress/main.cpp

@@ -7,7 +7,7 @@
 
 int __cdecl main	(int argc, char* argv[])
 {
-	Debug._initialize	(false);
+	xrDebug::Initialize	(false);
 	Core._initialize	("xrCompress",0,FALSE);
 	printf				("\n\n");
 

src/utils/xrDO_Light/xrDO_Light.cpp

@@ -94,7 +94,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
                      int       nCmdShow)
 {
     // Initialize debugging
-    Debug._initialize   (false);
+    xrDebug::Initialize   (false);
     Core._initialize    ("xrDO");
     Startup             (lpCmdLine);
 

src/utils/xrLC/Build_Load.cpp

@@ -117,7 +117,7 @@ void CBuild::Load	(const b_params& Params, const IReader& _in_FS)
 			} catch (...)
 			{
 				err_save	();
-				Debug.fatal	(DEBUG_INFO,"* ERROR: Can't process face #%d",i);
+				xrDebug::Fatal	(DEBUG_INFO,"* ERROR: Can't process face #%d",i);
 			}
 		}
         Logger.Progress(p_total += p_cost);
@@ -147,7 +147,7 @@ void CBuild::Load	(const b_params& Params, const IReader& _in_FS)
 		if (InvalideFaces())	
 		{
 			err_save		();
-			Debug.fatal		(DEBUG_INFO,"* FATAL: %d invalid faces. Compilation aborted",InvalideFaces());
+			xrDebug::Fatal		(DEBUG_INFO,"* FATAL: %d invalid faces. Compilation aborted",InvalideFaces());
 		}
 	}
 

src/utils/xrLC/OGF_CalculateTB.cpp

@@ -49,8 +49,8 @@ void OGF::CalculateTB()
 		)
 	)
 	{
-		Debug.fatal	(DEBUG_INFO, "NVMeshMender failed " );
-		//Debug.fatal	(DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str());
+		xrDebug::Fatal	(DEBUG_INFO, "NVMeshMender failed " );
+		//xrDebug::Fatal	(DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str());
 	}
 
 	// ************************************* Bind declarators

src/utils/xrLC/xrLC.cpp

@@ -187,7 +187,7 @@ int APIENTRY WinMain(HINSTANCE hInst,
 //  g_dummy_stuff       = &trivial_encryptor::encode;
 
     // Initialize debugging
-    Debug._initialize   (false);
+    xrDebug::Initialize   (false);
     Core._initialize    ("xrLC");
 
     if(strstr(Core.Params,"-nosmg"))

src/utils/xrLC/xrPhase_TangentBasis.cpp

@@ -136,8 +136,8 @@ void CBuild::xrPhase_TangentBasis()
 		)
 	)
 	{
-		Debug.fatal	(DEBUG_INFO, "NVMeshMender failed " );
-		//Debug.fatal	(DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str());
+		xrDebug::Fatal	(DEBUG_INFO, "NVMeshMender failed " );
+		//xrDebug::Fatal	(DEBUG_INFO,"NVMeshMender failed (%s)",mender.GetLastError().c_str());
 	}
 
 	// ************************************* Bind declarators

src/utils/xrLC/xrPreOptimize.cpp

@@ -134,7 +134,7 @@ void CBuild::PreOptimize()
 	if (InvalideFaces())	
 	{
 		err_save		();
-		Debug.fatal		(DEBUG_INFO,"* FATAL: %d invalid faces. Compilation aborted",InvalideFaces());
+		xrDebug::Fatal		(DEBUG_INFO,"* FATAL: %d invalid faces. Compilation aborted",InvalideFaces());
 	}
 
     Logger.Status("Adjacency check...");

src/utils/xrLC_Light/xrLC_Light.cpp

@@ -25,7 +25,7 @@ BOOL APIENTRY DllMain( HMODULE hModule,
         switch(ul_reason_for_call) {
         case DLL_PROCESS_ATTACH:
             {
-                Debug._initialize   (false);
+                xrDebug::Initialize   (false);
                 bool init_log   =  (0 != xr_strcmp( Core.ApplicationName, "XRayEditorTools" ));
                 Core._initialize    ("xrLC_Light",0,FALSE);
                 if( init_log )