KillingFloor2/KF2-YetAnotherScoreboard
KillingFloor2/KF2-YetAnotherScoreboard
1
0
Fork 0
Code Releases 7 Activity

Fix boxes height, replace screen width with height when calculating base dimensions

Browse Source
This commit is contained in:
GenZmeY 2021-05-27 02:56:29 +03:00
parent 59919b6814
commit 897bbca273
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ScoreboardExt/Classes/GUIStyleBase.uc
View File

@ -162,13 +162,13 @@ function PickDefaultFontSize( float YRes )
DefaultHeight=float(YL)*YRes; DefaultHeight=float(YL)*YRes;
} }
final function float ScreenScale( float Size, optional float MaxRes=1920.f ) final function float ScreenScale( float Size, optional float MaxRes=1080.f )
{ {
return Size * ( HUDOwner.SizeX / MaxRes ); return Size * ( HUDOwner.SizeY / MaxRes );
} }
final function float GetFontScaler(optional float Scaler=0.750f, optional float Min=0.175f, optional float Max=1.0f) final function float GetFontScaler(optional float Scaler=0.750f, optional float Min=0.175f, optional float Max=1.0f)
{ {
return FClamp((HUDOwner.SizeX / 1920.f) * Scaler, Min, Max); return FClamp((HUDOwner.SizeY / 1080.f) * Scaler, Min, Max);
} }
final function DrawText( coerce string S ) final function DrawText( coerce string S )
{ {

34
ScoreboardExt/Classes/KFScoreBoard.uc
View File

@ -62,7 +62,7 @@ function DrawMenu()
local PlayerController PC; local PlayerController PC;
local KFPlayerReplicationInfo KFPRI; local KFPlayerReplicationInfo KFPRI;
local PlayerReplicationInfo PRI; local PlayerReplicationInfo PRI;
local float XPos, YPos, YL, XL, FontScalar, XPosCenter, DefFontHeight, BoxW, BoxX; local float XPos, YPos, YL, XL, FontScalar, XPosCenter, BoxW, BoxX, BoxH;
local int i, j, NumSpec, NumPlayer, NumAlivePlayer, Width; local int i, j, NumSpec, NumPlayer, NumAlivePlayer, Width;
PC = GetPlayer(); PC = GetPlayer();
@ -125,30 +125,30 @@ function DrawMenu()
// Header font info. // Header font info.
Canvas.Font = Owner.CurrentStyle.PickFont(FontScalar); Canvas.Font = Owner.CurrentStyle.PickFont(FontScalar);
DefFontHeight = Owner.CurrentStyle.DefaultHeight;
XPosCenter = (Canvas.ClipX * 0.5); XPosCenter = (Canvas.ClipX * 0.5);
// Server Name // Server Name
XPos = XPosCenter;
YPos += DefFontHeight;
S = KFGRI.ServerName; S = KFGRI.ServerName;
Canvas.TextSize(S, XL, YL, FontScalar, FontScalar); Canvas.TextSize(S, XL, YL, FontScalar, FontScalar);
XPos = XPosCenter;
YPos += YL;
BoxW = XL + (Owner.HUDOwner.ScaledBorderSize*4); BoxW = XL + (Owner.HUDOwner.ScaledBorderSize*4);
BoxX = XPos - (BoxW * 0.5); BoxX = XPos - (BoxW * 0.5);
BoxH = YL + (Owner.HUDOwner.ScaledBorderSize);
Canvas.SetDrawColor(10, 10, 10, 200); Canvas.SetDrawColor(10, 10, 10, 200);
Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, DefFontHeight, 4); Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, BoxH, 4);
Canvas.SetDrawColor(250, 0, 0, 255); Canvas.SetDrawColor(250, 0, 0, 255);
Owner.CurrentStyle.DrawTextShadow(S, BoxX + ((BoxW-XL) * 0.5f), YPos + ((DefFontHeight-YL) * 0.5f), 1, FontScalar); Owner.CurrentStyle.DrawTextShadow(S, BoxX + ((BoxW-XL) * 0.5f), YPos, 1, FontScalar);
// Deficulty | Wave | MapName // Deficulty | Wave | MapName
XPos = XPosCenter; XPos = XPosCenter;
YPos += DefFontHeight+Owner.HUDOwner.ScaledBorderSize; YPos += YL+Owner.HUDOwner.ScaledBorderSize*2;
S = Class'KFCommon_LocalizedStrings'.Static.GetDifficultyString (KFGRI.GameDifficulty) $" | "$class'KFGFxHUD_ScoreboardMapInfoContainer'.default.WaveString@KFGRI.WaveNum $" | " $class'KFCommon_LocalizedStrings'.static.GetFriendlyMapName(PC.WorldInfo.GetMapName(true)); S = Class'KFCommon_LocalizedStrings'.Static.GetDifficultyString (KFGRI.GameDifficulty) $" | "$class'KFGFxHUD_ScoreboardMapInfoContainer'.default.WaveString@KFGRI.WaveNum $" | " $class'KFCommon_LocalizedStrings'.static.GetFriendlyMapName(PC.WorldInfo.GetMapName(true));
Canvas.TextSize(S, XL, YL, FontScalar, FontScalar); Canvas.TextSize(S, XL, YL, FontScalar, FontScalar);
@ -156,15 +156,15 @@ function DrawMenu()
BoxW = XL + (Owner.HUDOwner.ScaledBorderSize*4); BoxW = XL + (Owner.HUDOwner.ScaledBorderSize*4);
BoxX = XPos - (BoxW * 0.5); BoxX = XPos - (BoxW * 0.5);
Canvas.SetDrawColor(10, 10, 10, 200); Canvas.SetDrawColor(10, 10, 10, 200);
Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, DefFontHeight, 4); Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, BoxH, 4);
Canvas.SetDrawColor(0, 250, 0, 255); Canvas.SetDrawColor(0, 250, 0, 255);
Owner.CurrentStyle.DrawTextShadow(S, BoxX + ((BoxW-XL) * 0.5f), YPos + ((DefFontHeight-YL) * 0.5f), 1, FontScalar); Owner.CurrentStyle.DrawTextShadow(S, BoxX + ((BoxW-XL) * 0.5f), YPos, 1, FontScalar);
// Players | Spectators | Alive | Time // Players | Spectators | Alive | Time
XPos = XPosCenter; XPos = XPosCenter;
YPos += DefFontHeight+Owner.HUDOwner.ScaledBorderSize; YPos += YL+Owner.HUDOwner.ScaledBorderSize*2;
S = " Players : " $ NumPlayer $ " | Spectators : " $ NumSpec $ " | Alive : " $ NumAlivePlayer $ " | Elapsed Time : " $ Owner.CurrentStyle.GetTimeString(KFGRI.ElapsedTime) $ " "; S = " Players : " $ NumPlayer $ " | Spectators : " $ NumSpec $ " | Alive : " $ NumAlivePlayer $ " | Elapsed Time : " $ Owner.CurrentStyle.GetTimeString(KFGRI.ElapsedTime) $ " ";
Canvas.TextSize(S, XL, YL, FontScalar, FontScalar); Canvas.TextSize(S, XL, YL, FontScalar, FontScalar);
@ -172,18 +172,18 @@ function DrawMenu()
BoxW = XL + (Owner.HUDOwner.ScaledBorderSize*4); BoxW = XL + (Owner.HUDOwner.ScaledBorderSize*4);
BoxX = XPos - (BoxW * 0.5); BoxX = XPos - (BoxW * 0.5);
Canvas.SetDrawColor(10, 10, 10, 200); Canvas.SetDrawColor(10, 10, 10, 200);
Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, DefFontHeight, 4); Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, BoxH, 4);
Canvas.SetDrawColor(250, 250, 0, 255); Canvas.SetDrawColor(250, 250, 0, 255);
Owner.CurrentStyle.DrawTextShadow(S, BoxX + ((BoxW-XL) * 0.5f), YPos + ((DefFontHeight-YL) * 0.5f), 1, FontScalar); Owner.CurrentStyle.DrawTextShadow(S, BoxX + ((BoxW-XL) * 0.5f), YPos, 1, FontScalar);
Width = Canvas.ClipX * 0.625; Width = Canvas.ClipX * 0.625;
XPos = (Canvas.ClipX - Width) * 0.5; XPos = (Canvas.ClipX - Width) * 0.5;
YPos += DefFontHeight * 2.0; YPos += YL * 2.0;
Canvas.SetDrawColor (10, 10, 10, 200); Canvas.SetDrawColor (10, 10, 10, 200);
Owner.CurrentStyle.DrawRectBox(XPos, YPos, Width, DefFontHeight, 4); Owner.CurrentStyle.DrawRectBox(XPos, YPos, Width, BoxH, 4);
Canvas.SetDrawColor(250, 250, 250, 255); Canvas.SetDrawColor(250, 250, 250, 255);
@ -259,7 +259,9 @@ function DrawPlayerEntry( Canvas C, int Index, float YOffset, float Height, floa
C.Font = Owner.CurrentStyle.PickFont(FontScalar); C.Font = Owner.CurrentStyle.PickFont(FontScalar);
TextYOffset = YOffset + (Height * 0.5f) - (Owner.CurrentStyle.DefaultHeight * 0.5f); Canvas.TextSize("ABC", XL, YL, FontScalar, FontScalar);
TextYOffset = YOffset + (Height * 0.5f) - (YL * 0.5f);
if (PlayerIndex == Index) if (PlayerIndex == Index)
C.SetDrawColor (51, 30, 101, 150); C.SetDrawColor (51, 30, 101, 150);
else C.SetDrawColor (30, 30, 30, 150); else C.SetDrawColor (30, 30, 30, 150);