From c31d1f1c9d04789541f080791eaf905720462ed2 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 1 Jul 2013 21:30:10 -0400 Subject: [PATCH] RSR theme covered. --- .../default.lua | 94 +++++++++++++++---- .../MusicWheelItem Song ColorPart.lua | 14 +-- .../MusicWheelItem Song NormalPart.lua | 9 +- .../rsr/Graphics/ScreenTitleMenu scroll.lua | 8 +- .../ScreenWithMenuElements footer/default.lua | 13 ++- .../ScreenWithMenuElements header/default.lua | 64 +++++++++---- Themes/rsr/metrics.ini | 5 +- 7 files changed, 148 insertions(+), 59 deletions(-) diff --git a/Themes/rsr/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/rsr/BGAnimations/ScreenWithMenuElements background/default.lua index 0b7fe7fbb5..ff21c6b1d1 100644 --- a/Themes/rsr/BGAnimations/ScreenWithMenuElements background/default.lua +++ b/Themes/rsr/BGAnimations/ScreenWithMenuElements background/default.lua @@ -10,8 +10,14 @@ local function CreateDebugGrid() for a=1,numY do for b=1,numX do t[#t+1] = Def.Quad { - InitCommand=cmd(x,b*tGridSizeMajor[1]-(tGridSizeMajor[1]/2);y,a*tGridSizeMajor[2]-(tGridSizeMajor[2]/2)); - OnCommand=cmd(zoomto,tGridSizeMajor[1]-2,tGridSizeMajor[2]-2;diffuse,color("1,1,1,0.25")); + InitCommand=function(self) + self:x(b * tGridSizeMajor[1] - (tGridSizeMajor[1] / 2)); + self:y(a * tGridSizeMajor[2] - (tGridSizeMajor[2] / 2)); + end; + OnCommand=function(self) + self:zoomto(tGridSizeMajor[1] - 2, tGridSizeMajor[2] - 2); + self:diffuse(color("1,1,1,0.25")); + end; }; end; end; @@ -20,42 +26,90 @@ end --]] -- t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); + InitCommand=function(self) + self:x(SCREEN_CENTER_X); + self:y(SCREEN_CENTER_Y); + end; LoadActor("VOL1-29-NTSC") .. { - InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT); - OnCommand=cmd(diffusealpha,0.75); + InitCommand=function(self) + self:scaletoclipped(SCREEN_WIDTH, SCREEN_HEIGHT); + end; + OnCommand=function(self) + self:diffusealpha(0.75); + end; }; }; -- local bShow = 0; t[#t+1] = Def.ActorFrame { - InitCommand=cmd(visible,false); + InitCommand=funtion(self) + self:visible(false); + end; ToggleConsoleDisplayMessageCommand=function(self) bShow = 1 - bShow; self:visible( bShow == 1 ); end; -- Grid ---[[ LoadActor("_32") .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/32,SCREEN_HEIGHT/32); - OnCommand=cmd(diffuse,color("0,0,0,0.5")); +--[[ + LoadActor("_32") .. { + InitCommand=function(self) + self:x(SCREEN_CENTER_X); + self:y(SCREEN_CENTER_Y); + self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT); + self:customtexturerect(0, 0, SCREEN_WIDTH / 32, SCREEN_HEIGHT / 32); + end; + OnCommand=function(self) + self:diffuse(color("0,0,0,0.5")); + end; }; LoadActor("_16") .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/16); - OnCommand=cmd(diffuse,color("1,1,1,0.125")); - }; --]] ---[[ LoadActor("_8") .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/8,SCREEN_HEIGHT/8); - OnCommand=cmd(diffuse,color("#00BFE833")); - }; --]] + InitCommand=function(self) + self:x(SCREEN_CENTER_X); + self:y(SCREEN_CENTER_Y); + self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT); + self:customtexturerect(0, 0, SCREEN_WIDTH / 16, SCREEN_HEIGHT / 16); + end; + OnCommand=function(self) + self:diffuse(color("1,1,1,0.125")); + end; + }; +--]] +--[[ + LoadActor("_8") .. { + InitCommand=function(self) + self:x(SCREEN_CENTER_X); + self:y(SCREEN_CENTER_Y); + self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT); + self:customtexturerect(0, 0, SCREEN_WIDTH / 8, SCREEN_HEIGHT / 8); + end; + OnCommand=function(self) + self:diffuse(color("#00BFE833")); + end; + }; +--]] -- Left Def.Quad { - InitCommand=cmd(horizalign,left;x,SCREEN_LEFT;y,SCREEN_CENTER_Y;zoomto,16,SCREEN_HEIGHT); - OnCommand=cmd(diffuse,color("0,0,0,0.5")); + InitCommand=function(self) + self:horizalign(left); + self:x(SCREEN_LEFT); + self:y(SCREEN_CENTER_Y); + self:zoomto(16, SCREEN_HEIGHT); + end; + OnCommand=function(self) + self:diffuse(color("0,0,0,0.5")); + end; }; -- Right Def.Quad { - InitCommand=cmd(horizalign,right;x,SCREEN_RIGHT;y,SCREEN_CENTER_Y;zoomto,16,SCREEN_HEIGHT); - OnCommand=cmd(diffuse,color("0,0,0,0.5")); + InitCommand=function(self) + self:horizalign(right); + self:x(SCREEN_RIGHT); + self:y(SCREEN_CENTER_Y); + self:zoomto(16, SCREEN_HEIGHT); + end; + OnCommand=function(self) + self:diffuse(color("0,0,0,0.5")); + end; }; }; -- diff --git a/Themes/rsr/Graphics/MusicWheelItem Song ColorPart.lua b/Themes/rsr/Graphics/MusicWheelItem Song ColorPart.lua index d3d0df30f3..cb2fa46625 100644 --- a/Themes/rsr/Graphics/MusicWheelItem Song ColorPart.lua +++ b/Themes/rsr/Graphics/MusicWheelItem Song ColorPart.lua @@ -1,14 +1,8 @@ return Def.ActorFrame { Def.Quad { - InitCommand=cmd(x,-128+4;zoomto,4,46); --- OnCommand=cmd(diffuse,color("0,0,0,0.5")); + InitCommand=function(self) + self:x(-124); + self:zoomto(4, 46); + end; }; ---[[ Def.Quad { - InitCommand=cmd(x,-128+16+6;zoomto,32,46); --- OnCommand=cmd(faderight,1;diffusealpha,0.5); - }; --]] ---[[ Def.Quad { - InitCommand=cmd(x,2;y,23;zoomto,320,1); --- OnCommand=cmd(diffuse,color("0,0,0,0.5")); - }; --]] }; \ No newline at end of file diff --git a/Themes/rsr/Graphics/MusicWheelItem Song NormalPart.lua b/Themes/rsr/Graphics/MusicWheelItem Song NormalPart.lua index 7c5b876099..88cdd08328 100644 --- a/Themes/rsr/Graphics/MusicWheelItem Song NormalPart.lua +++ b/Themes/rsr/Graphics/MusicWheelItem Song NormalPart.lua @@ -1,6 +1,11 @@ return Def.ActorFrame { Def.Quad { - InitCommand=cmd(x,4;zoomto,256-4,46); - OnCommand=cmd(diffuse,color("0,0,0,0.5")); + InitCommand=function(self) + self:x(4); + self:zoomto(252, 46); + end; + OnCommand=function(self) + self:diffuse(color("0,0,0,0.5")); + end; }; }; \ No newline at end of file diff --git a/Themes/rsr/Graphics/ScreenTitleMenu scroll.lua b/Themes/rsr/Graphics/ScreenTitleMenu scroll.lua index fa40c9c589..b25a21ea39 100644 --- a/Themes/rsr/Graphics/ScreenTitleMenu scroll.lua +++ b/Themes/rsr/Graphics/ScreenTitleMenu scroll.lua @@ -6,6 +6,10 @@ t[#t+1] = LoadFont("Common Normal") .. { Text=gc:GetText(); }; -t.GainFocusCommand=cmd(diffusealpha,1); -t.LoseFocusCommand=cmd(diffusealpha,0.5); +t.GainFocusCommand=function(self) + self:diffusealpha(1); +end; +t.LoseFocusCommand=function(self) + self:diffusealpha(0.5); +end; return t; \ No newline at end of file diff --git a/Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua b/Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua index 8c4742c670..4f6cfcb07e 100644 --- a/Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua +++ b/Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua @@ -1,9 +1,16 @@ local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { - InitCommand=cmd(y,-64); + InitCommand=function(self) + self:y(-64); + end; Def.Quad { - InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH-32,2); - OnCommand=cmd(diffusealpha,0.5); + InitCommand=function(self) + self:vertalign(top); + self:zoomto(SCREEN_WIDTH - 32, 2); + end; + OnCommand=function(self) + self:diffusealpha(0.5); + end; }; }; return t \ No newline at end of file diff --git a/Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua b/Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua index 28ad31bf77..7a72ddc619 100644 --- a/Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua +++ b/Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua @@ -1,35 +1,63 @@ local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { - InitCommand=cmd(y,48); + InitCommand=function(self) + self:y(48); + end; Def.Quad { - InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH-32,2); - OnCommand=cmd(diffusealpha,0.5); + InitCommand=function(self) + self:vertalign(bottom); + self:zoomto(SCREEN_WIDTH - 32, 2); + end; + OnCommand=function(self) + self:diffusealpha(0.5); + end; }; }; -t[#t+1] = Def.ActorFrame { Name="MenuTimerDecoration"; - InitCommand=cmd(y,48); +t[#t+1] = Def.ActorFrame { + Name="MenuTimerDecoration"; + InitCommand=function(self) + self:y(48); + end; LoadFont("Common Normal") .. { Text="TIME"; - InitCommand=cmd(vertalign,bottom;horizalign,right;x,SCREEN_CENTER_X-16;y,-4.5); - OnCommand=cmd(zoom,0.5); + InitCommand=function(self) + self:vertalign(bottom); + self:horizalign(right); + self:x(SCREEN_CENTER_X - 16); + self:y,(-4.5); + end; + OnCommand=function(self) + self:zoom(0.5); + end; }; ---[[ LoadFont("Common Normal") .. { - Text="99"; - InitCommand=cmd(vertalign,bottom;horizalign,right;x,SCREEN_CENTER_X-64;y,-4.5); - OnCommand=cmd(); - }; --]] }; -t[#t+1] = Def.ActorFrame { Name="HeaderTextDecoration"; - InitCommand=cmd(y,48); +t[#t+1] = Def.ActorFrame { + Name="HeaderTextDecoration"; + InitCommand=function(self) + self:y(48); + end; LoadFont("Common Normal") .. { Text="SELECT"; - InitCommand=cmd(vertalign,bottom;horizalign,left;x,-SCREEN_CENTER_X+16;y,-4.5); - OnCommand=cmd(zoom,0.5); + InitCommand=function(self) + self:vertalign(bottom); + self:horizalign(right); + self:x(SCREEN_CENTER_X - 16); + self:y,(-4.5); + end; + OnCommand=function(self) + self:zoom(0.5); + end; }; LoadFont("Common Normal") .. { Text="OPTIONS"; - InitCommand=cmd(vertalign,bottom;horizalign,left;x,-SCREEN_CENTER_X+64;y,-4.5); - OnCommand=cmd(); + InitCommand=function(self) + self:vertalign(bottom); + self:horizalign(right); + self:x(SCREEN_CENTER_X - 16); + self:y,(-4.5); + end; + OnCommand=function(self) + end; }; }; return t \ No newline at end of file diff --git a/Themes/rsr/metrics.ini b/Themes/rsr/metrics.ini index e5b8dc7a54..7938b93f32 100644 --- a/Themes/rsr/metrics.ini +++ b/Themes/rsr/metrics.ini @@ -24,10 +24,7 @@ Text1FormatFunction=function(fSeconds) \ end FrameOnCommand= Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"); -#~ Warning10Command=%function(self) \ - #~ MESSAGEMAN:Broadcast("TimerWarning"); \ - #~ cmd(diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"))(self); \ -#~ end; + [ScreenTitleMenu] ShowHeader=true ShowFooter=true