RocketUI v0.1

.gitignore

@@ -31,6 +31,8 @@ bld/
 cmake-build/*
 !cmake-build/placeholder.txt
 cmake-build-*/*
+rocketui/cmake-build-*/*
+scaleformui/cmake-build-*/*
 
 #Ignore rebuilt static libs
 lib/public/linux64/*.a
@@ -41,4 +43,8 @@ external/crypto++-5.61/*.o
 external/crypto++-5.61/libcryptopp.a
 
 #VPC makefile
-csgo_partner.mak
+csgo_partner.mak
+
+#Thirdparty
+/thirdparty/RmlUi/build/
+/thirdparty/RmlUi/Samples/

CMakeLists.txt

@@ -78,4 +78,5 @@ add_subdirectory(matchmaking) #Does all 4 matchmaking projects
 add_subdirectory(launcher_main) #The actual executable that just dlopen's launcher
 add_subdirectory(launcher)
 
-add_subdirectory(scaleformui) #DUMMY cmake project so CLion can do analysis
+add_subdirectory(scaleformui) #DUMMY cmake project so CLion can do analysis
+add_subdirectory(rocketui) #DUMMY cmake project so CLion can do analysis

appframework/sdlmgr.cpp

@@ -328,8 +328,8 @@ class CSDLMgr : public ILauncherMgr
 	int m_MouseButtonDownY;
 
 #if WITH_OVERLAY_CURSOR_VISIBILITY_WORKAROUND
-	int m_nForceCursorVisible;
-	int m_nForceCursorVisiblePrev;
+	bool m_nForceCursorVisible;
+	bool m_nForceCursorVisiblePrev;
 	SDL_Cursor* m_hSystemArrowCursor;
 #endif
 
@@ -530,8 +530,8 @@ InitReturnVal_t CSDLMgr::Init()
 	m_bRawInput = false;
 
 #if WITH_OVERLAY_CURSOR_VISIBILITY_WORKAROUND
-	m_nForceCursorVisible = 0;
-	m_nForceCursorVisiblePrev = 0;
+	m_nForceCursorVisible = false;
+	m_nForceCursorVisiblePrev = false;
 	m_hSystemArrowCursor = SDL_CreateSystemCursor( SDL_SYSTEM_CURSOR_ARROW );
 #endif
 
@@ -1013,10 +1013,10 @@ void CSDLMgr::OnFrameRendered()
 	}
 
 #if WITH_OVERLAY_CURSOR_VISIBILITY_WORKAROUND
-	if ( m_nForceCursorVisible > 0 )
+	if ( m_nForceCursorVisible )
 	{
 		// Edge case: We were just asked to force the cursor visible, so do it now.
-		if ( m_nForceCursorVisiblePrev == 0 ) 
+		if ( !m_nForceCursorVisiblePrev )
 		{
 			SDL_SetCursor( m_hSystemArrowCursor );
 			SDL_SetWindowGrab( m_Window, SDL_FALSE );
@@ -1028,10 +1028,8 @@ void CSDLMgr::OnFrameRendered()
 		m_nForceCursorVisiblePrev = m_nForceCursorVisible;
 		return;
 	} 
-	else if ( m_nForceCursorVisiblePrev > 0 )
+	else if ( m_nForceCursorVisiblePrev )
 	{
-		Assert( m_nForceCursorVisible == 0 );
-
 		// Make sure to give the normal processing a shot at putting things
 		// back correctly.
 		m_bSetMouseCursorCalled = true;
@@ -2034,15 +2032,13 @@ void CSDLMgr::SetGammaRamp( const uint16 *pRed, const uint16 *pGreen, const uint
 //===============================================================================
 void CSDLMgr::ForceSystemCursorVisible()
 {
-	Assert( m_nForceCursorVisible >= 0 );
-	m_nForceCursorVisible += 1;
+	m_nForceCursorVisible = true;
 }
 
 //===============================================================================
 void CSDLMgr::UnforceSystemCursorVisible()
 {
-	Assert( m_nForceCursorVisible >= 1 );
-	m_nForceCursorVisible -= 1;
+	m_nForceCursorVisible = false;
 }
 
 #endif

engine/CMakeLists.txt

@@ -44,6 +44,8 @@ if( DEDICATED )
 else()
     if( USE_SCALEFORM )
         add_definitions(-DINCLUDE_SCALEFORM)
+    elseif( USE_ROCKETUI )
+        add_definitions(-DINCLUDE_ROCKETUI)
     endif()
 endif()
 remove_definitions(-DBASE) #used by cryptopp REEE

engine/gl_screen.cpp

@@ -267,6 +267,8 @@ void SCR_UpdateScreen( void )
 	pRenderContext.GetFrom( materials );
 #if defined( INCLUDE_SCALEFORM )
 	pRenderContext->RenderScaleformSlot(SF_RESERVED_BEGINFRAME_SLOT);
+#elif defined( INCLUDE_ROCKETUI )
+	//pRenderContext->BeginRocketRender();
 #endif
 
 
@@ -306,6 +308,10 @@ void SCR_UpdateScreen( void )
 	pRenderContext.GetFrom( materials );
 	pRenderContext->RenderScaleformSlot(SF_RESERVED_ENDFRAME_SLOT);
 	pRenderContext.SafeRelease();
+#elif defined( INCLUDE_ROCKETUI )
+    //pRenderContext.GetFrom( materials );
+    //pRenderContext->EndRocketRender();
+	//pRenderContext.SafeRelease();
 #endif
 	CL_TakeSnapshotAndSwap();	   
 

engine/host.cpp

@@ -160,6 +160,8 @@
 #include "ixboxsystem.h"
 #if defined( INCLUDE_SCALEFORM )
 #include "scaleformui/scaleformui.h"
+#elif defined( INCLUDE_ROCKETUI )
+#include "rocketui/rocketui.h"
 #endif
 
 extern IXboxSystem *g_pXboxSystem;
@@ -4521,6 +4523,11 @@ void _Host_RunFrame (float time)
 			g_pScaleformUI->RunFrame( ( g_ClientGlobalVariables.realtime - flLastScaleformRunFrame ) / timeScale );
 			flLastScaleformRunFrame = g_ClientGlobalVariables.realtime;
 		}
+#elif defined( INCLUDE_ROCKETUI )
+        if ( g_pRocketUI && shouldrender )
+        {
+			g_pRocketUI->RunFrame( g_ClientGlobalVariables.realtime );
+        }
 #endif
 
 		g_Log.RunFrame();

engine/keys.cpp

@@ -29,6 +29,8 @@
 
 #if defined( INCLUDE_SCALEFORM )
 #include "scaleformui/scaleformui.h"
+#elif defined( INCLUDE_ROCKETUI )
+#include "rocketui/rocketui.h"
 #endif
 
 // memdbgon must be the last include file in a .cpp file!!!
@@ -46,6 +48,7 @@ enum KeyUpTarget_t
 	KEY_UP_GAMEUI,
 	KEY_UP_SCALEFORM,
 	KEY_UP_OVERLAY,
+	KEY_UP_ROCKETUI,
 
 	KEY_UP_TARGET_COUNT
 };
@@ -1060,6 +1063,12 @@ static bool HandleScaleformKey( const InputEvent_t &event )
 
 	return g_pScaleformUI->HandleInputEvent( event );
 }
+#elif defined( INCLUDE_ROCKETUI )
+// lets RocketUI get key events
+static bool HandleRocketKey( const InputEvent_t &event )
+{
+    return g_pRocketUI->HandleInputEvent( event );
+}
 #endif
 
 //-----------------------------------------------------------------------------
@@ -1317,6 +1326,10 @@ void Key_Event( const InputEvent_t &event )
 		// scaleform goes first
 		if ( FilterKey( event, KEY_UP_SCALEFORM, HandleScaleformKey ) )
 			return;
+#elif defined( INCLUDE_ROCKETUI )
+		// rocketui goes first
+		if ( FilterKey( event, KEY_UP_ROCKETUI, HandleRocketKey ) )
+		    return;
 #endif
 	}
 #if defined ( CSTRIKE15 )
@@ -1326,6 +1339,12 @@ void Key_Event( const InputEvent_t &event )
 		if ( FilterKey( event, KEY_UP_SCALEFORM, HandleScaleformKey ) )
 			return;
 	}
+#elif defined( INCLUDE_ROCKETUI )
+    else if ( g_ClientDLL->IsChatRaised() || g_ClientDLL->IsBindMenuRaised() )
+    {
+        if ( FilterKey( event, KEY_UP_ROCKETUI, HandleRocketKey ) )
+            return;
+    }
 #endif
 #endif
 
@@ -1355,7 +1374,9 @@ void Key_Event( const InputEvent_t &event )
 
 		if ( bAllowScaleformFilter && FilterKey( event, KEY_UP_SCALEFORM, HandleScaleformKey ) )
 			return;
-
+#elif defined( INCLUDE_ROCKETUI )
+		if( FilterKey( event, KEY_UP_ROCKETUI, HandleRocketKey ) )
+		    return;
 #endif // INCLUDE_SCALEFORM
 
 		// Let vgui have a whack at keys

engine/sys_dll2.cpp

@@ -86,6 +86,8 @@
 
 #if defined( INCLUDE_SCALEFORM )
 #include "scaleformui/scaleformui.h"
+#elif defined( INCLUDE_ROCKETUI )
+#include "rocketui/rocketui.h"
 #endif
 
 #if defined(_WIN32)
@@ -134,6 +136,8 @@ IPS3SaveRestoreToUI *ps3saveuiapi = NULL;
 #endif
 #if defined( INCLUDE_SCALEFORM )
 IScaleformUI* g_pScaleformUI = NULL;
+#elif defined( INCLUDE_ROCKETUI )
+IRocketUI* g_pRocketUI = NULL;
 #endif
 
 #ifndef DEDICATED
@@ -560,6 +564,8 @@ bool CEngineAPI::Connect( CreateInterfaceFn factory )
 
 #if defined( INCLUDE_SCALEFORM )
 	g_pScaleformUI = ( IScaleformUI* ) factory( SCALEFORMUI_INTERFACE_VERSION, NULL );
+#elif defined( INCLUDE_ROCKETUI )
+	g_pRocketUI = ( IRocketUI* ) factory( ROCKETUI_INTERFACE_VERSION, NULL );
 #endif
 
 	if ( IsPC() && !IsPosix() )

engine/sys_mainwind.cpp

@@ -69,6 +69,8 @@
 
 #if defined( INCLUDE_SCALEFORM )
 #include "scaleformui/scaleformui.h"
+#elif defined( INCLUDE_ROCKETUI )
+#include "rocketui/rocketui.h"
 #endif
 
 #include <vgui/ILocalize.h>
@@ -435,6 +437,11 @@ void CGame::DispatchInputEvent( const InputEvent_t &event )
 				//		handling anything underneath the console
 				if ( !vguiActive && g_pScaleformUI && g_pScaleformUI->HandleInputEvent( event ) )
 					break;
+#elif defined( INCLUDE_ROCKETUI )
+                bool vguiActive = IsPC() && cv_vguipanel_active.GetBool();
+
+                if ( !vguiActive && g_pRocketUI && g_pRocketUI->HandleInputEvent( event ) )
+                    break;
 #endif // INCLUDE_SCALEFORM
 			}
 
@@ -479,6 +486,11 @@ void CGame::DispatchInputEvent( const InputEvent_t &event )
 		//		handling anything underneath the console
 		if ( !vguiActive && g_pScaleformUI && g_pScaleformUI->HandleInputEvent( event ) )
 			break;
+#elif defined( INCLUDE_ROCKETUI )
+        bool vguiActive = IsPC() && cv_vguipanel_active.GetBool();
+
+        if ( !vguiActive && g_pRocketUI && g_pRocketUI->HandleInputEvent( event ) )
+            break;
 #endif // INCLUDE_SCALEFORM
 
 		for ( int i=0; i < ARRAYSIZE( g_GameMessageHandlers ); i++ )

engine/view.cpp

@@ -136,6 +136,8 @@ void V_RenderVGuiOnly_NoSwap()
 #if defined( INCLUDE_SCALEFORM )
 	// Render scaleform before vgui
 	pRenderContext->AdvanceAndRenderScaleformSlot( SF_FULL_SCREEN_SLOT );
+#elif defined( INCLUDE_ROCKETUI )
+    pRenderContext->RenderRocketMenu();
 #endif
 
 	EngineVGui()->Paint( PAINT_UIPANELS );
@@ -156,11 +158,15 @@ void V_RenderVGuiOnly( void )
 {
 	materials->BeginFrame( host_frametime );
 
-#if defined( INCLUDE_SCALEFORM )
     CMatRenderContextPtr pRenderContext;
+#if defined( INCLUDE_SCALEFORM )
 	pRenderContext.GetFrom( materials );
     pRenderContext->RenderScaleformSlot(SF_RESERVED_BEGINFRAME_SLOT);
 	pRenderContext.SafeRelease();
+#elif defined( INCLUDE_ROCKETUI )
+    //pRenderContext.GetFrom( materials );
+    //pRenderContext->BeginRocketRender();
+	//pRenderContext.SafeRelease();
 #endif
 
 	EngineVGui()->Simulate();
@@ -179,6 +185,10 @@ void V_RenderVGuiOnly( void )
     pRenderContext.GetFrom( materials );
     pRenderContext->RenderScaleformSlot(SF_RESERVED_ENDFRAME_SLOT);
 	pRenderContext.SafeRelease();
+#elif defined( INCLUDE_ROCKETUI )
+    //pRenderContext.GetFrom( materials );
+    //pRenderContext->EndRocketRender();
+	//pRenderContext.SafeRelease();
 #endif
 	materials->EndFrame();
 

game/client/CMakeLists.txt

@@ -16,6 +16,8 @@ set(CSGO "1")
 add_definitions(-DCSTRIKE_CLIENT_DLL -DCSTRIKE_DLL -DGAMEUI_EMBEDDED -DGAMEUI_EXPORTS -DVERSION_SAFE_STEAM_API_INTERFACES -DUSE_ECONOMY_FEATURES)
 if( USE_SCALEFORM )
     add_definitions(-DINCLUDE_SCALEFORM)
+elseif( USE_ROCKETUI )
+    add_definitions(-DINCLUDE_ROCKETUI)
 endif()
 add_definitions(-DALLOW_TEXT_MODE=1)
 
@@ -327,6 +329,18 @@ if( USE_SCALEFORM )
         target_sources(${OUTBINNAME} PRIVATE "cstrike15/Scaleform/loadingscreen_scaleform.cpp")
         target_sources(${OUTBINNAME} PRIVATE "cstrike15/Scaleform/splitscreensignon.cpp")
     #}
+elseif( USE_ROCKETUI )
+    target_sources(${OUTBINNAME} PRIVATE "cstrike15/RocketUI/rkmenu_main.cpp")
+    target_sources(${OUTBINNAME} PRIVATE "cstrike15/RocketUI/rkhud_chat.cpp")
+    target_sources(${OUTBINNAME} PRIVATE "cstrike15/RocketUI/rkhud_pausemenu.cpp")
+    target_sources(${OUTBINNAME} PRIVATE "cstrike15/RocketUI/rkhud_teammenu.cpp")
+    target_sources(${OUTBINNAME} PRIVATE "cstrike15/RocketUI/rkhud_loadingscreen.cpp")
+    target_sources(${OUTBINNAME} PRIVATE "cstrike15/RocketUI/rkhud_infobar.cpp")
+    target_sources(${OUTBINNAME} PRIVATE "cstrike15/RocketUI/rkhud_scoreboard.cpp")
+    target_sources(${OUTBINNAME} PRIVATE "cstrike15/RocketUI/rkhud_roundtimer.cpp")
+    target_sources(${OUTBINNAME} PRIVATE "cstrike15/RocketUI/rkhud_killfeed.cpp")
+    target_sources(${OUTBINNAME} PRIVATE "cstrike15/RocketUI/rkhud_buymenu.cpp")
+    target_sources(${OUTBINNAME} PRIVATE "cstrike15/RocketUI/rkhud_radar.cpp")
 endif()
 
 #$Folder	"vgui"
@@ -347,6 +361,9 @@ if( WINDOWS OR POSIX )
     target_link_libraries(${OUTBINNAME} ${LIBCOMMON}/jpeglib_client.a) #Link with Mysterious jpeglib. This can probably be built ourselves later.
     target_link_libraries(${OUTBINNAME} vpklib_client)
 endif()
+if( USE_ROCKETUI )
+    target_link_libraries(${OUTBINNAME} ${SRCDIR}/thirdparty/RmlUi/build/libRmlCore.so)
+endif()
 target_link_libraries(${OUTBINNAME} matsys_controls_client)
 target_link_libraries(${OUTBINNAME} ${LIBPUBLIC}/libsteam_api.so) #proprietary steam api
 target_link_libraries(${OUTBINNAME} ${LIBPUBLIC}/gcsdk_client.a) #evil game coordinator voodoo

game/client/c_playerresource.cpp

@@ -97,6 +97,8 @@ C_PlayerResource::C_PlayerResource()
 	g_PR = this;
 #if defined ( INCLUDE_SCALEFORM )
 	g_pScaleformUI->AddDeviceDependentObject( this );
+#elif defined ( INCLUDE_ROCKETUI )
+    g_pRocketUI->AddDeviceDependentObject( this );
 #endif
 }
 
@@ -115,6 +117,8 @@ C_PlayerResource::~C_PlayerResource()
 	}
 
 	g_pScaleformUI->RemoveDeviceDependentObject( this );
+#elif defined( INCLUDE_ROCKETUI )
+    g_pRocketUI->RemoveDeviceDependentObject( this );
 #endif
     g_PR = NULL;
 }