Restore original sources state (almost unmodified leaked version).

OpenXRay · Sep 21, 2014 · ce3c373 · ce3c373
1 parent fe6e119
commit ce3c373
Show file tree

Hide file tree

Showing 25 changed files with 389 additions and 368 deletions.
diff --git a/src/engine/Layers/xrRender/DetailManager.cpp b/src/engine/Layers/xrRender/DetailManager.cpp
@@ -221,7 +221,7 @@ void CDetailManager::UpdateVisibleM()
 
 			u32 dwCC = dm_cache1_count*dm_cache1_count;
 
-			for (int _i=0; _i < dwCC ; _i++){
+			for (u32 _i=0; _i < dwCC ; _i++){
 				Slot*	PS		= *MS.slots[_i];
 				Slot& 	S 		= *PS;
 

diff --git a/src/engine/Layers/xrRender/DetailManager_VS.cpp b/src/engine/Layers/xrRender/DetailManager_VS.cpp
@@ -319,15 +319,11 @@ void	CDetailManager::hw_Render_dump		(ref_constant x_array, u32 var_id, u32 lod_
 				RCache.stat.r.s_details.add	(dwCNT_verts);
 			}
 			// Clean up
-<<<<<<< HEAD
 			vis.clear_not_free			();
-=======
-      vis.clear_not_free ();      
->>>>>>> origin/master
 		}
 		vOffset		+=	hw_BatchSize * Object.number_vertices;
 		iOffset		+=	hw_BatchSize * Object.number_indices;
 	}
 }
 
-#endif	//	USE_DX10
+#endif	//	USE_DX10
diff --git a/src/engine/Layers/xrRender/ParticleEffect.cpp b/src/engine/Layers/xrRender/ParticleEffect.cpp
@@ -442,19 +442,19 @@ void ParticleRenderStream( LPVOID lpvParams )
 				lt.set			(0.f,0.f);
 				rb.set			(1.f,1.f);
 
-				// _mm_prefetch( (char*) &particles[i + 1] , _MM_HINT_NTA );
+				 _mm_prefetch( (char*) &particles[i + 1] , _MM_HINT_NTA );
 
-				//if ( angle != *((DWORD*)&m.rot.x) ) {
+				if ( angle != *((DWORD*)&m.rot.x) ) {
 					angle = *((DWORD*)&m.rot.x);
 					__asm {
 						fld			DWORD PTR [angle]
 						fsincos
 						fstp		DWORD PTR [cosa]
 						fstp		DWORD PTR [sina]
 					}
-				//}
+				}
 
-				// _mm_prefetch( 64 + (char*) &particles[i + 1] , _MM_HINT_NTA );
+				 _mm_prefetch( 64 + (char*) &particles[i + 1] , _MM_HINT_NTA );
 
 				if (pPE.m_Def->m_Flags.is(CPEDef::dfFramed))
 					pPE.m_Def->m_Frame.CalculateTC(iFloor(float(m.frame)/255.f),lt,rb);

diff --git a/src/engine/Layers/xrRenderPC_R1/xrRender_R1.vcproj b/src/engine/Layers/xrRenderPC_R1/xrRender_R1.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="xrRender_R1"
 	ProjectGUID="{57A498C9-A741-4DDF-8EFC-BFB9EB6B00E2}"
 	RootNamespace="xrRender_R1"
@@ -180,7 +180,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="nvapi.lib atimgpud_s_x86.lib tal_sr.lib"
+				AdditionalDependencies="nvapi.lib atimgpud_s_x86.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\sdk\libraries;..\..\..\..\libraries"
 				GenerateDebugInformation="true"

diff --git a/src/engine/Layers/xrRenderPC_R2/stdafx.h b/src/engine/Layers/xrRenderPC_R2/stdafx.h
@@ -35,7 +35,7 @@
 #include "../../xrEngine/igame_level.h"
 #include "../xrRender/blenders\blender.h"
 #include "../xrRender/blenders\blender_clsid.h"
-#include "../../xrEngine/psystem.h"
+#include "../../xrParticles/psystem.h"
 #include "../xrRender/xrRender_console.h"
 #include "r2.h"
 

diff --git a/src/engine/Layers/xrRenderPC_R3/stdafx.h b/src/engine/Layers/xrRenderPC_R3/stdafx.h
@@ -30,7 +30,7 @@
 #define		RENDER	R_R3
 
 
