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

Revert "The "new" theme is handled."

Browse Source 
This reverts commit 2d5d45e365.
This commit is contained in:
Jason Felds
2013-07-18 17:42:22 -04:00
parent f57abda0bc
commit c872bb311c
11 changed files with 95 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/new/BGAnimations/Screen cancel.lua
+4 -15
View File
@@ -1,26 +1,15 @@
local t = Def.ActorFrame {}; local t = Def.ActorFrame {};
-- --
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
InitCommand=function(self) InitCommand=cmd(Center);
self:Center();
end;
-- --
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color.Black;diffusealpha,0);
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT); StartTransitioningCommand=cmd(decelerate,0.125;diffusealpha,1);
self:diffuse(Color.Black);
self:diffusealpha(0);
end;
StartTransitioningCommand=function(self)
self:decelerate(0.125);
self:diffusealpha(1);
end;
}; };
-- Sounds -- Sounds
LoadActor(THEME:GetPathS(Var "LoadingScreen","cancel")) .. { LoadActor(THEME:GetPathS(Var "LoadingScreen","cancel")) .. {
StartTransitioningCommand=function(self) StartTransitioningCommand=cmd(play);
self:play();
end;
}; };
}; };
-- --
Themes/new/BGAnimations/Screen in.lua
+3 -12
View File
@@ -1,20 +1,11 @@
local t = Def.ActorFrame {}; local t = Def.ActorFrame {};
-- --
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
InitCommand=function(self) InitCommand=cmd(Center);
self:Center();
end;
-- --
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color.Black;diffusealpha,1);
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT); StartTransitioningCommand=cmd(smooth,0.2;diffusealpha,0);
self:diffuse(Color.Black);
self:diffusealpha(1);
end;
StartTransitioningCommand=function(self)
self:smooth(0.2);
self:diffusealpha(0);
end;
}; };
}; };
-- --
Themes/new/BGAnimations/Screen out.lua
+3 -11
View File
@@ -1,19 +1,11 @@
local t = Def.ActorFrame {}; local t = Def.ActorFrame {};
-- --
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
InitCommand=function(self) InitCommand=cmd(Center);
self:Center();
-- --
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color.Black;diffusealpha,0);
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT); StartTransitioningCommand=cmd(decelerate,0.25;diffusealpha,1);
self:diffuse(Color.Black);
self:diffusealpha(0);
end;
StartTransitioningCommand=function(self)
self:decelerate(0.25);
self:diffusealpha(1);
end;
}; };
}; };
-- --
Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua
+16 -36
View File
@@ -1,59 +1,39 @@
local t = Def.ActorFrame {}; local t = Def.ActorFrame {};
-- Background Color -- Background Color
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
InitCommand=function(self) InitCommand=cmd(Center);
self:Center();
end;
-- --
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color("#005185"));
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
self:diffuse(color("#005185"));
end;
}; };
}; };
-- Additive Tint -- Additive Tint
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
InitCommand=function(self) InitCommand=cmd(Center);
self:Center();
end;
-- --
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;fadetop,1;blend,"BlendMode_Add";diffusealpha,0.2);
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
self:fadetop(1);
self:blend("BlendMode_Add");
self:diffusealpha(0.2);
end;
} }
}; };
-- Textures Frame -- Textures Frame
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
InitCommand=function(self) InitCommand=cmd(Center);
self:Center();
end;
-- Scanline -- Scanline
LoadActor("_texture scanline") .. { LoadActor("_texture scanline") .. {
InitCommand=function(self) InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT); customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/32;
self:customtexturerect(0, 0, SCREEN_WIDTH / 16, SCREEN_HEIGHT / 32); diffuse,Color.Black;
self:diffuse(Color.Black); diffusealpha,0.25;
self:diffusealpha(0.25); );
end;
}; };
-- Checkerboard -- Checkerboard
LoadActor("_texture checkerboard") .. { LoadActor("_texture checkerboard") .. {
InitCommand=function(self) InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT); customtexturerect,0,0,SCREEN_WIDTH/64,SCREEN_HEIGHT/64;
self:customtexturerect(0, 0, SCREEN_WIDTH / 64, SCREEN_HEIGHT / 64); texcoordvelocity,0.5,0;
self:texcoordvelocity(0.5, 0); diffuse,Color.Black;
self:diffuse(Color.Black); diffusealpha,0.25;
self:diffusealpha(0.25); );
end;
}; };
}; };
Themes/new/Graphics/ScreenSelectStyle Cursor.lua
+1 -4
View File
@@ -1,9 +1,6 @@
return Def.ActorFrame { return Def.ActorFrame {
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(zoomto,48,24;diffuse,PlayerColor(PLAYER_1));
self:zoomto(48, 24);
self:diffuse(PlayerColor(PLAYER_1));
end;
}; };
LoadFont("Common Normal") .. { LoadFont("Common Normal") .. {
Text="P1"; Text="P1";
Themes/new/Graphics/ScreenSelectStyle Icon/default.lua
+6 -24
View File
@@ -4,34 +4,16 @@ local t = Def.ActorFrame {};
-- --
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(zoomto,96,24;diffuse,Color.White);
self:zoomto(96, 24); GainFocusCommand=cmd(diffuseshift;effectcolor2,Color.White;effectcolor1,Color.Blue);
self:diffuse(Color.White); LoseFocusCommand=cmd(stopeffect;);
end; DisabledCommand=cmd(stopeffect;diffuse,color("0.5,0.5,0.5,1"));
GainFocusCommand=function(self) EnabledCommand=cmd(stopeffect;diffuse,Color.White);
self:diffuseshift();
self:effectcolor2(Color.White);
self:effectcolor1(Color.Blue);
end;
LoseFocusCommand=function(self)
self:stopeffect();
end;
DisabledCommand=function(self)
self:stopeffect();
self:diffuse(color("0.5,0.5,0.5,1"));
end;
EnabledCommand=function(self)
self:stopeffect();
self:diffuse(Color.White);
end;
}; };
-- --
LoadFont("Common Normal") .. { LoadFont("Common Normal") .. {
Text=gc:GetText(); Text=gc:GetText();
InitCommand=function(self) InitCommand=cmd(diffuse,Color.Black;zoom,0.675);
self:diffuse(Color.Black);
self:zoom(0.675);
end;
}; };
}; };
return t return t
Themes/new/Graphics/ScreenSelectStyle Scroll/default.lua
+1 -4
View File
@@ -4,10 +4,7 @@ local t = Def.ActorFrame {};
-- --
t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame {
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(zoomto,96,24;diffuse,Color.White);
self:zoomto(96, 24);
self:diffuse(Color.White);
end;
}; };
}; };
return t return t
Themes/new/Graphics/ScreenTitleMenu logo/default.lua
+5 -21
View File
@@ -1,30 +1,14 @@
local t = Def.ActorFrame{ local t = Def.ActorFrame{
InitCommand=function(self) InitCommand=cmd(fov,70);
self:fov(70);
end;
LoadActor("_arrow")..{ LoadActor("_arrow")..{
InitCommand=function(self) InitCommand=cmd(x,225;);
self:x(225); OnCommand=cmd(wag;effectmagnitude,0,0,16;effectperiod,2.5;);
end;
OnCommand=function(self)
self:wag();
self:effectmagnitude(0, 0, 16);
self:effectperiod(2.5);
end;
}; };
LoadActor("_text"); LoadActor("_text");
LoadActor("_text")..{ LoadActor("_text")..{
Name="TextGlow"; Name="TextGlow";
InitCommand=function(self) InitCommand=cmd(blend,Blend.Add;diffusealpha,0.05;);
self:blend(Blend.Add); OnCommand=cmd(glowshift;effectperiod,2.5;effectcolor1,color("1,1,1,0.25");effectcolor2,color("1,1,1,1"););
self:diffusealpha(0.05);
end;
OnCommand=function(self)
self:glowshift();
self:effectperiod(2.5);
self:effectcolor1(color("1,1,1,0.25"));
self:effectcolor2(color("1,1,1,1"));
end;
}; };
}; };
Themes/new/Graphics/ScreenWithMenuElements CustomOverlay.lua
+2 -9
View File
@@ -1,13 +1,6 @@
return Def.ActorFrame { return Def.ActorFrame {
InitCommand=function(self) InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_BOTTOM);
self:x(SCREEN_CENTER_X);
self:y(SCREEN_BOTTOM);
end;
Def.Quad { Def.Quad {
InitCommand=function( InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,32;diffuse,Color.Black);
self:vertalign(bottom);
self:zoomto(SCREEN_WIDTH, 32);
self:diffuse(Color.Black);
end;
}; };
}; };
Themes/new/Graphics/ScreenWithMenuElements Footer/default.lua
+2 -13
View File
@@ -1,21 +1,10 @@
return Def.ActorFrame { return Def.ActorFrame {
-- Default BG -- Default BG
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,60;diffuse,Color.Black;diffusealpha,0.65);
self:vertalign(bottom);
self:zoomto(SCREEN_WIDTH, 60);
self:diffuse(Color.Black);
self:diffusealpha(0.65);
end;
}; };
-- Highlight -- Highlight
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,1;diffuse,Color.Blue;fadeleft,1;y,-58);
self:vertalign(bottom);
self:zoomto(SCREEN_WIDTH, 1);
self:diffuse(Color.Blue);
self:fadeleft(1);
self:y(-58);
end;
}; };
}; };
Themes/new/Graphics/ScreenWithMenuElements Header/default.lua
+2 -13
View File
@@ -1,21 +1,10 @@
return Def.ActorFrame { return Def.ActorFrame {
-- Default BG -- Default BG
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,48;diffuse,Color.Black;diffusealpha,0.65);
self:vertalign(top);
self:zoomto(SCREEN_WIDTH, 48);
self:diffuse(Color.Black);
self:diffusealpha(0.65);
end;
}; };
-- Highlight -- Highlight
Def.Quad { Def.Quad {
InitCommand=function(self) InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,1;diffuse,Color.Blue;faderight,1;y,46);
self:vertalign(top);
self:zoomto(SCREEN_WIDTH, 1);
self:diffuse(Color.Blue);
self:faderight(1);
self:y(46);
end;
}; };
}; };