Ultra wide screen restriction code refactoring and improvements:

1. Refactored ultra-wide screen mouse restriction code: Moved the main detection logic to asw_hud_master::OnThink() and reduced cpu load. Moved drawing code to asw_hud_master::Paint().

2. Add two new CVARs:
2.1 rd_draw_restricted_rectangles_coop (FCVAR_ARCHIVE | FCVAR_REPLICATED | FCVAR_NOTIFY)
2.2 rd_draw_restricted_rectangles_dm (FCVAR_ARCHIVE | FCVAR_REPLICATED | FCVAR_CHEAT | FCVAR_NOTIFY)
2.3 Purpose: Fill extra side FOVs with black on ultra-wide resolutions in coop / DM mode.

3. Move marine / weapon icons into the 16:9 area.

4. Move mission objectives into the 16:9 area.

5. Adapt 3D marine labels for ultra-wide screens accroding to different CVAR settings.

Author: ywgATustcbbs

reactivedrop/resource/challenges/rd_first_person.txt

@@ -6,5 +6,6 @@
 
 	"convars" {
 		"asw_controls"	"0"
+		"rd_draw_restricted_rectangles_coop"	"0"
 	}
 }

reactivedrop/resource/challenges/rd_third_person.txt

@@ -6,5 +6,6 @@
 
 	"convars" {
 		"asw_controls"	"2"
+		"rd_draw_restricted_rectangles_coop"	"0"
 	}
 }

src/game/client/swarm/asw_in_mouse.cpp

@@ -15,8 +15,12 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
-bool g_ultra_wide_screen = false;
-Rect_t g_clamp_area = {};
+// restricted area variables
+extern int g_nRestrictedAreaLeft;
+extern int g_nRestrictedAreaRight;
+extern int g_nScreenAreaWidth;
+extern int g_nScreenAreaHeight;
+extern bool g_bUltraWideScreen;
 
 ConVar glow_outline_color_active( "glow_outline_color_active", "153 153 204", FCVAR_NONE );
 ConVar glow_outline_color_inactive( "glow_outline_color_inactive", "77 77 77", FCVAR_NONE );
