From 6af73be4b67cb9e2362b3b6aa270d5bb00c7ccec Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 17 Aug 2008 00:57:23 +0000 Subject: [PATCH] move StandardDecoration stuff into ActorUtil instead of .lua file --- .../default.lua | 2 +- .../ScreenGameplay decorations/default.lua | 10 ++++----- .../BGAnimations/ScreenLogo underlay.lua | 2 +- .../default.lua | 16 +++++++------- .../_standard decoration optional.lua | 6 ------ .../_standard decoration required.lua | 8 ------- stepmania/Themes/default/Scripts/ActorDef.lua | 21 +++++++++++++++++++ 7 files changed, 36 insertions(+), 29 deletions(-) delete mode 100644 stepmania/Themes/default/BGAnimations/_standard decoration optional.lua delete mode 100644 stepmania/Themes/default/BGAnimations/_standard decoration required.lua diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua index 458199a08c..e992badfc8 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua @@ -43,7 +43,7 @@ t[#t+1] = ComboGraph(PLAYER_2) .. { InitCommand = cmd(x,SCREEN_CENTER_X+222;y,SCREEN_CENTER_Y+10;draworder,1;); }; -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "TimingDifficultyFrame", "TimingDifficultyFrame" ); +t[#t+1] = StandardDecorationFromFile( "TimingDifficultyFrame", "TimingDifficultyFrame" ); t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficultyNumber" ) .. { InitCommand=function(self) self:name("TimingDifficultyNumber"); self:settext(GetTimingDifficulty()); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end; }; diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua index 4a8bf01dcb..f16d698d4e 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenGameplay decorations/default.lua @@ -1,6 +1,6 @@ local t = LoadFallbackB(); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "StageFrame", "StageFrame" ); +t[#t+1] = StandardDecorationFromFile( "StageFrame", "StageFrame" ); t[#t+1] = LoadActor("_warning") .. { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y; @@ -12,10 +12,10 @@ t[#t+1] = LoadActor("_warning") .. { HideDangerAllMessageCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0); }; -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "LifeFrame", "LifeFrame" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "ScoreFrame", "ScoreFrame" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "LeftFrame", "LeftFrame" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "RightFrame", "RightFrame" ); +t[#t+1] = StandardDecorationFromFile( "LifeFrame", "LifeFrame" ); +t[#t+1] = StandardDecorationFromFile( "ScoreFrame", "ScoreFrame" ); +t[#t+1] = StandardDecorationFromFile( "LeftFrame", "LeftFrame" ); +t[#t+1] = StandardDecorationFromFile( "RightFrame", "RightFrame" ); t[#t+1] = Def.ModIconRow { diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua b/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua index 112b302e0c..bcb38f59c8 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua @@ -1,3 +1,3 @@ return Def.ActorFrame { - LoadActor( THEME:GetPathB('','_standard decoration required'), "GameLogo", "GameLogo " .. GAMESTATE:GetCurrentGame():GetName() ); + StandardDecorationFromFile( "GameLogo", "GameLogo " .. GAMESTATE:GetCurrentGame():GetName() ); }; \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua index bb7adbcb3d..193cdd7e5a 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua @@ -1,12 +1,12 @@ -- This needs to be an ActorFrame because children will want to load the base and merge their own elements into the table. t = Def.ActorFrame {}; -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "LeftFrame", "LeftFrame" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "RightFrame", "RightFrame" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "Header", "Header" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "Footer", "Footer" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration optional'), "Help", "Help" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration optional'), "StyleIcon", "StyleIcon" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration optional'), "StageFrame", "StageFrame" ); -t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration optional'), "StageDisplay", "StageDisplay" ); +t[#t+1] = StandardDecorationFromFile( "LeftFrame", "LeftFrame" ); +t[#t+1] = StandardDecorationFromFile( "RightFrame", "RightFrame" ); +t[#t+1] = StandardDecorationFromFile( "Header", "Header" ); +t[#t+1] = StandardDecorationFromFile( "Footer", "Footer" ); +t[#t+1] = StandardDecorationFromFileOptional( "Help", "Help" ); +t[#t+1] = StandardDecorationFromFileOptional( "StyleIcon", "StyleIcon" ); +t[#t+1] = StandardDecorationFromFileOptional( "StageFrame", "StageFrame" ); +t[#t+1] = StandardDecorationFromFileOptional( "StageDisplay", "StageDisplay" ); return t; diff --git a/stepmania/Themes/default/BGAnimations/_standard decoration optional.lua b/stepmania/Themes/default/BGAnimations/_standard decoration optional.lua deleted file mode 100644 index 148a7c990b..0000000000 --- a/stepmania/Themes/default/BGAnimations/_standard decoration optional.lua +++ /dev/null @@ -1,6 +0,0 @@ -local MetricsName, FileName = ...; -if THEME:GetMetric(Var "LoadingScreen","Show"..MetricsName) then - return LoadActor( THEME:GetPathB("","_standard decoration required"), MetricsName, FileName ); -else - return Def.Actor {}; -end diff --git a/stepmania/Themes/default/BGAnimations/_standard decoration required.lua b/stepmania/Themes/default/BGAnimations/_standard decoration required.lua deleted file mode 100644 index 4cbe70a5db..0000000000 --- a/stepmania/Themes/default/BGAnimations/_standard decoration required.lua +++ /dev/null @@ -1,8 +0,0 @@ -local MetricsName, FileName = ...; -local t = LoadActor( THEME:GetPathG(Var "LoadingScreen",FileName) ); -if type(t) == "table" then - t = t .. { - InitCommand=function(self) self:name(MetricsName); ActorUtil.LoadAllCommandsAndSetXYAndOnCommand(self,Var "LoadingScreen"); end; - }; -end -return t; diff --git a/stepmania/Themes/default/Scripts/ActorDef.lua b/stepmania/Themes/default/Scripts/ActorDef.lua index 536b2a2f0b..e87c5e0b8a 100644 --- a/stepmania/Themes/default/Scripts/ActorDef.lua +++ b/stepmania/Themes/default/Scripts/ActorDef.lua @@ -171,6 +171,27 @@ function WrapInActorFrame( t ) return Def.ActorFrame { children = t } end +function StandardDecorationFromTable( MetricsName, t ) + if type(t) == "table" then + t = t .. { + InitCommand=function(self) self:name(MetricsName); ActorUtil.LoadAllCommandsAndSetXYAndOnCommand(self,Var "LoadingScreen"); end; + }; + end + return t; +end + +function StandardDecorationFromFile( MetricsName, FileName ) + local t = LoadActor( THEME:GetPathG(Var "LoadingScreen",FileName) ); + return StandardDecorationFromTable( MetricsName, t ); +end + +function StandardDecorationFromFileOptional( MetricsName, FileName ) + if THEME:GetMetric(Var "LoadingScreen","Show"..MetricsName) then + return StandardDecorationFromFile( MetricsName, FileName ); + end +end + + -- (c) 2006 Glenn Maynard -- All rights reserved. --