From 0ad17039766e38be3e4b561e70f7982203239c13 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 28 Apr 2008 10:55:54 +0000 Subject: [PATCH] use correct FontBaseZoom --- .../ScreenCredits overlay/credits.lua | 6 +++--- .../ScreenSelectMusic decorations/default.lua | 20 +++++++++--------- .../ScreenTitleMenu overlay/default.lua | 6 +++--- .../Themes/default/Fonts/_regra 32 bold.ini | 1 + .../Themes/default/Fonts/_regra bold 36.ini | 1 + .../default/Fonts/_sf sports night ns 52.ini | 1 + .../Fonts/_sf sports night ns upright 52.ini | 1 + .../default/Fonts/_sf square head 52.ini | 1 + .../default/Fonts/_sf square head 60.ini | 1 + .../default/Fonts/_sf square head bold 28.ini | 1 + .../default/Fonts/_terminator two 32.ini | 1 + .../default/Fonts/_terminator two 40.ini | 1 + .../default/Fonts/_terminator two 50.ini | 1 + .../default/Fonts/_terminator two 60.ini | 1 + .../default/Fonts/_terminator two 92.ini | 1 + .../Fonts/_terminator two stroke 60.ini | 1 + .../Fonts/_terminator two stroke 92.ini | 1 + .../default/Fonts/_venacti 100 combo.ini | 1 + .../Themes/default/Fonts/_venacti 20px.ini | 1 + .../Themes/default/Fonts/_venacti 24.ini | 1 + .../default/Fonts/_venacti 30 italic.ini | 1 + .../Themes/default/Fonts/_venacti bold 26.ini | 1 + .../Themes/default/Fonts/_venacti bold 28.ini | 1 + .../Themes/default/Fonts/_venacti bold 30.ini | 1 + .../Themes/default/Fonts/_venacti bold 32.ini | 1 + .../Themes/default/Fonts/_zosma 60 bold.ini | 1 + .../Graphics/ModIconSelectMusic Empty.redir | 2 +- .../OptionRow FrameExit/Focus (doubleres).png | Bin 0 -> 6116 bytes .../NoFocus (doubleres).png | Bin 0 -> 6566 bytes .../Graphics/OptionRow FrameExit/default.lua | 10 +++++++++ .../Focus (doubleres).png | Bin 0 -> 8189 bytes .../NoFocus (doubleres).png | Bin 0 -> 7623 bytes .../OptionRow FrameNormal/default.lua | 10 +++++++++ .../ScreenSelectPlayMode icon/default.lua | 6 +++--- .../ScreenSelectStyle2 icon/default.lua | 10 ++++----- .../default.lua | 4 ++-- .../default.lua | 4 ++-- stepmania/Themes/default/Scripts/Other.lua | 18 ++++++++-------- stepmania/Themes/default/metrics.ini | 8 +++---- stepmania/src/ScreenDebugOverlay.cpp | 3 --- stepmania/src/ScreenStatsOverlay.cpp | 1 - 41 files changed, 85 insertions(+), 46 deletions(-) create mode 100644 stepmania/Themes/default/Graphics/OptionRow FrameExit/Focus (doubleres).png create mode 100644 stepmania/Themes/default/Graphics/OptionRow FrameExit/NoFocus (doubleres).png create mode 100644 stepmania/Themes/default/Graphics/OptionRow FrameExit/default.lua create mode 100644 stepmania/Themes/default/Graphics/OptionRow FrameNormal/Focus (doubleres).png create mode 100644 stepmania/Themes/default/Graphics/OptionRow FrameNormal/NoFocus (doubleres).png create mode 100644 stepmania/Themes/default/Graphics/OptionRow FrameNormal/default.lua diff --git a/stepmania/Themes/default/BGAnimations/ScreenCredits overlay/credits.lua b/stepmania/Themes/default/BGAnimations/ScreenCredits overlay/credits.lua index e6c1547883..8ee9a5fc5c 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenCredits overlay/credits.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenCredits overlay/credits.lua @@ -118,9 +118,9 @@ local sections = { -- To add people or sections modify the above. local fontPath = THEME:GetPathF( "ScreenCredits", "titles" ) -local lineOn = cmd(zoom,0.5) -local sectionOn = cmd(zoom,0.5;diffuse,1,.5,.5,1) -local otherOn = cmd(zoom,0.5;diffuse,.5,.5,1,1) +local lineOn = cmd() +local sectionOn = cmd(diffuse,1,.5,.5,1) +local otherOn = cmd(diffuse,.5,.5,1,1) local t = Def.ActorScroller { SecondsPerItem = 0.40; NumItemsToDraw = 40; diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index 37f7bb50d8..9d885e85ed 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -50,7 +50,7 @@ local function OptionsArea(pn) }; LoadFont("_terminator two 32" ) .. { - InitCommand=cmd(y,-4;settext,PlayerNumberToLocalizedString(pn);zoom,0.5;zoom,0.5;diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000");); + InitCommand=cmd(y,-4;settext,PlayerNumberToLocalizedString(pn);diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000");); }; }; t[#t+1] = Def.ModIconRow { @@ -80,7 +80,7 @@ t[#t+1] = Def.ActorFrame { t[#t+1] = LoadFont("Common", "normal") .. { InitCommand=cmd(x,SCREEN_CENTER_X-160;y,SCREEN_CENTER_Y+94;playcommand,"Set"); - OnCommand=cmd(zoom,0.5;shadowlength,2;diffusealpha,0;linear,0.5;diffusealpha,1); + OnCommand=cmd(shadowlength,2;diffusealpha,0;linear,0.5;diffusealpha,1); OffCommand=cmd(linear,0.5;diffusealpha,0); SetCommand=function(self) @@ -119,7 +119,7 @@ t[#t+1] = Def.ActorFrame { }; LoadFont( "_sf square head bold 28" ) .. { - InitCommand=cmd(zoom,0.5;maxwidth,300;playcommand,"Set";x,10;shadowlength,0;diffuse,color("#fbfb57");strokecolor,color("#696800");); + InitCommand=cmd(maxwidth,300;playcommand,"Set";x,10;shadowlength,0;diffuse,color("#fbfb57");strokecolor,color("#696800");); SetCommand=cmd(settext,string.upper( SortOrderToLocalizedString(GAMESTATE:GetSortOrder()) )); SortOrderChangedMessageCommand=cmd(playcommand,"Set"); }; @@ -159,7 +159,7 @@ t[#t+1] = Def.PaneDisplay { t[#t+1] = Def.BPMDisplay { File=THEME:GetPathF("BPMDisplay", "bpm"); Name="BPMDisplay"; - InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+294;y,SCREEN_CENTER_Y+1;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");zoom,0.5;); + InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+294;y,SCREEN_CENTER_Y+1;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");); OnCommand=cmd(stoptweening;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); SetCommand=function(self) self:SetFromGameState() end; @@ -193,7 +193,7 @@ t[#t+1] = LoadActor( "stop icon" ) .. { }; t[#t+1] = LoadFont("_regra 32 bold") .. { - InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X-14;y,SCREEN_CENTER_Y-14;zoom,0.5;settext,"/Senser";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,360); + InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X-14;y,SCREEN_CENTER_Y-14;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,360); SetCommand=function(self) local s = "---"; local song = GAMESTATE:GetCurrentSong(); @@ -209,7 +209,7 @@ t[#t+1] = LoadFont("_regra 32 bold") .. { CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); }; t[#t+1] = LoadFont("_regra 32 bold") .. { - InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+228;y,SCREEN_CENTER_Y+4;zoom,0.5;settext,"_Hardcore Techno";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");); + InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+228;y,SCREEN_CENTER_Y+4;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");); SetCommand=function(self) local s = "---"; local song = GAMESTATE:GetCurrentSong(); @@ -300,7 +300,7 @@ t[#t+1] = Def.CourseContentsList { }; LoadFont("Common","normal") .. { - OnCommand=cmd(x,SCREEN_CENTER_X-192;y,SCREEN_CENTER_Y-230;horizalign,right;zoom,0.5;shadowlength,0); + OnCommand=cmd(x,SCREEN_CENTER_X-192;y,SCREEN_CENTER_Y-230;horizalign,right;shadowlength,0); SetSongCommand=function(self, params) self:settext(params.Modifiers); end; }; @@ -344,7 +344,7 @@ t[#t+1] = Def.ActorFrame{ }; LoadFont("_venacti 24")..{ Name="NumStages"; - InitCommand=cmd(x,32;y,-4;shadowlength,0;zoom,0.5;skewx,-0.2;diffusebottomedge,color("#068EE1FF");strokecolor,color("#FF000000")); + InitCommand=cmd(x,32;y,-4;shadowlength,0;skewx,-0.2;diffusebottomedge,color("#068EE1FF");strokecolor,color("#FF000000")); SetCommand=function(self) local Song = GAMESTATE:GetCurrentSong(); local postfix = " STAGES"; @@ -401,7 +401,7 @@ if not GAMESTATE:IsCourseMode() then end; }; LoadFont( "_terminator two 32" ) .. { - InitCommand=cmd(x,-4;y,-3;settext,"P1";zoom,0.5;diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000");); + InitCommand=cmd(x,-4;y,-3;settext,"P1";diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000");); BeginCommand=cmd(player,"PlayerNumber_P1";); PlayerJoinedMessageCommand=function(self,param ) if param.Player ~= "PlayerNumber_P1" then return end; @@ -426,7 +426,7 @@ if not GAMESTATE:IsCourseMode() then end; }; LoadFont( "_terminator two 32" ) .. { - InitCommand=cmd(x,4;y,-3;settext,"P2";zoom,0.5;diffuse,color("#83b767");shadowlength,0;strokecolor,color("#00000000");); + InitCommand=cmd(x,4;y,-3;settext,"P2";diffuse,color("#83b767");shadowlength,0;strokecolor,color("#00000000");); BeginCommand=cmd(player,"PlayerNumber_P2";); PlayerJoinedMessageCommand=function(self,param ) if param.Player ~= "PlayerNumber_P2" then return end; diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu overlay/default.lua index 46a58331ef..27e03b19c6 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu overlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu overlay/default.lua @@ -6,7 +6,7 @@ local t = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X-200;y,SCREEN_TOP;vertalign,top;); }; LoadFont("Common", "normal") .. { - InitCommand=cmd(x,SCREEN_CENTER_X-266;y,SCREEN_TOP+36;horizalign,left;zoom,0.5;shadowlengthx,0;shadowlengthy,2;playcommand,"Set"); + InitCommand=cmd(x,SCREEN_CENTER_X-266;y,SCREEN_TOP+36;horizalign,left;shadowlengthx,0;shadowlengthy,2;playcommand,"Set"); SetCommand=function(self) local s = ""; local fmt = THEME:GetString( Var "LoadingScreen", "%d songs in %d groups" ); @@ -37,14 +37,14 @@ local t = Def.ActorFrame { end; }; LoadFont("Common", "normal") .. { - InitCommand=cmd(x,SCREEN_LEFT+20;y,SCREEN_TOP+36;horizalign,left;diffuse,0.6,0.6,0.6,1;zoom,0.5;shadowlength,2); + InitCommand=cmd(x,SCREEN_LEFT+20;y,SCREEN_TOP+36;horizalign,left;diffuse,0.6,0.6,0.6,1;shadowlength,2); }; Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X-250;y,SCREEN_CENTER_Y+200;); LoadActor( "stepmania logo" ) .. { }; LoadFont( "_venacti bold 24" ) .. { - InitCommand=cmd(y,-25;settext,ProductVersion() .. " " .. VersionTime();zoom,0.5;diffuse,color("#000000");shadowlength,0;); + InitCommand=cmd(y,-25;settext,ProductVersion() .. " " .. VersionTime();diffuse,color("#000000");shadowlength,0;); }; }; } diff --git a/stepmania/Themes/default/Fonts/_regra 32 bold.ini b/stepmania/Themes/default/Fonts/_regra 32 bold.ini index 9cb6ee6bdc..41a2efc896 100755 --- a/stepmania/Themes/default/Fonts/_regra 32 bold.ini +++ b/stepmania/Themes/default/Fonts/_regra 32 bold.ini @@ -5,6 +5,7 @@ LineSpacing=38 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=12 1=12 2=12 diff --git a/stepmania/Themes/default/Fonts/_regra bold 36.ini b/stepmania/Themes/default/Fonts/_regra bold 36.ini index 9a9eba319d..ec159649d4 100755 --- a/stepmania/Themes/default/Fonts/_regra bold 36.ini +++ b/stepmania/Themes/default/Fonts/_regra bold 36.ini @@ -5,6 +5,7 @@ LineSpacing=43 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns 52.ini b/stepmania/Themes/default/Fonts/_sf sports night ns 52.ini index 00c62f690a..eba3156aa6 100755 --- a/stepmania/Themes/default/Fonts/_sf sports night ns 52.ini +++ b/stepmania/Themes/default/Fonts/_sf sports night ns 52.ini @@ -6,6 +6,7 @@ DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=3 ScaleAllWidthsBy=1.2068965517241379310344827586207 +FontBaseZoom=0.5 0=4 1=4 2=4 diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 52.ini b/stepmania/Themes/default/Fonts/_sf sports night ns upright 52.ini index 9910cfe6f0..40fbae3e3a 100755 --- a/stepmania/Themes/default/Fonts/_sf sports night ns upright 52.ini +++ b/stepmania/Themes/default/Fonts/_sf sports night ns upright 52.ini @@ -6,6 +6,7 @@ DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=3 ScaleAllWidthsBy=1.2068965517241379310344827586207 +FontBaseZoom=0.5 0=4 1=4 2=4 diff --git a/stepmania/Themes/default/Fonts/_sf square head 52.ini b/stepmania/Themes/default/Fonts/_sf square head 52.ini index c00eceb63a..6c80054c52 100755 --- a/stepmania/Themes/default/Fonts/_sf square head 52.ini +++ b/stepmania/Themes/default/Fonts/_sf square head 52.ini @@ -5,6 +5,7 @@ LineSpacing=51 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=7 1=7 2=7 diff --git a/stepmania/Themes/default/Fonts/_sf square head 60.ini b/stepmania/Themes/default/Fonts/_sf square head 60.ini index 2e50be6e79..0ae1f76f4b 100755 --- a/stepmania/Themes/default/Fonts/_sf square head 60.ini +++ b/stepmania/Themes/default/Fonts/_sf square head 60.ini @@ -5,6 +5,7 @@ LineSpacing=60 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 +FontBaseZoom=0.5 0=12 1=12 2=12 diff --git a/stepmania/Themes/default/Fonts/_sf square head bold 28.ini b/stepmania/Themes/default/Fonts/_sf square head bold 28.ini index 8657966e9a..230b330eea 100755 --- a/stepmania/Themes/default/Fonts/_sf square head bold 28.ini +++ b/stepmania/Themes/default/Fonts/_sf square head bold 28.ini @@ -6,6 +6,7 @@ DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 AddToAllWidths=2 +FontBaseZoom=0.5 0=6 1=6 2=6 diff --git a/stepmania/Themes/default/Fonts/_terminator two 32.ini b/stepmania/Themes/default/Fonts/_terminator two 32.ini index 228960fa1d..f5a304249e 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 32.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 32.ini @@ -5,6 +5,7 @@ LineSpacing=32 DrawExtraPixelsLeft=4 DrawExtraPixelsRight=4 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=8 1=8 2=8 diff --git a/stepmania/Themes/default/Fonts/_terminator two 40.ini b/stepmania/Themes/default/Fonts/_terminator two 40.ini index 4ddbbc8b4f..f46f41cba0 100644 --- a/stepmania/Themes/default/Fonts/_terminator two 40.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 40.ini @@ -6,6 +6,7 @@ DrawExtraPixelsRight=0 AdvanceExtraPixels=0 FontBaseZoom=0.5 DefaultStrokeColor=#FFFFFF + [numbers] Baseline=34 0=26 diff --git a/stepmania/Themes/default/Fonts/_terminator two 50.ini b/stepmania/Themes/default/Fonts/_terminator two 50.ini index 094288ef4c..f09face62c 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 50.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 50.ini @@ -5,6 +5,7 @@ LineSpacing=51 DrawExtraPixelsLeft=4 DrawExtraPixelsRight=4 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=8 1=8 2=8 diff --git a/stepmania/Themes/default/Fonts/_terminator two 60.ini b/stepmania/Themes/default/Fonts/_terminator two 60.ini index 551816286d..4131dd7aa7 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 60.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 60.ini @@ -5,6 +5,7 @@ LineSpacing=60 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 +FontBaseZoom=0.5 0=24 1=24 2=24 diff --git a/stepmania/Themes/default/Fonts/_terminator two 92.ini b/stepmania/Themes/default/Fonts/_terminator two 92.ini index 1f9648f2b0..232c97c73e 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 92.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 92.ini @@ -5,6 +5,7 @@ LineSpacing=92 DrawExtraPixelsLeft=1 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 +FontBaseZoom=0.5 0=21 1=21 2=21 diff --git a/stepmania/Themes/default/Fonts/_terminator two stroke 60.ini b/stepmania/Themes/default/Fonts/_terminator two stroke 60.ini index ac839ef6da..9ea6367a01 100755 --- a/stepmania/Themes/default/Fonts/_terminator two stroke 60.ini +++ b/stepmania/Themes/default/Fonts/_terminator two stroke 60.ini @@ -5,6 +5,7 @@ LineSpacing=60 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 +FontBaseZoom=0.5 0=24 1=24 2=24 diff --git a/stepmania/Themes/default/Fonts/_terminator two stroke 92.ini b/stepmania/Themes/default/Fonts/_terminator two stroke 92.ini index 2114d3fb78..0d90bdae08 100755 --- a/stepmania/Themes/default/Fonts/_terminator two stroke 92.ini +++ b/stepmania/Themes/default/Fonts/_terminator two stroke 92.ini @@ -5,6 +5,7 @@ LineSpacing=92 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 +FontBaseZoom=0.5 0=21 1=21 2=21 diff --git a/stepmania/Themes/default/Fonts/_venacti 100 combo.ini b/stepmania/Themes/default/Fonts/_venacti 100 combo.ini index e857b80a22..a533e094ff 100644 --- a/stepmania/Themes/default/Fonts/_venacti 100 combo.ini +++ b/stepmania/Themes/default/Fonts/_venacti 100 combo.ini @@ -5,6 +5,7 @@ LineSpacing=120 DrawExtraPixelsLeft=8 DrawExtraPixelsRight=8 AdvanceExtraPixels=0 +FontBaseZoom=0.5 [numbers] 0=67 diff --git a/stepmania/Themes/default/Fonts/_venacti 20px.ini b/stepmania/Themes/default/Fonts/_venacti 20px.ini index be82fde473..b2498f243f 100755 --- a/stepmania/Themes/default/Fonts/_venacti 20px.ini +++ b/stepmania/Themes/default/Fonts/_venacti 20px.ini @@ -5,6 +5,7 @@ LineSpacing=24 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti 24.ini b/stepmania/Themes/default/Fonts/_venacti 24.ini index ffb8238717..e369c4c10d 100755 --- a/stepmania/Themes/default/Fonts/_venacti 24.ini +++ b/stepmania/Themes/default/Fonts/_venacti 24.ini @@ -5,6 +5,7 @@ LineSpacing=29 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti 30 italic.ini b/stepmania/Themes/default/Fonts/_venacti 30 italic.ini index 3fe349d0a0..8b1db7a86c 100755 --- a/stepmania/Themes/default/Fonts/_venacti 30 italic.ini +++ b/stepmania/Themes/default/Fonts/_venacti 30 italic.ini @@ -5,6 +5,7 @@ LineSpacing=28 DrawExtraPixelsLeft=4 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 26.ini b/stepmania/Themes/default/Fonts/_venacti bold 26.ini index 24779bbe5a..c2fe98e1ce 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 26.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 26.ini @@ -5,6 +5,7 @@ LineSpacing=31 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 28.ini b/stepmania/Themes/default/Fonts/_venacti bold 28.ini index 6e7f0783b9..4e21cb78f1 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 28.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 28.ini @@ -5,6 +5,7 @@ LineSpacing=34 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 30.ini b/stepmania/Themes/default/Fonts/_venacti bold 30.ini index 4b7a9536f2..a7c138ceb3 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 30.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 30.ini @@ -5,6 +5,7 @@ LineSpacing=28 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=1 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 32.ini b/stepmania/Themes/default/Fonts/_venacti bold 32.ini index 774ea00b58..bfaf813812 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 32.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 32.ini @@ -5,6 +5,7 @@ LineSpacing=38 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_zosma 60 bold.ini b/stepmania/Themes/default/Fonts/_zosma 60 bold.ini index 2a57ee30f4..ebfc8ae57d 100755 --- a/stepmania/Themes/default/Fonts/_zosma 60 bold.ini +++ b/stepmania/Themes/default/Fonts/_zosma 60 bold.ini @@ -5,6 +5,7 @@ LineSpacing=60 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 [numbers] Baseline=54 diff --git a/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir b/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir index 76b570e983..fb010348ff 100644 --- a/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir +++ b/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir @@ -1 +1 @@ -ModIconRow icon filled \ No newline at end of file +ModIcon Filled \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameExit/Focus (doubleres).png b/stepmania/Themes/default/Graphics/OptionRow FrameExit/Focus (doubleres).png new file mode 100644 index 0000000000000000000000000000000000000000..de101c1f9e5696bd74f26c23aa1237487db45b7a GIT binary patch literal 6116 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 literal 0 HcmV?d00001 diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameExit/NoFocus (doubleres).png b/stepmania/Themes/default/Graphics/OptionRow FrameExit/NoFocus (doubleres).png new file mode 100644 index 0000000000000000000000000000000000000000..480a79ed812092564408ca68580ea3e4ae0441c0 GIT binary patch literal 6566 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 gen5g1qkSg><}%jDebcyW&6{>5$pxu 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 R=Jp>5SV{9qmBRDj{{t!|1@iy^ literal 0 HcmV?d00001 diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameNormal/default.lua b/stepmania/Themes/default/Graphics/OptionRow FrameNormal/default.lua new file mode 100644 index 0000000000..79617a4c34 --- /dev/null +++ b/stepmania/Themes/default/Graphics/OptionRow FrameNormal/default.lua @@ -0,0 +1,10 @@ +return Def.ActorFrame { + LoadActor("focus") .. { + GainFocusCommand=cmd(visible,true;); + LoseFocusCommand=cmd(visible,false;); + }; + LoadActor("nofocus") .. { + GainFocusCommand=cmd(visible,false;); + LoseFocusCommand=cmd(visible,true;); + }; +}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua index 5b691d989c..aa3b4202b4 100755 --- a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua @@ -30,7 +30,7 @@ local t = Def.ActorFrame { InitCommand=cmd(x,94;settext,string.upper(gc:GetText());shadowlength,0;zoom,0.7;zoomtowidth,300;rotationz,-90;diffuse,c;shadowlengthx,4;shadowlengthy,0;); }; LoadFont( "_euromode 44" ) .. { - InitCommand=cmd(horizalign,right;vertalign,bottom;x,72;y,150;settext,ScreenString(gc:GetName().."Explanation");shadowlengthx,0;shadowlengthy,3;zoom,0.5;maxwidth,500;diffuse,c;strokecolor,color("#000000");); + InitCommand=cmd(horizalign,right;vertalign,bottom;x,72;y,150;settext,ScreenString(gc:GetName().."Explanation");shadowlengthx,0;shadowlengthy,3;maxwidth,500;diffuse,c;strokecolor,color("#000000");); }; }; Def.ActorFrame { @@ -46,10 +46,10 @@ local t = Def.ActorFrame { LoseFocusCommand=cmd(visible,false); }; LoadFont( "_terminator two stroke 60" ) .. { - InitCommand=cmd(y,-6;settext,string.upper(gc:GetText());shadowlength,0;zoom,0.5;maxwidth,350;diffuse,color("#000000");diffusealpha,0.35;); + InitCommand=cmd(y,-6;settext,string.upper(gc:GetText());shadowlength,0;maxwidth,350;diffuse,color("#000000");diffusealpha,0.35;); }; LoadFont( "_terminator two 60" ) .. { - InitCommand=cmd(y,-6;settext,string.upper(gc:GetText());shadowlength,0;zoom,0.5;maxwidth,350;diffuse,c;shadowlengthx,0;shadowlengthy,4;); + InitCommand=cmd(y,-6;settext,string.upper(gc:GetText());shadowlength,0;maxwidth,350;diffuse,c;shadowlengthx,0;shadowlengthy,4;); }; }; }; diff --git a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua index e6502eb085..185832a0f2 100755 --- a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua @@ -24,16 +24,16 @@ local t = Def.ActorFrame { LoadActor( "card frame " .. st ) .. { }; LoadFont( "_sf square head 60" ) .. { - InitCommand=cmd(y,-51;settext,string.upper(gc:GetText());maxwidth,500;shadowlength,0;zoom,0.5;); + InitCommand=cmd(y,-51;settext,string.upper(gc:GetText());maxwidth,500;shadowlength,0;); }; LoadFont( "_venacti bold 32" ) .. { - InitCommand=cmd(horizalign,left;x,-12;y,-2;settext,"EACH PLAYER USES\nONE CONTROLLER";maxwidth,300;shadowlength,0;diffuse,color("#000000");zoom,0.5); + InitCommand=cmd(horizalign,left;x,-12;y,-2;settext,"EACH PLAYER USES\nONE CONTROLLER";maxwidth,300;shadowlength,0;diffuse,color("#000000");); }; LoadFont( "_venacti bold 32" ) .. { - InitCommand=cmd(horizalign,right;x,98;y,42;settext,"MAX STAGE/";maxwidth,300;shadowlength,0;diffuse,color("#32d545");zoom,0.5); + InitCommand=cmd(horizalign,right;x,98;y,42;settext,"MAX STAGE/";maxwidth,300;shadowlength,0;diffuse,color("#32d545");); }; LoadFont( "_sf square head 32" ) .. { - InitCommand=cmd(horizalign,right;x,128;y,40;settext,max_stages;maxwidth,100;shadowlength,0;zoom,0.5); + InitCommand=cmd(horizalign,right;x,128;y,40;settext,max_stages;maxwidth,100;shadowlength,0;); }; LoadActor( "card " .. pad_file ) .. { InitCommand=cmd(x,-82;y,8;); @@ -55,7 +55,7 @@ local t = Def.ActorFrame { LoseFocusCommand=cmd(stopeffect;visible,false); }; LoadFont( "_terminator two 36" ) .. { - InitCommand=cmd(y,-30;settext,string.upper(gc:GetText());shadowlength,0;zoom,0.5;maxwidth,160;strokecolor,color("#000000FF")); + InitCommand=cmd(y,-30;settext,string.upper(gc:GetText());shadowlength,0;maxwidth,160;strokecolor,color("#000000FF")); }; Def.ActorFrame { InitCommand=cmd(y,10;); diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua index 076e8d745a..bfe248733c 100644 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua @@ -5,7 +5,7 @@ return LoadActor( THEME:GetPathB("ScreenWithMenuElements2","overlay") ) .. { OnCommand=cmd(); }; LoadFont( "_venacti bold 30" ) .. { - InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");zoom,0.5;settext,"\"JOY4\" IS NOT MAPPED";skewx,-0.1;); + InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");settext,"\"JOY4\" IS NOT MAPPED";skewx,-0.1;); }; }; Def.ActorFrame { @@ -14,7 +14,7 @@ return LoadActor( THEME:GetPathB("ScreenWithMenuElements2","overlay") ) .. { OnCommand=cmd(zoomx,-1); }; LoadFont( "_venacti bold 30" ) .. { - InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");zoom,0.5;settext,"P2: PRESS START TO JOIN\nTHIS IS 2 LINES OF TEXT";skewx,-0.1;); + InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");settext,"P2: PRESS START TO JOIN\nTHIS IS 2 LINES OF TEXT";skewx,-0.1;); }; }; }; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua index cdc39c19cb..8a6e654669 100644 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua @@ -8,10 +8,10 @@ return Def.ActorFrame { InitCommand=cmd(horizalign,left;y,4); }; LoadFont( "_sf sports night ns upright 52" ) .. { - InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;zoom,0.5;settext,ScreenString("HeaderText");skewx,-0.15); + InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;settext,ScreenString("HeaderText");skewx,-0.15); }; LoadFont( "_venacti 24" ) .. { - InitCommand=cmd(x,64;y,12;horizalign,left;shadowlength,0;zoom,0.5;settext,ScreenString("HeaderSubText");); + InitCommand=cmd(x,64;y,12;horizalign,left;shadowlength,0;settext,ScreenString("HeaderSubText");); }; LoadActor( "arrow" ) .. { }; diff --git a/stepmania/Themes/default/Scripts/Other.lua b/stepmania/Themes/default/Scripts/Other.lua index 0fbebcdcae..d8ae0a60be 100644 --- a/stepmania/Themes/default/Scripts/Other.lua +++ b/stepmania/Themes/default/Scripts/Other.lua @@ -112,26 +112,26 @@ function TextBannerAfterSet(self,param) --local Artist=self:GetChild("Artist"); local edge_x = 120; if Subtitle:GetText() == "" then - (cmd(zoom,0.5;maxwidth,300;x,edge_x;y,0))(Title); + (cmd(maxwidth,300;x,edge_x;y,0))(Title); (cmd(visible,false))(Subtitle); - --(cmd(zoom,0.3333;maxwidth,300;x,edge_x;y,7))(Artist); + --(cmd(zoom,0.66;maxwidth,300;x,edge_x;y,7))(Artist); else - local one_line_title_zoom = 0.5; - local one_line_sub_zoom = 0.3; + local one_line_title_zoom = 1; + local one_line_sub_zoom = 0.6; local title_width = Title:GetWidth() * one_line_title_zoom; local sub_width = Subtitle:GetWidth() * one_line_sub_zoom; local spacing = 4; local max_one_line_width = 200; if title_width + spacing + sub_width < max_one_line_width then -- subtitle to the side - (cmd(zoom,0.5;x,edge_x-sub_width-spacing;y,0))(Title); + (cmd(zoom,1;x,edge_x-sub_width-spacing;y,0))(Title); (cmd(visible,true;zoom,one_line_sub_zoom;x,edge_x;y,2))(Subtitle); - --(cmd(zoom,0.3333;maxwidth,300;x,edge_x;y,7))(Artist); + --(cmd(zoom,0.66;maxwidth,300;x,edge_x;y,7))(Artist); else -- subtitle below - (cmd(zoom,0.5;x,edge_x;y,-6;))(Title); - (cmd(visible,true;zoom,0.3;x,edge_x;y,7))(Subtitle); - --(cmd(zoom,0.3333;maxwidth,300;x,edge_x;y,9))(Artist); + (cmd(zoom,1;x,edge_x;y,-6;))(Title); + (cmd(visible,true;zoom,0.6;x,edge_x;y,7))(Subtitle); + --(cmd(zoom,0.66;maxwidth,300;x,edge_x;y,9))(Artist); end end end diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 714bb50b48..266b6dc71e 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1850,7 +1850,7 @@ Class="ScreenStatsOverlay" Fallback="Screen" StatsX=SCREEN_RIGHT-8 StatsY=SCREEN_TOP+10 -StatsOnCommand=horizalign,right;vertalign,top;zoom,0.7;shadowlength,2 +StatsOnCommand=horizalign,right;vertalign,top;shadowlength,2 [MusicWheelItem] IconX=-136 @@ -2628,7 +2628,7 @@ MountainHeight= [ModIcon] TextX=0 TextY=-2 -TextOnCommand=zoom,0.5;maxwidth,72;uppercase,true +TextOnCommand=maxwidth,72;uppercase,true [ModIconSelectMusic] Fallback="ModIcon" @@ -2638,11 +2638,11 @@ NumModIcons=6 ModIconOnCommand= SpacingX=46 SpacingY=0 -ModIconMetircsGroup="ModIcon" +ModIconMetricsGroup="ModIcon" [ModIconRowSelectMusic] Fallback="ModIconRow" -ModIconMetircsGroup="ModIconSelectMusic" +ModIconMetricsGroup="ModIconSelectMusic" [ModIconRowGameplay] Fallback="ModIconRow" diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp index 5fe668c9d4..953fd0fd73 100644 --- a/stepmania/src/ScreenDebugOverlay.cpp +++ b/stepmania/src/ScreenDebugOverlay.cpp @@ -216,7 +216,6 @@ void ScreenDebugOverlay::Init() m_textHeader.SetHorizAlign( align_left ); m_textHeader.SetX( SCREEN_LEFT+20 ); m_textHeader.SetY( SCREEN_TOP+20 ); - m_textHeader.SetZoom( 1.0f ); m_textHeader.SetText( DEBUG_MENU ); this->AddChild( &m_textHeader ); @@ -320,11 +319,9 @@ void ScreenDebugOverlay::UpdateText() txt1.SetX( SCREEN_CENTER_X-50 ); txt1.SetY( fY ); - txt1.SetZoom( 0.7f ); txt2.SetX( SCREEN_CENTER_X-30 ); txt2.SetY( fY ); - txt2.SetZoom( 0.7f ); RString s1 = (*p)->GetDisplayTitle(); RString s2 = (*p)->GetDisplayValue(); diff --git a/stepmania/src/ScreenStatsOverlay.cpp b/stepmania/src/ScreenStatsOverlay.cpp index 1a5179b900..6c67049f27 100644 --- a/stepmania/src/ScreenStatsOverlay.cpp +++ b/stepmania/src/ScreenStatsOverlay.cpp @@ -48,7 +48,6 @@ void ScreenStatsOverlay::Init() m_textSkips[i].SetY( SCALE( i, 0, NUM_SKIPS_TO_SHOW-1, rectSkips.top + 10, rectSkips.bottom - 10 ) ); - m_textSkips[i].SetZoom( 0.6f ); m_textSkips[i].SetDiffuse( RageColor(1,1,1,0) ); m_textSkips[i].SetShadowLength( 0 ); this->AddChild( &m_textSkips[i] );