@@ -89,33 +93,11 @@ void CASWInput::ApplyMouse( int nSlot, QAngle& viewangles, CUserCmd *cmd, float
 	GetMousePos(current_posx, current_posy);
 
 	// restrict cursor to 16:9 area to prevent ultra-wide fov cheat
-	g_ultra_wide_screen = false;
 	C_ASW_Player* asw_player = C_ASW_Player::GetLocalASWPlayer();
 
-	if (asw_player && !asw_player->GetSpectatingNPC()) {
-		int screen_w = ScreenWidth();
-		int screen_h = ScreenHeight();
-		float aspect = static_cast<float>(screen_w) / screen_h;
-
-		constexpr float ratio169 = 16.0f / 9.0f;
-
-		if (aspect > ratio169) {
-			g_ultra_wide_screen = true;
-
-			int target_h = screen_h;
-			int target_w = static_cast<int>(screen_h * ratio169);
-
-			int left = (screen_w - target_w) / 2;
-			int top = 0;
-
-			g_clamp_area.x = left;
-			g_clamp_area.y = top;
-			g_clamp_area.width = left + target_w;
-			g_clamp_area.height = top + target_h;
-
-			current_posx = clamp(current_posx, g_clamp_area.x, g_clamp_area.width);
-			current_posy = clamp(current_posy, g_clamp_area.y, g_clamp_area.height);
-		}
+	if (asw_player && !asw_player->GetSpectatingNPC()) 
+	{
+		current_posx = clamp(current_posx, g_nRestrictedAreaLeft, g_nRestrictedAreaRight);
 	}
 
 	if ( ASWInput()->ControllerModeActiveMouse() )

src/game/client/swarm/vgui/asw_hud_3dmarinenames.cpp

@@ -46,6 +46,12 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
+// restricted area variables and cvars
+extern int g_nRestrictedAreaLeft;
+extern bool g_bUltraWideScreen;
+extern ConVar rd_draw_restricted_rectangles_coop;
+extern ConVar rd_draw_restricted_rectangles_dm;
+
 extern ConVar asw_draw_hud;
 extern ConVar asw_hud_alpha;
 extern ConVar asw_DebugAutoAim;
@@ -610,8 +616,14 @@ void CASWHud3DMarineNames::PaintMarineLabel( int iMyMarineNum, C_ASW_Marine *RES
 		*/
 		// the presence or absence and size of these elements depends on a variety of factors.
 		// first, is the marine on screen?
-		bool bMarineOnScreen = ( screenPos.x >= 0 ) && ( screenPos.x <= nMaxX ) &&
-			( screenPos.y >= 0 ) && ( screenPos.y <= nMaxY );
+		bool bMarineOnScreen = (screenPos.x >= 0) && (screenPos.x <= nMaxX) &&
+			(screenPos.y >= 0) && (screenPos.y <= nMaxY);
+		int nRestrictedAreaOffset = 0;
+		if (g_bUltraWideScreen && ((rd_draw_restricted_rectangles_coop.GetBool() && !ASWDeathmatchMode()) || (rd_draw_restricted_rectangles_dm.GetBool() && ASWDeathmatchMode()))) {
+			bMarineOnScreen = (screenPos.x >= g_nRestrictedAreaLeft) && (screenPos.x <= nMaxX - g_nRestrictedAreaLeft) &&
+				(screenPos.y >= 0) && (screenPos.y <= nMaxY);
+			nRestrictedAreaOffset = g_nRestrictedAreaLeft;
+		}
 
 		// COPYPASTA: if the marine isn't on screen, compute an appropriate screen point to use
 		// (don't just clip to screen coords, which makes direction change inappropriately)
@@ -720,14 +732,14 @@ void CASWHud3DMarineNames::PaintMarineLabel( int iMyMarineNum, C_ASW_Marine *RES
 		int nBoxCenterY = screenPos.y + nTotalBoxHeight / 2;
 
 		// if off to the left, push to the right
-		if ( nBoxCenterX - ( nTotalBoxWidth / 2 ) < nMinX )
+		if ( nBoxCenterX - ( nTotalBoxWidth / 2 ) < nMinX + nRestrictedAreaOffset)
 		{
-			nBoxCenterX -= nBoxCenterX - ( nTotalBoxWidth / 2 ) - nMinX;
+			nBoxCenterX -= nBoxCenterX - ( nTotalBoxWidth / 2 ) - nMinX - nRestrictedAreaOffset;
 		}
-		else if ( nBoxCenterX + ( nTotalBoxWidth / 2 ) >= nMaxX )
+		else if ( nBoxCenterX + ( nTotalBoxWidth / 2 ) >= nMaxX - nRestrictedAreaOffset)
 			// if off to the right, push to the left
 		{
-			nBoxCenterX -= nBoxCenterX + ( nTotalBoxWidth / 2 ) - nMaxX;
+			nBoxCenterX -= nBoxCenterX + ( nTotalBoxWidth / 2 ) - nMaxX + nRestrictedAreaOffset;
 		}
 
 		// if too high, push down
@@ -817,7 +829,7 @@ void CASWHud3DMarineNames::PaintMarineLabel( int iMyMarineNum, C_ASW_Marine *RES
 				// actual text
 				vgui::surface()->DrawSetTextColor( MarineNameColor1.r(), MarineNameColor1.g(), MarineNameColor1.b(), 200 );
 				vgui::surface()->DrawSetTextPos( nTextPosX, nCursorY );
-				vgui::surface()->DrawUnicodeString( wszName );
+				vgui::surface()->DrawUnicodeString(wszName);
 
 				// advance cursor
 				nCursorY += nMarineNameHeight + MAX( nLineSpacing, YRES( 2 ) );

src/game/client/swarm/vgui/asw_hud_master.cpp

@@ -45,8 +45,17 @@ ConVar rd_draw_timer( "rd_draw_timer", "0", FCVAR_ARCHIVE, "Display the current
 ConVar rd_draw_timer_color( "rd_draw_timer_color", "255 255 255 255", FCVAR_ARCHIVE, "The color of the current mission time" );
 ConVar rd_draw_marine_health_counter( "rd_draw_marine_health_counter", "0", FCVAR_ARCHIVE, "Display a numeric counter for marine health on the HUD" );
 
+// restricted area variables
+int g_nRestrictedAreaLeft;
+int g_nRestrictedAreaRight;
+int g_nScreenAreaWidth;
+int g_nScreenAreaHeight;
+bool g_bUltraWideScreen;
+// restricted area cvars
 ConVar rd_draw_restricted_borders( "rd_draw_restricted_borders", "1", FCVAR_ARCHIVE, "Display the restricted cursor area when using ultra-wide resolution" );
 ConVar rd_draw_restricted_borders_color("rd_draw_restricted_borders_color", "128 128 128 128", 0, "Color of the restricted cursor area borders");
+ConVar rd_draw_restricted_rectangles_coop("rd_draw_restricted_rectangles_coop", "1", FCVAR_ARCHIVE | FCVAR_REPLICATED | FCVAR_NOTIFY, "Fill extra side FOVs with black on ultra-wide resolution in coop mode.");
+ConVar rd_draw_restricted_rectangles_dm("rd_draw_restricted_rectangles_dm", "1", FCVAR_ARCHIVE | FCVAR_REPLICATED | FCVAR_CHEAT | FCVAR_NOTIFY, "Fill extra side FOVs with black on ultra-wide resolution in deathmatch mode.");
 
 using namespace vgui;
 
@@ -152,16 +161,18 @@ void CASW_Hud_Master::OnThink()
 
 	C_ASW_Player *pPlayer = C_ASW_Player::GetLocalASWPlayer();
 
-	if ( !pPlayer || !ASWGameResource() )
+	if (!pPlayer || !ASWGameResource())
+	{
 		return;
+	}
 
 	if ( ASWDeathmatchMode() )
 	{
 		int nFrags[ASW_MAX_MARINE_RESOURCES];
-		for ( int i = 0; i < ASW_MAX_MARINE_RESOURCES; i++ )
+		for (int i = 0; i < ASW_MAX_MARINE_RESOURCES; i++)
 		{
-			C_ASW_Marine_Resource *pMR = ASWGameResource()->GetMarineResource( i );
-			nFrags[i] = pMR ? ASWDeathmatchMode()->GetFragCount( pMR ) : INT_MIN;
+			C_ASW_Marine_Resource* pMR = ASWGameResource()->GetMarineResource(i);
+			nFrags[i] = pMR ? ASWDeathmatchMode()->GetFragCount(pMR) : INT_MIN;
 		}
 
 		for ( int i = 0; i < NELEMS( m_nMostFrags ); i++ )
@@ -198,7 +209,7 @@ void CASW_Hud_Master::OnThink()
 				}
 			}
 
-			if ( m_nMostFrags[i] == -1 )
+			if (m_nMostFrags[i] == -1)
 			{
 				break;
 			}
@@ -398,7 +409,6 @@ void CASW_Hud_Master::OnThink()
 				m_SquadMateInfo[ nPosition ].nClips = 0;
 				m_SquadMateInfo[ nPosition ].bClipsDoubled = false;
 				m_SquadMateInfo[ nPosition ].flAmmoFraction = 0;
-				//Msg( "Setting squadmate %d ammo to zero 2\n", nPosition );
 			}
 
 			nPosition++;
@@ -434,6 +444,25 @@ void CASW_Hud_Master::OnThink()
 			StopItemFX( pMarine, -1 );
 		}
 	}
+
+	g_nScreenAreaWidth = ScreenWidth();
+	g_nScreenAreaHeight = ScreenHeight();
+	int nStandardWidth = (int)(g_nScreenAreaHeight * 16.0f / 9.0f ) + 1;
+	if (g_nScreenAreaWidth > nStandardWidth)
+	{
+		g_nRestrictedAreaLeft = nStandardWidth >> 1;
+		g_nRestrictedAreaRight = g_nScreenAreaWidth - (nStandardWidth >> 1);
+		g_bUltraWideScreen = true;
+		m_nMarinePortrait_x = g_nRestrictedAreaLeft;
+	}
+	else
+	{
+		g_nRestrictedAreaLeft = 0;
+		g_nRestrictedAreaRight = g_nScreenAreaWidth;
+		g_bUltraWideScreen = false;
+		m_nMarinePortrait_x = 0;
+	}
+
 }
 
 void CASW_Hud_Master::Paint( void )
@@ -486,15 +515,27 @@ void CASW_Hud_Master::Paint( void )
 
 	if ( m_pLocalMarineResource )
 	{
+		// Block extra side FOVs
+		if (g_bUltraWideScreen && ((rd_draw_restricted_rectangles_coop.GetBool() && !ASWDeathmatchMode()) || (rd_draw_restricted_rectangles_dm.GetBool() && ASWDeathmatchMode())) && !pPlayer->GetSpectatingNPC()) {
+			//	(0,0)-----(L,0)       (R,0)-----(W,0)
+			//	  |//////////|            |/////////|
+			//	  |//////////|            |/////////|
+			//	(0,H)-----(L,H)       (R,H)-----(W,H)
+			surface()->DrawSetColor(Color(0, 0, 0, 255));
+			surface()->DrawFilledRect(0, 0, g_nRestrictedAreaLeft, g_nScreenAreaHeight);
+			surface()->DrawFilledRect(g_nRestrictedAreaRight, 0, g_nScreenAreaWidth, g_nScreenAreaHeight);
+			//Msg("%d\t%d\n", x1, x2);
+		}
+
 		// draw restricted borders for ultra-wide screen
-		if (rd_draw_restricted_borders.GetBool() && g_ultra_wide_screen && !pPlayer->GetSpectatingNPC()) {
-			//	(x,y)-----------(w,y)
+		if (g_bUltraWideScreen && rd_draw_restricted_borders.GetBool() && !pPlayer->GetSpectatingNPC()) {
+			//	(L,0)-----------(R,0)
 			//	  |               |
 			//	  |               |
-			//	(x,h)-----------(w,h)
+			//	(L,H)-----------(R,H)
 			surface()->DrawSetColor(rd_draw_restricted_borders_color.GetColor());
-			surface()->DrawLine(g_clamp_area.x, g_clamp_area.y, g_clamp_area.x, g_clamp_area.height);
-			surface()->DrawLine(g_clamp_area.width, g_clamp_area.y, g_clamp_area.width, g_clamp_area.height);
+			surface()->DrawLine(g_nRestrictedAreaLeft, 0, g_nRestrictedAreaLeft, g_nScreenAreaHeight);
+			surface()->DrawLine(g_nRestrictedAreaRight, 0, g_nRestrictedAreaRight, g_nScreenAreaHeight);
 		}
 
 		C_ASW_Marine_Resource *pMR = m_pLocalMarineResource;
@@ -1119,7 +1160,7 @@ void CASW_Hud_Master::PaintLocalMarineInventory()
 				surface()->DrawSetColor( 66, 142, 192, 255 );		// light blue
 			}
 			surface()->DrawSetTexture( pWeapon->GetUseIconTextureID() );
-			int x = YRES( pInfo->m_iHUDIconOffsetX );
+			int x = YRES( pInfo->m_iHUDIconOffsetX ) + m_nMarinePortrait_x;
 			int y = YRES( pInfo->m_iHUDIconOffsetY );
 			int w = m_nWeapon_w;
 			int t = m_nWeapon_t;

src/game/client/swarm/vgui/asw_hud_objective.cpp

@@ -28,6 +28,9 @@
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
+// restricted area variables
+extern int g_nRestrictedAreaLeft;
+
 extern ConVar asw_draw_hud;
 extern ConVar asw_hud_alpha;
 extern ConVar rd_points_delay;
@@ -42,7 +45,7 @@ using namespace vgui;
 
 #define LETTER_INTERVAL 0.05f
 
-DECLARE_HUDELEMENT( CASWHudObjective );
+DECLARE_HUDELEMENT_DEPTH( CASWHudObjective, 45 );
 
 
 static void MsgFunc_ShowObjectives( bf_read &msg )
@@ -185,7 +188,7 @@ void CASWHudObjective::Paint( void )
 		m_pHeaderLabel->GetPos(tx, ty);
 		float fScale = ScreenWidth() / 1024.0f;
 		int width = 213 * fScale;
-		int left_side = tx - 4.0f * fScale;
+		int left_side = tx - 4.0f * fScale + g_nRestrictedAreaLeft;
 		int top = ty - 4.0f * fScale;
 		int height = th + 8.0f * fScale;
 		vgui::Vertex_t points[4] = 
@@ -247,7 +250,7 @@ void CASWHudObjective::Paint( void )
 	BaseClass::Paint();
 
 	// allow custom painting
-	int ob_x = 0;
+	int ob_x = g_nRestrictedAreaLeft;
 	int ob_y = 0;
 	for (int i=0;i<ASW_MAX_OBJECTIVES;i++)
 	{
@@ -452,7 +455,7 @@ void CASWHudObjective::LayoutObjectives()
 	float fScale = (ScreenHeight() / 768.0f) * asw_hud_scale.GetFloat();
 	int icon_size = 16.0f * fScale;
 	int tick_size = 16.0f * fScale;
-	int border = 14.0f * fScale;
+	int border = 14.0f * fScale + g_nRestrictedAreaLeft;
 	int label_x = border + tick_size + icon_size;
 	int font_tall = vgui::surface()->GetFontTall(m_font);
 	int header_y = 14.0f * fScale;