Revert "More lua to fix."

This reverts commit d20290ad2f.
This commit is contained in:
Jason Felds
2013-07-18 17:41:00 -04:00
parent 53069a73eb
commit fbf979e93b
21 changed files with 255 additions and 593 deletions
+23 -61
View File
@@ -1,61 +1,23 @@
local Color1 = color(Var "Color1");
local Color2 = color(Var "Color2");
local a1 = LoadActor(Var "File1") .. {
OnCommand=function(self)
self:cropto(SCREEN_WIDTH / 2);
self:zoomtoheight(SCREEN_HEIGHT / 2);
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
};
local a2 = LoadActor(Var "File2") .. {
OnCommand=function(self)
self:cropto(SCREEN_WIDTH / 2);
self:zoomtoheight(SCREEN_HEIGHT / 2);
self:diffuse(Color2);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
};
local t = Def.ActorFrame {
a1 .. {
OnCommand = function(self)
self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
end;
};
a2 .. {
OnCommand = function(self)
self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
end;
};
a2 .. {
OnCommand = function(self)
self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
end;
};
a1 .. {
OnCommand = function(self)
self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
end;
};
};
return t;
local Color1 = color(Var "Color1");
local Color2 = color(Var "Color2");
local a1 = LoadActor(Var "File1") .. {
OnCommand=cmd(cropto,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
local a2 = LoadActor(Var "File2") .. {
OnCommand=cmd(cropto,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color2;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
local t = Def.ActorFrame {
a1 .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
a2 .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
a2 .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
a1 .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
};
return t;