actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "RSR theme covered."

Browse Source 
This reverts commit c31d1f1c9d.
This commit is contained in:
Jason Felds
2013-07-18 17:41:24 -04:00
parent da657870d4
commit f5c5648bdd
7 changed files with 59 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/rsr/BGAnimations/ScreenWithMenuElements background/default.lua
+20 -74
View File
@@ -10,14 +10,8 @@ local function CreateDebugGrid()
for a=1,numY do for a=1,numY do
for b=1,numX do for b=1,numX do
t[#t+1] = Def.Quad { t[#t+1] = Def.Quad {
InitCommand=function(self) InitCommand=cmd(x,b*tGridSizeMajor[1]-(tGridSizeMajor[1]/2);y,a*tGridSizeMajor[2]-(tGridSizeMajor[2]/2));
self:x(b * tGridSizeMajor[1] - (tGridSizeMajor[1] / 2)); OnCommand=cmd(zoomto,tGridSizeMajor[1]-2,tGridSizeMajor[2]-2;diffuse,color("1,1,1,0.25"));
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;
end; end;
@@ -26,90 +20,42 @@ end --]]
-- --
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
InitCommand=function(self) InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
end;
LoadActor("VOL1-29-NTSC") .. { LoadActor("VOL1-29-NTSC") .. {
InitCommand=function(self) InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT);
self:scaletoclipped(SCREEN_WIDTH, SCREEN_HEIGHT); OnCommand=cmd(diffusealpha,0.75);
end;
OnCommand=function(self)
self:diffusealpha(0.75);
end;
}; };
}; };
-- --
local bShow = 0; local bShow = 0;
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
InitCommand=funtion(self) InitCommand=cmd(visible,false);
self:visible(false);
end;
ToggleConsoleDisplayMessageCommand=function(self) ToggleConsoleDisplayMessageCommand=function(self)
bShow = 1 - bShow; bShow = 1 - bShow;
self:visible( bShow == 1 ); self:visible( bShow == 1 );
end; end;
-- Grid -- Grid
--[[ --[[ LoadActor("_32") .. {
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);
InitCommand=function(self) OnCommand=cmd(diffuse,color("0,0,0,0.5"));
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") .. { LoadActor("_16") .. {
InitCommand=function(self) InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/16);
self:x(SCREEN_CENTER_X); OnCommand=cmd(diffuse,color("1,1,1,0.125"));
self:y(SCREEN_CENTER_Y); }; --]]
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT); --[[ LoadActor("_8") .. {
self:customtexturerect(0, 0, SCREEN_WIDTH / 16, SCREEN_HEIGHT / 16); InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;customtexturerect,0,0,SCREEN_WIDTH/8,SCREEN_HEIGHT/8);
end; OnCommand=cmd(diffuse,color("#00BFE833"));
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 -- Left
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(horizalign,left;x,SCREEN_LEFT;y,SCREEN_CENTER_Y;zoomto,16,SCREEN_HEIGHT);
self:horizalign(left); OnCommand=cmd(diffuse,color("0,0,0,0.5"));
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 -- Right
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(horizalign,right;x,SCREEN_RIGHT;y,SCREEN_CENTER_Y;zoomto,16,SCREEN_HEIGHT);
self:horizalign(right); OnCommand=cmd(diffuse,color("0,0,0,0.5"));
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;
}; };
}; };
-- --
Themes/rsr/Graphics/MusicWheelItem Song ColorPart.lua
+10 -4
View File
@@ -1,8 +1,14 @@
return Def.ActorFrame { return Def.ActorFrame {
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(x,-128+4;zoomto,4,46);
self:x(-124); -- OnCommand=cmd(diffuse,color("0,0,0,0.5"));
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"));
}; --]]
}; };
Themes/rsr/Graphics/MusicWheelItem Song NormalPart.lua
+2 -7
View File
@@ -1,11 +1,6 @@
return Def.ActorFrame { return Def.ActorFrame {
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(x,4;zoomto,256-4,46);
self:x(4); OnCommand=cmd(diffuse,color("0,0,0,0.5"));
self:zoomto(252, 46);
end;
OnCommand=function(self)
self:diffuse(color("0,0,0,0.5"));
end;
}; };
}; };
Themes/rsr/Graphics/ScreenTitleMenu scroll.lua
+2 -6
View File
@@ -6,10 +6,6 @@ t[#t+1] = LoadFont("Common Normal") .. {
Text=gc:GetText(); Text=gc:GetText();
}; };
t.GainFocusCommand=function(self) t.GainFocusCommand=cmd(diffusealpha,1);
self:diffusealpha(1); t.LoseFocusCommand=cmd(diffusealpha,0.5);
end;
t.LoseFocusCommand=function(self)
self:diffusealpha(0.5);
end;
return t; return t;
Themes/rsr/Graphics/ScreenWithMenuElements footer/default.lua
+3 -10
View File
@@ -1,16 +1,9 @@
local t = Def.ActorFrame {}; local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
InitCommand=function(self) InitCommand=cmd(y,-64);
self:y(-64);
end;
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH-32,2);
self:vertalign(top); OnCommand=cmd(diffusealpha,0.5);
self:zoomto(SCREEN_WIDTH - 32, 2);
end;
OnCommand=function(self)
self:diffusealpha(0.5);
end;
}; };
}; };
return t return t
Themes/rsr/Graphics/ScreenWithMenuElements header/default.lua
+18 -46
View File
@@ -1,63 +1,35 @@
local t = Def.ActorFrame {}; local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
InitCommand=function(self) InitCommand=cmd(y,48);
self:y(48);
end;
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH-32,2);
self:vertalign(bottom); OnCommand=cmd(diffusealpha,0.5);
self:zoomto(SCREEN_WIDTH - 32, 2);
end;
OnCommand=function(self)
self:diffusealpha(0.5);
end;
}; };
}; };
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame { Name="MenuTimerDecoration";
Name="MenuTimerDecoration"; InitCommand=cmd(y,48);
InitCommand=function(self)
self:y(48);
end;
LoadFont("Common Normal") .. { LoadFont("Common Normal") .. {
Text="TIME"; Text="TIME";
InitCommand=function(self) InitCommand=cmd(vertalign,bottom;horizalign,right;x,SCREEN_CENTER_X-16;y,-4.5);
self:vertalign(bottom); OnCommand=cmd(zoom,0.5);
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 { t[#t+1] = Def.ActorFrame { Name="HeaderTextDecoration";
Name="HeaderTextDecoration"; InitCommand=cmd(y,48);
InitCommand=function(self)
self:y(48);
end;
LoadFont("Common Normal") .. { LoadFont("Common Normal") .. {
Text="SELECT"; Text="SELECT";
InitCommand=function(self) InitCommand=cmd(vertalign,bottom;horizalign,left;x,-SCREEN_CENTER_X+16;y,-4.5);
self:vertalign(bottom); OnCommand=cmd(zoom,0.5);
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") .. { LoadFont("Common Normal") .. {
Text="OPTIONS"; Text="OPTIONS";
InitCommand=function(self) InitCommand=cmd(vertalign,bottom;horizalign,left;x,-SCREEN_CENTER_X+64;y,-4.5);
self:vertalign(bottom); OnCommand=cmd();
self:horizalign(right);
self:x(SCREEN_CENTER_X - 16);
self:y,(-4.5);
end;
OnCommand=function(self)
end;
}; };
}; };
return t return t
Themes/rsr/metrics.ini
+4 -1
View File
@@ -24,7 +24,10 @@ Text1FormatFunction=function(fSeconds) \
end end
FrameOnCommand= FrameOnCommand=
Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"); 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] [ScreenTitleMenu]
ShowHeader=true ShowHeader=true
ShowFooter=true ShowFooter=true