-#include "../../xrEngine/psystem.h"
+#include "../../xrParticles/psystem.h"
 
 #include "../xrRender/HW.h"
 #include "../xrRender/Shader.h"

diff --git a/src/engine/Layers/xrRenderPC_R4/stdafx.h b/src/engine/Layers/xrRenderPC_R4/stdafx.h
@@ -28,7 +28,7 @@
 #define		R_R4	4
 #define		RENDER	R_R4
 
-#include "../../xrEngine/psystem.h"
+#include "../../xrParticles/psystem.h"
 
 #include "../xrRender/HW.h"
 #include "../xrRender/Shader.h"

diff --git a/src/engine/utils/ETools/ETools.vcproj b/src/engine/utils/ETools/ETools.vcproj
@@ -91,7 +91,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib vorbisfile_static.lib"
+				AdditionalDependencies="libogg_static.lib libvorbis_static.lib libvorbisenc_static.lib libvorbisfile_static.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="false"
 				AdditionalLibraryDirectories="..\..\..\sdk\libraries;..\..\..\..\libraries"
@@ -201,7 +201,7 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalOptions="/MACHINE:I386 /NODEFAULTLIB:LIBCMTD"
-				AdditionalDependencies="ogg_static_d.lib vorbis_static_d.lib vorbisenc_static.lib vorbisfile_static_d.lib"
+				AdditionalDependencies="libogg_static_d.lib libvorbis_static_d.lib libvorbisenc_static.lib libvorbisfile_static_d.lib"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\..\sdk\libraries;..\..\..\..\libraries"
@@ -309,7 +309,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 /NODEFAULTLIB:user32"
-				AdditionalDependencies="ogg_static.lib vorbis_static.lib vorbisenc_static.lib vorbisfile_static.lib"
+				AdditionalDependencies="libogg_static.lib libvorbis_static.lib libvorbisenc_static.lib libvorbisfile_static.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\..\sdk\libraries;..\..\..\..\libraries"

diff --git a/src/engine/xrCPU_Pipe/xrCPU_Pipe.vcproj b/src/engine/xrCPU_Pipe/xrCPU_Pipe.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="xrCPU_Pipe"
 	ProjectGUID="{CA0649DD-D089-423A-981C-46B57A884EB9}"
+	RootNamespace="xrCPU_Pipe"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -95,7 +96,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386 "
-				AdditionalDependencies="tal_sr.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\sdk\libraries;..\..\..\libraries"

diff --git a/src/engine/xrCore/FS.cpp b/src/engine/xrCore/FS.cpp
@@ -17,7 +17,7 @@
 #	define O_SEQUENTIAL 0
 #endif // M_BORLAND
 
-#ifdef DEBUG
+#ifdef FS_DEBUG
 	XRCORE_API	u32					g_file_mapped_memory = 0;
 	u32								g_file_mapped_count	= 0;
 	typedef xr_map<u32,std::pair<u32,shared_str> >	FILE_MAPPINGS;
