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
+3 -12
View File
@@ -2,18 +2,9 @@ local Color1 = color(Var "Color1");
local t = Def.ActorFrame { local t = Def.ActorFrame {
LoadActor(Var "File1") .. { LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,Color1;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
}; };
+7 -36
View File
@@ -1,45 +1,16 @@
local Color1 = color(Var "Color1"); local Color1 = color(Var "Color1");
local a = LoadActor(Var "File1") .. { local a = LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(cropto,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color1;effectclock,"music");
self:cropto(SCREEN_WIDTH / 2); GainFocusCommand=cmd(play);
self:zoomtoheight(SCREEN_HEIGHT / 2); LoseFocusCommand=cmd(pause);
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
local t = Def.ActorFrame { local t = Def.ActorFrame {
a .. { a .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
OnCommand = function(self) a .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT)); a .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM)); a .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
end;
};
a .. {
OnCommand = function(self)
self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
end;
};
a .. {
OnCommand = function(self)
self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
end;
};
a .. {
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; return t;
+10 -48
View File
@@ -2,59 +2,21 @@ local Color1 = color(Var "Color1");
local Color2 = color(Var "Color2"); local Color2 = color(Var "Color2");
local a1 = LoadActor(Var "File1") .. { local a1 = LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(cropto,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color1;effectclock,"music");
self:cropto(SCREEN_WIDTH / 2); GainFocusCommand=cmd(play);
self:zoomtoheight(SCREEN_HEIGHT / 2); LoseFocusCommand=cmd(pause);
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
local a2 = LoadActor(Var "File2") .. { local a2 = LoadActor(Var "File2") .. {
OnCommand=function(self) OnCommand=cmd(cropto,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color2;effectclock,"music");
self:cropto(SCREEN_WIDTH / 2); GainFocusCommand=cmd(play);
self:zoomtoheight(SCREEN_HEIGHT / 2); LoseFocusCommand=cmd(pause);
self:diffuse(Color2);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
local t = Def.ActorFrame { local t = Def.ActorFrame {
a1 .. { a1 .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
OnCommand = function(self) a2 .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT)); a2 .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
self:y(scale(1, 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)); };
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; return t;
+4 -31
View File
@@ -1,36 +1,9 @@
-- Alternating files being played back at once -- Alternating files being played back at once
local t = Def.ActorFrame { local t = Def.ActorFrame {
LoadActor(Var "File1") .. { LoadActor(Var "File1") .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;rate,0.25) };
OnCommand = function(self) LoadActor(Var "File2") .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;rate,0.25) };
self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT)); LoadActor(Var "File2") .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;rate,0.25) };
self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM)); LoadActor(Var "File1") .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;rate,0.25) };
self:cropto(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2);
self:rate(0.25);
end;
LoadActor(Var "File2") .. {
OnCommand = function(self)
self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
self:cropto(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2);
self:rate(0.25);
end;
};
LoadActor(Var "File2") .. {
OnCommand = function(self)
self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
self:cropto(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2);
self:rate(0.25);
end;
};
LoadActor(Var "File1") .. {
OnCommand = function(self)
self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
self:cropto(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2);
self:rate(0.25);
end;
};
}; };
return t return t
+3 -15
View File
@@ -4,21 +4,9 @@ local Color2 = color(Var "Color2");
local t = Def.ActorFrame {}; local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. { t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(diffuse,Color1;blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;linear,1;diffusealpha,0);
self:diffuse(Color1); GainFocusCommand=cmd(play);
self:blend("BlendMode_Add"); LoseFocusCommand=cmd(pause);
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scale_or_crop_background();
self:linear(1);
self:diffusealpha(0);
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
return t; return t;
+6 -28
View File
@@ -4,38 +4,16 @@ local Color2 = color(Var "Color2");
local t = Def.ActorFrame {}; local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. { t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
if Var("File2") ~= nil then if Var("File2") ~= nil then
t[#t+1] = LoadActor(Var("File2")) .. { t[#t+1] = LoadActor(Var("File2")) .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music";linear,1;diffusealpha,0);
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color2);
self:effectclock("music");
self:linear(1);
self:diffusealpha(0);
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
end; end;
+6 -26
View File
@@ -5,36 +5,16 @@ local stretchBG = PREFSMAN:GetPreference("StretchBackgrounds")
local t = Def.ActorFrame {}; local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. { t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
if Var("File2") ~= nil then if Var("File2") ~= nil then
t[#t+1] = LoadActor(Var("File2")) .. { t[#t+1] = LoadActor(Var("File2")) .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color2); -- originally Color1: assuming mistake.
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
end; end;
+7 -37
View File
@@ -1,46 +1,16 @@
local Color1 = color(Var "Color1"); local Color1 = color(Var "Color1");
local a = LoadActor(Var "File1") .. { local a = LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;diffuse,Color1;zoomx,self:GetZoomX()*-1;zoomy,self:GetZoomY()*-1;effectclock,"music");
self:cropto(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2); GainFocusCommand=cmd(play);
self:diffuse(Color1); LoseFocusCommand=cmd(pause);
self:zoomx(self:GetZoomX() * -1);
self:zoomy(self:GetZoomY() * -1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
local t = Def.ActorFrame { local t = Def.ActorFrame {
a .. { a .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
OnCommand = function(self) a .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT)); a .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM)); a .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
end;
};
a .. {
OnCommand = function(self)
self:x(scale(3, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(1, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
end;
};
a .. {
OnCommand = function(self)
self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(3, 0, 4, SCREEN_TOP, SCREEN_BOTTOM));
end;
};
a .. {
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; return t;
+3 -13
View File
@@ -3,19 +3,9 @@ local Color1 = color(Var "Color1");
local t = Def.ActorFrame {}; local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. { t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(diffuse,Color1;blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;);
self:diffuse(Color1); GainFocusCommand=cmd(play);
self:blend("BlendMode_Add"); LoseFocusCommand=cmd(pause);
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scale_or_crop_background();
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
return t; return t;
+5 -18
View File
@@ -7,10 +7,8 @@ local t = Def.ActorFrame {
OnCommand=function(self) OnCommand=function(self)
self:LoadFromCurrentSongBackground() self:LoadFromCurrentSongBackground()
self:xy(SCREEN_CENTER_X,SCREEN_CENTER_Y) self:xy(SCREEN_CENTER_X,SCREEN_CENTER_Y)
if stretchBG then if stretchBG then self:SetSize(SCREEN_WIDTH,SCREEN_HEIGHT)
self:SetSize(SCREEN_WIDTH,SCREEN_HEIGHT) else self:scale_or_crop_background();
else
self:scale_or_crop_background();
end end
self:diffuse(Color1) self:diffuse(Color1)
self:effectclock("music") self:effectclock("music")
@@ -18,20 +16,9 @@ local t = Def.ActorFrame {
}; };
LoadActor(Var "File1") .. { LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music");
self:blend("BlendMode_Add"); GainFocusCommand=cmd(play);
self:x(SCREEN_CENTER_X); LoseFocusCommand=cmd(pause);
self:y(SCREEN_CENTER_Y);
self:scale_or_crop_background();
self:diffuse(Color2);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
}; };
+3 -14
View File
@@ -2,20 +2,9 @@ local Color1 = color(Var "Color1");
local t = Def.ActorFrame { local t = Def.ActorFrame {
LoadActor(Var "File1") .. { LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;loop,false;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color1);
self:loop(false);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
}; };
+2 -6
View File
@@ -11,12 +11,8 @@ local t = Def.ActorFrame {
self:diffuse(Color1) self:diffuse(Color1)
self:effectclock("music") self:effectclock("music")
end; end;
GainFocusCommand=function(self) GainFocusCommand=cmd(play);
self:play(); LoseFocusCommand=cmd(pause);
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
}; };
+3 -13
View File
@@ -3,19 +3,9 @@ local Color1 = color(Var "Color1");
local t = Def.ActorFrame { local t = Def.ActorFrame {
LoadActor(Var "File1") .. { LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
}; };
+3 -13
View File
@@ -3,19 +3,9 @@ local Color1 = color("0,0,1,1");
local t = Def.ActorFrame { local t = Def.ActorFrame {
LoadActor(Var "File1") .. { LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
}; };
+3 -13
View File
@@ -3,19 +3,9 @@ local Color1 = color("0,1,0,1");
local t = Def.ActorFrame { local t = Def.ActorFrame {
LoadActor(Var "File1") .. { LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
}; };
+3 -13
View File
@@ -3,19 +3,9 @@ local Color1 = color("1,0,0,1");
local t = Def.ActorFrame { local t = Def.ActorFrame {
LoadActor(Var "File1") .. { LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
}; };
+3 -14
View File
@@ -2,20 +2,9 @@ local Color1 = color(Var "Color1");
local t = Def.ActorFrame { local t = Def.ActorFrame {
LoadActor(Var "File1") .. { LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;pause;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color1);
self:pause();
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
}; };
+3 -14
View File
@@ -2,20 +2,9 @@ local Color = color(Var "Color1");
local t = Def.ActorFrame { local t = Def.ActorFrame {
LoadActor(Var "File1") .. { LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;position,0;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color1);
self:position(0);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
}; };
+3 -10
View File
@@ -3,16 +3,9 @@ local Color1 = color(Var "Color1");
local t = Def.ActorFrame { local t = Def.ActorFrame {
LoadActor(Var "File1") .. { LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(diffuse,Color1;effectclock,"music");
self:diffuse(Color1); GainFocusCommand=cmd(play);
self:effectclock("music"); LoseFocusCommand=cmd(pause);
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
}; };
+6 -27
View File
@@ -3,36 +3,15 @@ local Color2 = color(Var "Color2");
local t = Def.ActorFrame { local t = Def.ActorFrame {
LoadActor(Var "File1") .. { LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
LoadActor(Var "File2") .. { LoadActor(Var "File2") .. {
OnCommand=function(self) OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color2;effectclock,"music");
self:blend("BlendMode_Add"); GainFocusCommand=cmd(play);
self:x(SCREEN_CENTER_X); LoseFocusCommand=cmd(pause);
self:y(SCREEN_CENTER_Y);
self:scaletoclipped(SCREEN_WIDTH, SCREEN_HEIGHT);
self:diffuse(Color2);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
}; };
+6 -29
View File
@@ -4,39 +4,16 @@ local Color2 = color(Var "Color2");
local t = Def.ActorFrame {}; local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. { t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=function(self) OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
self:x(SCREEN_CENTER_X); GainFocusCommand=cmd(play);
self:y(SCREEN_CENTER_Y); LoseFocusCommand=cmd(pause);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
if Var("File2") ~= nil then if Var("File2") ~= nil then
t[#t+1] = LoadActor(Var("File2")) .. { t[#t+1] = LoadActor(Var("File2")) .. {
OnCommand=function(self) OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music";linear,1;diffusealpha,0);
self:blend("BlendMode_Add"); GainFocusCommand=cmd(play);
self:x(SCREEN_CENTER_X); LoseFocusCommand=cmd(pause);
self:y(SCREEN_CENTER_Y);
self:scale_or_crop_background();
self:diffuse(Color2);
self:effectclock("music");
self:linear(1);
self:diffusealpha(0);
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
}; };
end; end;