no need *upk + multilang font
This commit is contained in:
parent
cc2c325dd4
commit
13c61e140d
@ -165,7 +165,7 @@ final function float ScreenScale( float Size, optional float MaxRes=1920.f )
|
||||
{
|
||||
return Size * ( HUDOwner.SizeX / MaxRes );
|
||||
}
|
||||
final function float GetFontScaler(optional float Scaler=0.375f, optional float Min=0.175f, optional float Max=0.375f)
|
||||
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);
|
||||
}
|
||||
@ -860,7 +860,10 @@ static final function string Trim(coerce string S)
|
||||
defaultproperties
|
||||
{
|
||||
// Font'UI_Canvas_Fonts.Font_Main'
|
||||
MainFont=Font'KFScoreboardExt_Assets.Font.KFMainFont'
|
||||
//MainFont=Font'KFScoreboardExt_Assets.Font.KFMainFont'
|
||||
//InfiniteFont=Font'KFScoreboardExt_Assets.Font.KFInfiniteFont'
|
||||
|
||||
MainFont=Font'UI_Canvas_Fonts.Font_Main'
|
||||
NumberFont=Font'UI_Canvas_Fonts.Font_General'
|
||||
InfiniteFont=Font'KFScoreboardExt_Assets.Font.KFInfiniteFont'
|
||||
InfiniteFont=Font'UI_Canvas_Fonts.Font_Main'
|
||||
}
|
||||
@ -33,7 +33,7 @@ var byte CursorFade, FastCursorFade, CursorFlash;
|
||||
var int CursorStep, FastCursorStep;
|
||||
var int FontBlurX,FontBlurX2,FontBlurY,FontBlurY2,FastFontBlurX,FastFontBlurX2,FastFontBlurY,FastFontBlurY2;
|
||||
|
||||
var bool bMouseWasIdle,bIsInMenuState,bAbsorbInput,bIsInvalid,bFinishedReplication,bHideCursor,bUsingGamepad,bForceEngineCursor,bNoInputReset;
|
||||
var bool bMouseWasIdle,bIsInMenuState,bAbsorbInput,bIsInvalid,bHideCursor,bUsingGamepad,bForceEngineCursor,bNoInputReset;
|
||||
|
||||
static function KF2GUIController GetGUIController( PlayerController PC )
|
||||
{
|
||||
@ -73,9 +73,6 @@ simulated function PostBeginPlay()
|
||||
SetTimer(0.1, true, 'SetupFontBlur');
|
||||
SetTimer(0.05, true, 'SetupFastFontBlur');
|
||||
|
||||
SetTimer(0.25, true, 'SetupStyleTextures');
|
||||
SetupStyleTextures();
|
||||
|
||||
SetTimer(0.75, true, 'SetupCursorFlash');
|
||||
}
|
||||
|
||||
@ -86,95 +83,6 @@ simulated function SetupCursorFlash()
|
||||
else CursorFlash = 255;
|
||||
}
|
||||
|
||||
simulated function SetupStyleTextures()
|
||||
{
|
||||
local ObjectReferencer RepObject;
|
||||
|
||||
RepObject = HUDOwner.RepObject;
|
||||
if( RepObject != None )
|
||||
{
|
||||
CurrentStyle.MainFont = Font(RepObject.ReferencedObjects[104]);
|
||||
CurrentStyle.InfiniteFont = Font(RepObject.ReferencedObjects[155]);
|
||||
|
||||
CurrentStyle.BorderTextures[`BOX_INNERBORDER] = Texture2D(RepObject.ReferencedObjects[35]);
|
||||
CurrentStyle.BorderTextures[`BOX_INNERBORDER_TRANSPARENT] = Texture2D(RepObject.ReferencedObjects[36]);
|
||||
CurrentStyle.BorderTextures[`BOX_MEDIUM] = Texture2D(RepObject.ReferencedObjects[46]);
|
||||
CurrentStyle.BorderTextures[`BOX_MEDIUM_SLIGHTTRANSPARENT] = Texture2D(RepObject.ReferencedObjects[47]);
|
||||
CurrentStyle.BorderTextures[`BOX_MEDIUM_TRANSPARENT] = Texture2D(RepObject.ReferencedObjects[48]);
|
||||
CurrentStyle.BorderTextures[`BOX_LARGE] = Texture2D(RepObject.ReferencedObjects[79]);
|
||||
CurrentStyle.BorderTextures[`BOX_LARGE_SLIGHTTRANSPARENT] = Texture2D(RepObject.ReferencedObjects[80]);
|
||||
CurrentStyle.BorderTextures[`BOX_LARGE_TRANSPARENT] = Texture2D(RepObject.ReferencedObjects[81]);
|
||||
CurrentStyle.BorderTextures[`BOX_SMALL] = Texture2D(RepObject.ReferencedObjects[82]);
|
||||
CurrentStyle.BorderTextures[`BOX_SMALL_SLIGHTTRANSPARENT] = Texture2D(RepObject.ReferencedObjects[83]);
|
||||
CurrentStyle.BorderTextures[`BOX_SMALL_TRANSPARENT] = Texture2D(RepObject.ReferencedObjects[84]);
|
||||
CurrentStyle.BorderTextures[`BOX_CORNER_8] = Texture2D(RepObject.ReferencedObjects[160]);
|
||||
CurrentStyle.BorderTextures[`BOX_CORNER_16] = Texture2D(RepObject.ReferencedObjects[156]);
|
||||
CurrentStyle.BorderTextures[`BOX_CORNER_32] = Texture2D(RepObject.ReferencedObjects[157]);
|
||||
CurrentStyle.BorderTextures[`BOX_CORNER_64] = Texture2D(RepObject.ReferencedObjects[159]);
|
||||
CurrentStyle.BorderTextures[`BOX_CORNER_512] = Texture2D(RepObject.ReferencedObjects[158]);
|
||||
|
||||
CurrentStyle.ArrowTextures[`ARROW_DOWN] = Texture2D(RepObject.ReferencedObjects[10]);
|
||||
CurrentStyle.ArrowTextures[`ARROW_LEFT] = Texture2D(RepObject.ReferencedObjects[45]);
|
||||
CurrentStyle.ArrowTextures[`ARROW_RIGHT] = Texture2D(RepObject.ReferencedObjects[69]);
|
||||
CurrentStyle.ArrowTextures[`ARROW_UP] = Texture2D(RepObject.ReferencedObjects[87]);
|
||||
|
||||
CurrentStyle.ButtonTextures[`BUTTON_NORMAL] = Texture2D(RepObject.ReferencedObjects[3]);
|
||||
CurrentStyle.ButtonTextures[`BUTTON_DISABLED] = Texture2D(RepObject.ReferencedObjects[4]);
|
||||
CurrentStyle.ButtonTextures[`BUTTON_HIGHLIGHTED] = Texture2D(RepObject.ReferencedObjects[5]);
|
||||
CurrentStyle.ButtonTextures[`BUTTON_PRESSED] = Texture2D(RepObject.ReferencedObjects[6]);
|
||||
|
||||
CurrentStyle.TabTextures[`TAB_TOP] = Texture2D(RepObject.ReferencedObjects[76]);
|
||||
CurrentStyle.TabTextures[`TAB_BOTTOM] = Texture2D(RepObject.ReferencedObjects[77]);
|
||||
|
||||
CurrentStyle.ItemBoxTextures[`ITEMBOX_NORMAL] = Texture2D(RepObject.ReferencedObjects[40]);
|
||||
CurrentStyle.ItemBoxTextures[`ITEMBOX_DISABLED] = Texture2D(RepObject.ReferencedObjects[41]);
|
||||
CurrentStyle.ItemBoxTextures[`ITEMBOX_HIGHLIGHTED] = Texture2D(RepObject.ReferencedObjects[42]);
|
||||
|
||||
CurrentStyle.ItemBoxTextures[`ITEMBOX_BAR_NORMAL] = Texture2D(RepObject.ReferencedObjects[37]);
|
||||
CurrentStyle.ItemBoxTextures[`ITEMBOX_BAR_DISABLED] = Texture2D(RepObject.ReferencedObjects[38]);
|
||||
CurrentStyle.ItemBoxTextures[`ITEMBOX_BAR_HIGHLIGHTED] = Texture2D(RepObject.ReferencedObjects[39]);
|
||||
|
||||
CurrentStyle.CheckBoxTextures[`CHECKMARK_NORMAL] = Texture2D(RepObject.ReferencedObjects[7]);
|
||||
CurrentStyle.CheckBoxTextures[`CHECKMARK_DISABLED] = Texture2D(RepObject.ReferencedObjects[8]);
|
||||
CurrentStyle.CheckBoxTextures[`CHECKMARK_HIGHLIGHTED] = Texture2D(RepObject.ReferencedObjects[9]);
|
||||
|
||||
CurrentStyle.PerkBox[`PERK_BOX_SELECTED] = Texture2D(RepObject.ReferencedObjects[60]);
|
||||
CurrentStyle.PerkBox[`PERK_BOX_UNSELECTED] = Texture2D(RepObject.ReferencedObjects[61]);
|
||||
|
||||
CurrentStyle.ScrollTexture = Texture2D(RepObject.ReferencedObjects[71]);
|
||||
CurrentStyle.FavoriteIcon = Texture2D(RepObject.ReferencedObjects[105]);
|
||||
CurrentStyle.BankNoteIcon = Texture2D(RepObject.ReferencedObjects[106]);
|
||||
|
||||
CurrentStyle.ProgressBarTextures[`PROGRESS_BAR_NORMAL] = Texture2D(RepObject.ReferencedObjects[103]);
|
||||
CurrentStyle.ProgressBarTextures[`PROGRESS_BAR_SELECTED] = Texture2D(RepObject.ReferencedObjects[68]);
|
||||
|
||||
CurrentStyle.SliderTextures[`SLIDER_NORMAL] = Texture2D(RepObject.ReferencedObjects[110]);
|
||||
CurrentStyle.SliderTextures[`SLIDER_GRIP] = Texture2D(RepObject.ReferencedObjects[111]);
|
||||
CurrentStyle.SliderTextures[`SLIDER_DISABLED] = Texture2D(RepObject.ReferencedObjects[112]);
|
||||
|
||||
CurrentStyle.MenuDown = SoundCue(RepObject.ReferencedObjects[49]);
|
||||
CurrentStyle.MenuDrag = SoundCue(RepObject.ReferencedObjects[50]);
|
||||
CurrentStyle.MenuEdit = SoundCue(RepObject.ReferencedObjects[51]);
|
||||
CurrentStyle.MenuFade = SoundCue(RepObject.ReferencedObjects[52]);
|
||||
CurrentStyle.MenuClick = SoundCue(RepObject.ReferencedObjects[53]);
|
||||
CurrentStyle.MenuHover = SoundCue(RepObject.ReferencedObjects[54]);
|
||||
CurrentStyle.MenuUp = SoundCue(RepObject.ReferencedObjects[55]);
|
||||
|
||||
DefaultPens[`PEN_WHITE] = Texture2D(RepObject.ReferencedObjects[108]);
|
||||
DefaultPens[`PEN_BLACK] = Texture2D(RepObject.ReferencedObjects[107]);
|
||||
DefaultPens[`PEN_GRAY] = Texture2D(RepObject.ReferencedObjects[109]);
|
||||
|
||||
/*
|
||||
CursorTextures[`CURSOR_DEFAULT] = Texture2D(RepObject.ReferencedObjects[119]);
|
||||
CursorTextures[`CURSOR_RESIZEVERT] = Texture2D(RepObject.ReferencedObjects[120]);
|
||||
CursorTextures[`CURSOR_RESIZEHORZ] = Texture2D(RepObject.ReferencedObjects[121]);
|
||||
*/
|
||||
|
||||
bFinishedReplication = true;
|
||||
ClearTimer('SetupStyleTextures');
|
||||
}
|
||||
}
|
||||
|
||||
simulated function SetupFastFontBlur()
|
||||
{
|
||||
FastFontBlurX = RandRange(-8, 8);
|
||||
@ -249,9 +157,6 @@ simulated function RenderMenu( Canvas C )
|
||||
local int i;
|
||||
local float OrgX,OrgY,ClipX,ClipY;
|
||||
|
||||
if( !bFinishedReplication )
|
||||
return;
|
||||
|
||||
ClientViewport.ViewportConsole = OrgConsole;
|
||||
|
||||
OrgX = C.OrgX;
|
||||
|
||||
@ -231,14 +231,16 @@ function DrawTextWCenter(string Str, float XPos, float YPos, float BoxWidth, flo
|
||||
|
||||
Canvas.TextSize(Str, TextWidth, TextHeight, FontScalar, FontScalar);
|
||||
|
||||
Canvas.SetPos(XPos + (BoxWidth - TextWidth)/2 , YPos);
|
||||
Canvas.DrawText(Str, , FontScalar, FontScalar);
|
||||
//Canvas.SetPos(XPos + (BoxWidth - TextWidth)/2 , YPos);
|
||||
//Canvas.DrawText(Str, , FontScalar, FontScalar);
|
||||
Owner.CurrentStyle.DrawTextShadow(Str, XPos, YPos, 1, FontScalar);
|
||||
}
|
||||
|
||||
function DrawTextWLeft(string Str, float XPos, float YPos, float FontScalar)
|
||||
{
|
||||
Canvas.SetPos(XPos, YPos);
|
||||
Canvas.DrawText(Str, , FontScalar, FontScalar);
|
||||
//Canvas.SetPos(XPos, YPos);
|
||||
//Canvas.DrawText(Str, , FontScalar, FontScalar);
|
||||
Owner.CurrentStyle.DrawTextShadow(Str, XPos, YPos, 1, FontScalar);
|
||||
}
|
||||
|
||||
function DrawPlayerEntry( Canvas C, int Index, float YOffset, float Height, float Width, bool bFocus )
|
||||
|
||||
@ -9,8 +9,6 @@ var array<KFGUI_Base> HUDWidgets;
|
||||
var class<KFScoreBoard> ScoreboardClass;
|
||||
var KFScoreBoard Scoreboard;
|
||||
|
||||
var ObjectReferencer RepObject;
|
||||
|
||||
var transient KF2GUIController GUIController;
|
||||
var transient GUIStyleBase GUIStyle;
|
||||
|
||||
@ -110,5 +108,4 @@ exec function SetShowScores(bool bNewValue)
|
||||
defaultproperties
|
||||
{
|
||||
ScoreboardClass=class'KFScoreBoard'
|
||||
RepObject=ObjectReferencer'KFScoreboardExt_Assets.ObjectRef.MainObj_List'
|
||||
}
|
||||
@ -1,22 +1,3 @@
|
||||
`define WM_WAVEINBOUND 1
|
||||
`define WM_WAVESURVIVED 2
|
||||
`define WM_FINALWAVEINBOUND 3
|
||||
`define WM_BOSSINBOUND 4
|
||||
`define WM_DEFEATED 5
|
||||
`define WM_SURVIVED 6
|
||||
|
||||
`define TRADER_ALMOSTOPEN 0
|
||||
`define TRADER_MOVING 1
|
||||
`define TRADER_OPEN 2
|
||||
`define TRADER_CLOSED 3
|
||||
`define TRADER_THIRTYSECONDS 4
|
||||
`define TRADER_TENSECONDS 5
|
||||
`define TRADER_LASTWAVE 6
|
||||
`define TRADER_WELCOME 7
|
||||
`define TRADER_TOOEXPENSIVE 8
|
||||
`define TRADER_TOOHEAVY 9
|
||||
`define TRADER_WALKIEBEEP 10
|
||||
|
||||
`define BOX_INNERBORDER 0
|
||||
`define BOX_INNERBORDER_TRANSPARENT 1
|
||||
`define BOX_MEDIUM 2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user