actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 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 {};
--
t[#t+1] = Def.ActorFrame {
InitCommand=function(self)
self:Center();
end;
InitCommand=cmd(Center);
--
Def.Quad {
InitCommand=function(self)
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
self:diffuse(Color.Black);
self:diffusealpha(0);
end;
StartTransitioningCommand=function(self)
self:decelerate(0.125);
self:diffusealpha(1);
end;
InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color.Black;diffusealpha,0);
StartTransitioningCommand=cmd(decelerate,0.125;diffusealpha,1);
};
-- Sounds
LoadActor(THEME:GetPathS(Var "LoadingScreen","cancel")) .. {
StartTransitioningCommand=function(self)
self:play();
end;
StartTransitioningCommand=cmd(play);
};
};
--
Themes/new/BGAnimations/Screen in.lua
+3 -12
View File
@@ -1,20 +1,11 @@
local t = Def.ActorFrame {};
--
t[#t+1] = Def.ActorFrame {
InitCommand=function(self)
self:Center();
end;
InitCommand=cmd(Center);
--
Def.Quad {
InitCommand=function(self)
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
self:diffuse(Color.Black);
self:diffusealpha(1);
end;
StartTransitioningCommand=function(self)
self:smooth(0.2);
self:diffusealpha(0);
end;
InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color.Black;diffusealpha,1);
StartTransitioningCommand=cmd(smooth,0.2;diffusealpha,0);
};
};
--
Themes/new/BGAnimations/Screen out.lua
+3 -11
View File
@@ -1,19 +1,11 @@
local t = Def.ActorFrame {};
--
t[#t+1] = Def.ActorFrame {
InitCommand=function(self)
self:Center();
InitCommand=cmd(Center);
--
Def.Quad {
InitCommand=function(self)
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
self:diffuse(Color.Black);
self:diffusealpha(0);
end;
StartTransitioningCommand=function(self)
self:decelerate(0.25);
self:diffusealpha(1);
end;
InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color.Black;diffusealpha,0);
StartTransitioningCommand=cmd(decelerate,0.25;diffusealpha,1);
};
};
--
Themes/new/BGAnimations/ScreenWithMenuElements background/default.lua
+28 -48
View File
@@ -1,60 +1,40 @@
local t = Def.ActorFrame {};
-- Background Color
t[#t+1] = Def.ActorFrame {
InitCommand=function(self)
self:Center();
end;
--
Def.Quad {
InitCommand=function(self)
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
self:diffuse(color("#005185"));
end;
};
InitCommand=cmd(Center);
--
Def.Quad {
InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color("#005185"));
};
};
-- Additive Tint
t[#t+1] = Def.ActorFrame {
InitCommand=function(self)
self:Center();
end;
--
Def.Quad {
InitCommand=function(self)
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
self:fadetop(1);
self:blend("BlendMode_Add");
self:diffusealpha(0.2);
end;
}
InitCommand=cmd(Center);
--
Def.Quad {
InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;fadetop,1;blend,"BlendMode_Add";diffusealpha,0.2);
}
};
-- Textures Frame
t[#t+1] = Def.ActorFrame {
InitCommand=function(self)
self:Center();
end;
-- Scanline
LoadActor("_texture scanline") .. {
InitCommand=function(self)
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
self:customtexturerect(0, 0, SCREEN_WIDTH / 16, SCREEN_HEIGHT / 32);
self:diffuse(Color.Black);
self:diffusealpha(0.25);
end;
};
-- Checkerboard
LoadActor("_texture checkerboard") .. {
InitCommand=function(self)
self:zoomto(SCREEN_WIDTH, SCREEN_HEIGHT);
self:customtexturerect(0, 0, SCREEN_WIDTH / 64, SCREEN_HEIGHT / 64);
self:texcoordvelocity(0.5, 0);
self:diffuse(Color.Black);
self:diffusealpha(0.25);
end;
};
InitCommand=cmd(Center);
-- Scanline
LoadActor("_texture scanline") .. {
InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;
customtexturerect,0,0,SCREEN_WIDTH/16,SCREEN_HEIGHT/32;
diffuse,Color.Black;
diffusealpha,0.25;
);
};
-- Checkerboard
LoadActor("_texture checkerboard") .. {
InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;
customtexturerect,0,0,SCREEN_WIDTH/64,SCREEN_HEIGHT/64;
texcoordvelocity,0.5,0;
diffuse,Color.Black;
diffusealpha,0.25;
);
};
};
--
Themes/new/Graphics/ScreenSelectStyle Cursor.lua
+6 -9
View File
@@ -1,11 +1,8 @@
return Def.ActorFrame {
Def.Quad {
InitCommand=function(self)
self:zoomto(48, 24);
self:diffuse(PlayerColor(PLAYER_1));
end;
};
LoadFont("Common Normal") .. {
Text="P1";
};
Def.Quad {
InitCommand=cmd(zoomto,48,24;diffuse,PlayerColor(PLAYER_1));
};
LoadFont("Common Normal") .. {
Text="P1";
};
};
Themes/new/Graphics/ScreenSelectStyle Icon/default.lua
+18 -36
View File
@@ -1,37 +1,19 @@
local gc = Var("GameCommand");
--
local t = Def.ActorFrame {};
--
t[#t+1] = Def.ActorFrame {
Def.Quad {
InitCommand=function(self)
self:zoomto(96, 24);
self:diffuse(Color.White);
end;
GainFocusCommand=function(self)
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") .. {
Text=gc:GetText();
InitCommand=function(self)
self:diffuse(Color.Black);
self:zoom(0.675);
end;
};
};
local gc = Var("GameCommand");
--
local t = Def.ActorFrame {};
--
t[#t+1] = Def.ActorFrame {
Def.Quad {
InitCommand=cmd(zoomto,96,24;diffuse,Color.White);
GainFocusCommand=cmd(diffuseshift;effectcolor2,Color.White;effectcolor1,Color.Blue);
LoseFocusCommand=cmd(stopeffect;);
DisabledCommand=cmd(stopeffect;diffuse,color("0.5,0.5,0.5,1"));
EnabledCommand=cmd(stopeffect;diffuse,Color.White);
};
--
LoadFont("Common Normal") .. {
Text=gc:GetText();
InitCommand=cmd(diffuse,Color.Black;zoom,0.675);
};
};
return t
Themes/new/Graphics/ScreenSelectStyle Scroll/default.lua
+9 -12
View File
@@ -1,13 +1,10 @@
local gc = Var("GameCommand");
--
local t = Def.ActorFrame {};
--
t[#t+1] = Def.ActorFrame {
Def.Quad {
InitCommand=function(self)
self:zoomto(96, 24);
self:diffuse(Color.White);
end;
};
};
local gc = Var("GameCommand");
--
local t = Def.ActorFrame {};
--
t[#t+1] = Def.ActorFrame {
Def.Quad {
InitCommand=cmd(zoomto,96,24;diffuse,Color.White);
};
};
return t
Themes/new/Graphics/ScreenTitleMenu logo/default.lua
+15 -31
View File
@@ -1,31 +1,15 @@
local t = Def.ActorFrame{
InitCommand=function(self)
self:fov(70);
end;
LoadActor("_arrow")..{
InitCommand=function(self)
self:x(225);
end;
OnCommand=function(self)
self:wag();
self:effectmagnitude(0, 0, 16);
self:effectperiod(2.5);
end;
};
LoadActor("_text");
LoadActor("_text")..{
Name="TextGlow";
InitCommand=function(self)
self:blend(Blend.Add);
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;
};
};
return t;
local t = Def.ActorFrame{
InitCommand=cmd(fov,70);
LoadActor("_arrow")..{
InitCommand=cmd(x,225;);
OnCommand=cmd(wag;effectmagnitude,0,0,16;effectperiod,2.5;);
};
LoadActor("_text");
LoadActor("_text")..{
Name="TextGlow";
InitCommand=cmd(blend,Blend.Add;diffusealpha,0.05;);
OnCommand=cmd(glowshift;effectperiod,2.5;effectcolor1,color("1,1,1,0.25");effectcolor2,color("1,1,1,1"););
};
};
return t;
Themes/new/Graphics/ScreenWithMenuElements CustomOverlay.lua
+5 -12
View File
@@ -1,13 +1,6 @@
return Def.ActorFrame {
InitCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_BOTTOM);
end;
Def.Quad {
InitCommand=function(
self:vertalign(bottom);
self:zoomto(SCREEN_WIDTH, 32);
self:diffuse(Color.Black);
end;
};
return Def.ActorFrame {
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_BOTTOM);
Def.Quad {
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,32;diffuse,Color.Black);
};
};
Themes/new/Graphics/ScreenWithMenuElements Footer/default.lua
+2 -13
View File
@@ -1,21 +1,10 @@
return Def.ActorFrame {
-- Default BG
Def.Quad {
InitCommand=function(self)
self:vertalign(bottom);
self:zoomto(SCREEN_WIDTH, 60);
self:diffuse(Color.Black);
self:diffusealpha(0.65);
end;
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,60;diffuse,Color.Black;diffusealpha,0.65);
};
-- Highlight
Def.Quad {
InitCommand=function(self)
self:vertalign(bottom);
self:zoomto(SCREEN_WIDTH, 1);
self:diffuse(Color.Blue);
self:fadeleft(1);
self:y(-58);
end;
InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,1;diffuse,Color.Blue;fadeleft,1;y,-58);
};
};
Themes/new/Graphics/ScreenWithMenuElements Header/default.lua
+2 -13
View File
@@ -1,21 +1,10 @@
return Def.ActorFrame {
-- Default BG
Def.Quad {
InitCommand=function(self)
self:vertalign(top);
self:zoomto(SCREEN_WIDTH, 48);
self:diffuse(Color.Black);
self:diffusealpha(0.65);
end;
InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,48;diffuse,Color.Black;diffusealpha,0.65);
};
-- Highlight
Def.Quad {
InitCommand=function(self)
self:vertalign(top);
self:zoomto(SCREEN_WIDTH, 1);
self:diffuse(Color.Blue);
self:faderight(1);
self:y(46);
end;
InitCommand=cmd(vertalign,top;zoomto,SCREEN_WIDTH,1;diffuse,Color.Blue;faderight,1;y,46);
};
};