Move base widgets to xrUI library

src/CMakeLists.txt

@@ -15,6 +15,7 @@ if(NOT IXRAY_COMPRESSOR_ONLY)
     add_subdirectory("xrPhysics")
     add_subdirectory("xrParticles")
     add_subdirectory("xrScripts")
+    add_subdirectory("xrUI")
 endif()
 
 if(NOT IXRAY_COMPRESSOR_ONLY)
@@ -52,6 +53,7 @@ if(NOT IXRAY_COMPRESSOR_ONLY)
     set_target_properties(xrParticles PROPERTIES ${IXRAY_FOLDER_ENGINE})
     set_target_properties(xrAbstractions PROPERTIES ${IXRAY_FOLDER_ENGINE})
     set_target_properties(xrScripts PROPERTIES ${IXRAY_FOLDER_ENGINE})
+    set_target_properties(xrUI PROPERTIES ${IXRAY_FOLDER_ENGINE})
 
     if(IXR_TEST_CI)
         set_target_properties(xrGame PROPERTIES ${IXRAY_FOLDER_GAME})

src/xrEngine/IGame_Actor.cpp

@@ -2,4 +2,5 @@
 #include "stdafx.h"
 #include "IGame_Actor.h"
 
-ENGINE_API IGame_Actor* g_pIGameActor = nullptr;
+ENGINE_API IGame_Actor* g_pIGameActor = nullptr;
+ENGINE_API int psActorSleepTime = 1;

src/xrEngine/IGame_Actor.h

@@ -1,6 +1,8 @@
 #pragma once
+#include "IInputReceiver.h"
 
-class IGame_Actor
+class IGame_Actor:
+	public IInputReceiver
 {
 public:
 	virtual xr_vector<xr_string> GetKnowedPortions() const = 0;
@@ -9,6 +11,9 @@ class IGame_Actor
 	virtual void DisableInfoPortion(const char* info_id) = 0;
 	virtual void SetActorPosition(Fvector pos) = 0;
 	virtual void SetActorDirection(float dir) = 0;
+	virtual void StopAnyMove() = 0;
 };
 
-extern ENGINE_API IGame_Actor* g_pIGameActor;
+extern ENGINE_API IGame_Actor* g_pIGameActor;
+
+extern ENGINE_API int psActorSleepTime;

src/xrEngine/IGame_Level.h

@@ -85,6 +85,7 @@ class ENGINE_API	IGame_Level	:
 	virtual shared_str			name					() const = 0;
 	virtual void				GetLevelInfo			( CServerInfo* si ) = 0;
 
+	virtual u64					GetGameTime				() { return 0; };
 	virtual BOOL				net_Start				( LPCSTR op_server, LPCSTR op_client)	= 0;
 	virtual void				net_Load				( LPCSTR name )							= 0;
 	virtual void				net_Save				( LPCSTR name )							= 0;

src/xrEngine/IGame_Menu.cpp

@@ -0,0 +1,2 @@
+#include "stdafx.h"
+#include "IGame_Menu.h"

src/xrEngine/IGame_Menu.h

@@ -0,0 +1,17 @@
+#pragma once
+class CUIWindow;
+
+class IMainMenu
+{
+public:
+	virtual			~IMainMenu() {};
+	virtual void	Activate(bool bActive) = 0;
+	virtual	bool	IsActive() = 0;
+	virtual	bool	CanSkipSceneRendering() = 0;
+	virtual void	DestroyInternal(bool bForce) = 0;
+
+	virtual void RegisterPPDraw(CUIWindow*) = 0;
+	virtual void UnregisterPPDraw(CUIWindow*) = 0;
+
+	virtual class CDialogHolder* GetDialogHolder() = 0;
+};

src/xrEngine/IGame_Persistent.h

@@ -1,5 +1,3 @@
-#ifndef IGame_PersistentH
-#define IGame_PersistentH
 #pragma once
 
 #include "../xrServerEntities/gametype_chooser.h"
@@ -113,17 +111,7 @@ class ENGINE_API IGame_Persistent	:
 	virtual bool					CanBePaused			()		{ return true;}
 };
 
-class IMainMenu
-{
-public:
-	virtual			~IMainMenu						()													{};
-	virtual void	Activate						(bool bActive)										=0; 
-	virtual	bool	IsActive						()													=0; 
-	virtual	bool	CanSkipSceneRendering			()													=0; 
-	virtual void	DestroyInternal					(bool bForce)										=0;
-};
-
 extern ENGINE_API	bool g_dedicated_server;
 extern ENGINE_API	IGame_Persistent*	g_pGamePersistent;
-#endif //IGame_PersistentH
 
+#include "IGame_Menu.h"

src/xrEngine/IGame_UICustom.cpp

@@ -0,0 +1,4 @@
+#include "stdafx.h"
+#include "IGame_UICustom.h"
+
+ENGINE_API IGame_CustomUI* g_pGameCustom = nullptr;

src/xrEngine/IGame_UICustom.h

@@ -0,0 +1,11 @@
+#pragma once
+
+class IGame_CustomUI
+{
+public:
+	virtual void ShowGameIndicators(bool) = 0;
+	virtual bool GameIndicatorsShown() const = 0;
+	virtual class CDialogHolder* GetDialogHolder() = 0;
+};
+
+extern ENGINE_API IGame_CustomUI* g_pGameCustom;