@@ -474,7 +474,7 @@ CTempReader::~CTempReader()
 // pack stream
 CPackReader::~CPackReader()
 {
-#ifdef DEBUG
+#ifdef FS_DEBUG
 	unregister_file_mapping	(base_address,Size);
 #endif // DEBUG
 
@@ -514,14 +514,14 @@ CVirtualFileRW::CVirtualFileRW(const char *cFileName)
 	data			= (char*)MapViewOfFile (hSrcMap, FILE_MAP_ALL_ACCESS, 0, 0, 0);
 	R_ASSERT3		(data,cFileName,Debug.error2string(GetLastError()));
 
-#ifdef DEBUG
+#ifdef FS_DEBUG
 	register_file_mapping	(data,Size,cFileName);
 #endif // DEBUG
 }
 
 CVirtualFileRW::~CVirtualFileRW() 
 {
-#ifdef DEBUG
+#ifdef FS_DEBUG
 	unregister_file_mapping	(data,Size);
 #endif // DEBUG
 
@@ -544,14 +544,14 @@ CVirtualFileReader::CVirtualFileReader(const char *cFileName)
 	data			= (char*)MapViewOfFile (hSrcMap, FILE_MAP_READ, 0, 0, 0);
 	R_ASSERT3		(data,cFileName,Debug.error2string(GetLastError()));
 
-#ifdef DEBUG
+#ifdef FS_DEBUG
 	register_file_mapping	(data,Size,cFileName);
 #endif // DEBUG
 }
 
 CVirtualFileReader::~CVirtualFileReader() 
 {
-#ifdef DEBUG
+#ifdef FS_DEBUG
 	unregister_file_mapping	(data,Size);
 #endif // DEBUG
 

diff --git a/src/engine/xrCore/FS.h b/src/engine/xrCore/FS.h
@@ -10,7 +10,9 @@
 
 XRCORE_API void VerifyPath	(LPCSTR path);
 
-#ifdef DEBUG
+//#define FS_DEBUG
+
+#ifdef FS_DEBUG
 	XRCORE_API	extern	u32		g_file_mapped_memory;
 	XRCORE_API	extern	u32		g_file_mapped_count;
 	XRCORE_API			void	dump_file_mappings		();

diff --git a/src/engine/xrCore/LocatorAPI.cpp b/src/engine/xrCore/LocatorAPI.cpp
@@ -601,16 +601,11 @@ bool CLocatorAPI::Recurse		(const char* path)
 
 	_findclose		( hFile );
 
-	u32				count = rec_files.size();
-	_finddata_t		*buffer = (_finddata_t*)_alloca(count*sizeof(_finddata_t));
-	std::copy		(&*rec_files.begin(), &*rec_files.begin() + count, buffer);
-
-//.	std::copy		(&*rec_files.begin(),&*rec_files.end(),buffer);
-
+	FFVec buffer(rec_files);
 	rec_files.clear_not_free();
-	std::sort		(buffer, buffer + count, pred_str_ff);
-	for (_finddata_t *I = buffer, *E = buffer + count; I != E; ++I)
-		ProcessOne	(path,I);
+	std::sort		(buffer.begin(), buffer.end(), pred_str_ff);
+	for (FFIt I = buffer.begin(), E = buffer.end(); I != E; ++I)
+		ProcessOne	(path, &*I);
 
 	// insert self
     if (path&&path[0])\
@@ -1141,7 +1136,7 @@ void CLocatorAPI::file_from_archive	(IReader *&R, LPCSTR fname, const file &desc
 	string512					temp;
 	xr_sprintf					(temp, sizeof(temp),"%s:%s",*A.path,fname);
 
-#ifdef DEBUG
+#ifdef FS_DEBUG
 	register_file_mapping		(ptr,sz,temp);
 #endif // DEBUG
 
@@ -1157,7 +1152,7 @@ void CLocatorAPI::file_from_archive	(IReader *&R, LPCSTR fname, const file &desc
 	R							= xr_new<CTempReader>(dest,desc.size_real,0);
 	UnmapViewOfFile				(ptr);
 
-#ifdef DEBUG
+#ifdef FS_DEBUG
 	unregister_file_mapping		(ptr,sz);
 #endif // DEBUG
 }

diff --git a/src/engine/xrCore/cpuid.cpp b/src/engine/xrCore/cpuid.cpp
@@ -398,7 +398,7 @@ __asm {
 			#ifdef _CPUID_DEBUG
 				char mask[255];
 				_itoa_s( dwAPIC_ID , mask , 2 );
-				printf("APID_ID #%2.2u = 0x%2.2X (%08.8sb)\n" , n_cpu , dwAPIC_ID , mask );
+				printf("APID_ID #%2.2u = 0x%2.2X (%08.8sb)\n" , n_avail , dwAPIC_ID , mask );
 			#endif // _CPUID_DEBUG
 
 			// search for the APIC_ID with the same base

diff --git a/src/engine/xrEngine/EngineAPI.cpp b/src/engine/xrEngine/EngineAPI.cpp
@@ -187,6 +187,17 @@ extern "C" {
 
 void CEngineAPI::CreateRendererList()
 {
+#ifdef DEDICATED_SERVER
+
+	vid_quality_token						= xr_alloc<xr_token>(2);
+
+	vid_quality_token[0].id			= 0;
+	vid_quality_token[0].name		= xr_strdup("renderer_r1");
+
+	vid_quality_token[1].id			= -1;
+	vid_quality_token[1].name		= NULL;
+
+#else
 	//	TODO: ask renderers if they are supported!
 	if(vid_quality_token != NULL)		return;
 	bool bSupports_r2 = false;
@@ -371,4 +382,5 @@ void CEngineAPI::CreateRendererList()
 #endif // DEBUG
 	}
 	*/
+#endif //#ifndef DEDICATED_SERVER
 }
diff --git a/src/engine/xrEngine/IGame_Persistent.cpp b/src/engine/xrEngine/IGame_Persistent.cpp
@@ -134,8 +134,14 @@ void IGame_Persistent::OnGameStart()
 #ifndef _EDITOR
 //	LoadTitle("st_prefetching_objects");
 	LoadTitle();
-	if (strstr(Core.Params,"-noprefetch"))	return;
+	if(!strstr(Core.Params,"-noprefetch"))
+		Prefetch();
+#endif
+}
 
+#ifndef _EDITOR
+void IGame_Persistent::Prefetch()
+{
 	// prefetch game objects & models
 	float	p_time		=			1000.f*Device.GetTimerGlobal()->GetElapsed_sec();
 	u32	mem_0			=			Memory.mem_usage()	;
@@ -152,8 +158,9 @@ void IGame_Persistent::OnGameStart()
 
 	Msg					("* [prefetch] time:    %d ms",	iFloor(p_time));
 	Msg					("* [prefetch] memory:  %dKb",	p_mem/1024);
-#endif
 }
+#endif
+
 
 void IGame_Persistent::OnGameEnd	()
 {

diff --git a/src/engine/xrEngine/IGame_Persistent.h b/src/engine/xrEngine/IGame_Persistent.h
@@ -65,6 +65,7 @@ class ENGINE_API IGame_Persistent	:
 	IGame_ObjectPool				ObjectPool;
 	CEnvironment*					pEnvironment;
 	CEnvironment&					Environment()	{return *pEnvironment;};
+	void							Prefetch			( );
 #endif
 	IMainMenu*						m_pMainMenu;	
 

diff --git a/src/engine/xrEngine/Stats.cpp b/src/engine/xrEngine/Stats.cpp
@@ -206,8 +206,10 @@ void CStats::Show()
 		//F.OutNext	("DIP/DP:      %d",			RCache.stat.calls);
 #ifdef DEBUG
 		F.OutSkip	();
+#ifdef FS_DEBUG
 		F.OutNext	("mapped:      %d",			g_file_mapped_memory);
 		F.OutSkip	();
+#endif
 		m_pRender->OutData2(F);
 		//F.OutNext	("SH/T/M/C:    %d/%d/%d/%d",RCache.stat.states,RCache.stat.textures,RCache.stat.matrices,RCache.stat.constants);
 		//F.OutNext	("RT/PS/VS:    %d/%d/%d",	RCache.stat.target_rt,RCache.stat.ps,RCache.stat.vs);

diff --git a/src/engine/xrEngine/stdafx.h b/src/engine/xrEngine/stdafx.h
@@ -6,15 +6,19 @@
 	#include "..\editors\ECore\stdafx.h"
 #else
 
-#include "../xrCore/xrCore.h"
-#include "../Include/xrAPI/xrAPI.h"
-
 #ifndef NDEBUG
 #	ifndef INGAME_EDITOR
 #		define	INGAME_EDITOR
 #	endif // #ifndef INGAME_EDITOR
 #endif // #ifndef NDEBUG
 
+#ifdef INGAME_EDITOR
+#	define _WIN32_WINNT 0x0550
+#endif // #ifdef INGAME_EDITOR
+
+#include "../xrCore/xrCore.h"
+#include "../Include/xrAPI/xrAPI.h"
+
 #ifdef _DEBUG
 #	define D3D_DEBUG_INFO
 #endif

diff --git a/src/engine/xrEngine/x_ray.cpp b/src/engine/xrEngine/x_ray.cpp
@@ -1248,6 +1248,7 @@ void CApplication::LoadStage()
 		max_load_stage			= 14;
 	LoadDraw					();
 }
+
 void CApplication::LoadSwitch	()
 {
 }
@@ -1258,7 +1259,8 @@ void CApplication::OnFrame	( )
 	Engine.Event.OnFrame			();
 	g_SpatialSpace->update			();
 	g_SpatialSpacePhysic->update	();
-	if (g_pGameLevel)				g_pGameLevel->SoundEvent_Dispatch	( );
+	if (g_pGameLevel)				
+		g_pGameLevel->SoundEvent_Dispatch	( );
 }
 
 void CApplication::Level_Append		(LPCSTR folder)