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
+11 -20
View File
@@ -1,20 +1,11 @@
local Color1 = color(Var "Color1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
};
};
return t;
local Color1 = color(Var "Color1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
};
return t;
+16 -45
View File
@@ -1,45 +1,16 @@
local Color1 = color(Var "Color1");
local a = 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 t = Def.ActorFrame {
a .. {
OnCommand = function(self)
self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(1, 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;
local Color1 = color(Var "Color1");
local a = LoadActor(Var "File1") .. {
OnCommand=cmd(cropto,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
local t = Def.ActorFrame {
a .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
a .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
a .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,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)); };
};
return t;
+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;
+8 -35
View File
@@ -1,36 +1,9 @@
-- Alternating files being played back at once
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand = function(self)
self:x(scale(1, 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(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;
};
};
-- Alternating files being played back at once
local t = Def.ActorFrame {
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) };
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) };
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) };
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) };
};
return t
+3 -15
View File
@@ -4,21 +4,9 @@ local Color2 = color(Var "Color2");
local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=function(self)
self:diffuse(Color1);
self:blend("BlendMode_Add");
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;
OnCommand=cmd(diffuse,Color1;blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;linear,1;diffusealpha,0);
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
return t;
+6 -28
View File
@@ -4,38 +4,16 @@ local Color2 = color(Var "Color2");
local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
if Var("File2") ~= nil then
t[#t+1] = LoadActor(Var("File2")) .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
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;
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music";linear,1;diffusealpha,0);
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
end;
+6 -26
View File
@@ -5,36 +5,16 @@ local stretchBG = PREFSMAN:GetPreference("StretchBackgrounds")
local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
if Var("File2") ~= nil then
t[#t+1] = LoadActor(Var("File2")) .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
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;
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
end;
+16 -46
View File
@@ -1,46 +1,16 @@
local Color1 = color(Var "Color1");
local a = LoadActor(Var "File1") .. {
OnCommand=function(self)
self:cropto(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2);
self:diffuse(Color1);
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 {
a .. {
OnCommand = function(self)
self:x(scale(1, 0, 4, SCREEN_LEFT, SCREEN_RIGHT));
self:y(scale(1, 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;
local Color1 = color(Var "Color1");
local a = LoadActor(Var "File1") .. {
OnCommand=cmd(cropto,SCREEN_WIDTH/2,SCREEN_HEIGHT/2;diffuse,Color1;zoomx,self:GetZoomX()*-1;zoomy,self:GetZoomY()*-1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
local t = Def.ActorFrame {
a .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
a .. { OnCommand=cmd(x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM)); };
a .. { OnCommand=cmd(x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,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)); };
};
return t;
+3 -13
View File
@@ -3,19 +3,9 @@ local Color1 = color(Var "Color1");
local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=function(self)
self:diffuse(Color1);
self:blend("BlendMode_Add");
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;
OnCommand=cmd(diffuse,Color1;blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;);
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
return t;
+25 -38
View File
@@ -1,38 +1,25 @@
local Color1 = color(Var "Color1");
local Color2 = color(Var "Color2");
local stretchBG = PREFSMAN:GetPreference("StretchBackgrounds")
local t = Def.ActorFrame {
Def.Sprite {
OnCommand=function(self)
self:LoadFromCurrentSongBackground()
self:xy(SCREEN_CENTER_X,SCREEN_CENTER_Y)
if stretchBG then
self:SetSize(SCREEN_WIDTH,SCREEN_HEIGHT)
else
self:scale_or_crop_background();
end
self:diffuse(Color1)
self:effectclock("music")
end;
};
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:blend("BlendMode_Add");
self:x(SCREEN_CENTER_X);
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;
};
};
return t;
local Color1 = color(Var "Color1");
local Color2 = color(Var "Color2");
local stretchBG = PREFSMAN:GetPreference("StretchBackgrounds")
local t = Def.ActorFrame {
Def.Sprite {
OnCommand=function(self)
self:LoadFromCurrentSongBackground()
self:xy(SCREEN_CENTER_X,SCREEN_CENTER_Y)
if stretchBG then self:SetSize(SCREEN_WIDTH,SCREEN_HEIGHT)
else self:scale_or_crop_background();
end
self:diffuse(Color1)
self:effectclock("music")
end;
};
LoadActor(Var "File1") .. {
OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color2;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
};
return t;
+11 -22
View File
@@ -1,22 +1,11 @@
local Color1 = color(Var "Color1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
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;
};
};
return t;
local Color1 = color(Var "Color1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;loop,false;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
};
return t;
+19 -23
View File
@@ -1,23 +1,19 @@
local Color1 = color(Var "Color1");
local stretchBG = PREFSMAN:GetPreference("StretchBackgrounds")
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:xy(SCREEN_CENTER_X,SCREEN_CENTER_Y)
if stretchBG then self:SetSize(SCREEN_WIDTH,SCREEN_HEIGHT)
else self:scale_or_crop_background();
end
self:diffuse(Color1)
self:effectclock("music")
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
};
};
return t;
local Color1 = color(Var "Color1");
local stretchBG = PREFSMAN:GetPreference("StretchBackgrounds")
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:xy(SCREEN_CENTER_X,SCREEN_CENTER_Y)
if stretchBG then self:SetSize(SCREEN_WIDTH,SCREEN_HEIGHT)
else self:scale_or_crop_background();
end
self:diffuse(Color1)
self:effectclock("music")
end;
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
};
return t;
+12 -22
View File
@@ -1,22 +1,12 @@
-- Align left when cropping to 4:3.
local Color1 = color(Var "Color1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
};
};
return t;
-- Align left when cropping to 4:3.
local Color1 = color(Var "Color1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
};
return t;
+12 -22
View File
@@ -1,22 +1,12 @@
-- Stretch a file with blue diffusion.
local Color1 = color("0,0,1,1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
};
};
return t;
-- Stretch a file with blue diffusion.
local Color1 = color("0,0,1,1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
};
return t;
+12 -22
View File
@@ -1,22 +1,12 @@
--- Stretch a file with green diffusion.
local Color1 = color("0,1,0,1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
};
};
return t;
--- Stretch a file with green diffusion.
local Color1 = color("0,1,0,1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
};
return t;
+12 -22
View File
@@ -1,22 +1,12 @@
--- Stretch a file with red diffusion.
local Color1 = color("1,0,0,1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
};
};
return t;
--- Stretch a file with red diffusion.
local Color1 = color("1,0,0,1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
};
return t;
+11 -22
View File
@@ -1,22 +1,11 @@
local Color1 = color(Var "Color1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
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;
};
};
return t;
local Color1 = color(Var "Color1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;pause;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
};
return t;
+12 -23
View File
@@ -1,23 +1,12 @@
local Color = color(Var "Color1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
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;
};
};
return t;
local Color = color(Var "Color1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;position,0;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
};
return t;
+13 -20
View File
@@ -1,20 +1,13 @@
-- upper left corner
local Color1 = color(Var "Color1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
};
};
return t;
-- upper left corner
local Color1 = color(Var "Color1");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=cmd(diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
};
return t;
+18 -39
View File
@@ -1,39 +1,18 @@
local Color1 = color(Var "Color1");
local Color2 = color(Var "Color2");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
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") .. {
OnCommand=function(self)
self:blend("BlendMode_Add");
self:x(SCREEN_CENTER_X);
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;
};
};
return t;
local Color1 = color(Var "Color1");
local Color2 = color(Var "Color2");
local t = Def.ActorFrame {
LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
LoadActor(Var "File2") .. {
OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color2;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
};
return t;
+6 -29
View File
@@ -4,39 +4,16 @@ local Color2 = color(Var "Color2");
local t = Def.ActorFrame {};
t[#t+1] = LoadActor(Var "File1") .. {
OnCommand=function(self)
self:x(SCREEN_CENTER_X);
self:y(SCREEN_CENTER_Y);
self:scale_or_crop_background();
self:diffuse(Color1);
self:effectclock("music");
end;
GainFocusCommand=function(self)
self:play();
end;
LoseFocusCommand=function(self)
self:pause();
end;
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background;diffuse,Color1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
if Var("File2") ~= nil then
t[#t+1] = LoadActor(Var("File2")) .. {
OnCommand=function(self)
self:blend("BlendMode_Add");
self:x(SCREEN_CENTER_X);
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;
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);
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
end;