Skip to content

Commit

Permalink
Revert "More lua."
Browse files Browse the repository at this point in the history
This reverts commit 2330c87.
  • Loading branch information
wolfman2000 committed Jul 18, 2013
1 parent fbf979e commit da65787
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 50 deletions.
18 changes: 4 additions & 14 deletions BGAnimations/flash/default.lua
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
local flashColor = color(Var "Color1")
return Def.Quad {
InitCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
self:diffuse(flashColor);
end;
GainFocusCommand=function(self)
self:finishtweening();
self:diffusealpha(1);
self:accelerate(0.6);
self:diffusealpha(0);
end;
local flashColor = color(Var "Color1")
return Def.Quad {
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;diffuse,flashColor;);
GainFocusCommand=cmd(finishtweening;diffusealpha,1;accelerate,0.6;diffusealpha,0);
};
13 changes: 2 additions & 11 deletions BGAnimations/white flash/default.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
return Def.Quad {
InitCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
end;
GainFocusCommand=function(self)
self:finishtweening();
self:diffusealpha(1);
self:accelerate(0.6);
self:diffusealpha(0);
end;
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2);
GainFocusCommand=cmd(finishtweening;diffusealpha,1;accelerate,0.6;diffusealpha,0);
};
15 changes: 3 additions & 12 deletions BGAnimations/white reverse flash/default.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
return Def.Quad {
InitCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
end;
GainFocusCommand=function(self)
self:finishtweening();
self:diffusealpha(0);
self:accelerate(0.6);
self:diffusealpha(1);
end;
return Def.Quad {
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2);
GainFocusCommand=cmd(finishtweening;diffusealpha,0;accelerate,0.6;diffusealpha,1);
};
13 changes: 2 additions & 11 deletions BGAnimations/yellow flash/default.lua
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
return Def.Quad {
InitCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scaletoclipped(SCREEN_WIDTH * 2, SCREEN_HEIGHT * 2);
end;
GainFocusCommand=function(self)
self:finishtweening();
self:diffuse(color("#FFFFA0"));
self:accelerate(0.6);
self:diffusealpha(0);
end;
InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH*2,SCREEN_HEIGHT*2);
GainFocusCommand=cmd(finishtweening;diffuse,color("#FFFFA0");accelerate,0.6;diffusealpha,0);
};
4 changes: 2 additions & 2 deletions Docs/steps.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ local MetaData = {
startTime = { path, rate, offset, commands }
Any ommitted arguments will default to nil, except for rate, which would use 1.0
]]
0 = {"path/to/bga", 1.0, 0.000, 0, function(self) self:rainbow(); end; },
0 = {"path/to/bga2", 1.0, 0.000, 0, function(self) self:thump(); end; }
0 = {"path/to/bga", 1.0, 0.000, 0, cmd(rainbow) },
0 = {"path/to/bga2", 1.0, 0.000, 0, cmd(thump) }
},
},
--[[
Expand Down

0 comments on commit da65787

Please sign in to comment.