From 9fecfd89c57c841012f3e11a77601e8073759b5f Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Fri, 5 Aug 2011 17:30:52 -0400 Subject: [PATCH] hgeol --- BackgroundEffects/Centered.lua | 20 ++++++------ BackgroundEffects/Checkerboard1File2x2.lua | 32 ++++++++++---------- BackgroundEffects/Checkerboard2File2x2.lua | 32 ++++++++++---------- BackgroundEffects/Kaleidoscope2x2.lua | 32 ++++++++++---------- BackgroundEffects/SongBgWithMovieViz.lua | 32 ++++++++++---------- BackgroundEffects/StretchNoLoop.lua | 20 ++++++------ BackgroundEffects/StretchNormal.lua | 22 +++++++------- BackgroundEffects/StretchNormalAlignLeft.lua | 24 +++++++-------- BackgroundEffects/StretchPaused.lua | 22 +++++++------- BackgroundEffects/StretchRewind.lua | 24 +++++++-------- BackgroundEffects/UpperLeft.lua | 26 ++++++++-------- 11 files changed, 143 insertions(+), 143 deletions(-) diff --git a/BackgroundEffects/Centered.lua b/BackgroundEffects/Centered.lua index b0c85341c8..f4292160ff 100644 --- a/BackgroundEffects/Centered.lua +++ b/BackgroundEffects/Centered.lua @@ -1,10 +1,10 @@ -local Color = color(Var "Color1"); -local t = Def.ActorFrame { - LoadActor(Var "File1") .. { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,Color;effectclock,"music"); - GainFocusCommand=cmd(play); - LoseFocusCommand=cmd(pause); - }; -}; - -return t; +local Color = color(Var "Color1"); +local t = Def.ActorFrame { + LoadActor(Var "File1") .. { + OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,Color;effectclock,"music"); + GainFocusCommand=cmd(play); + LoseFocusCommand=cmd(pause); + }; +}; + +return t; diff --git a/BackgroundEffects/Checkerboard1File2x2.lua b/BackgroundEffects/Checkerboard1File2x2.lua index 50cdfee47a..2e4327b56d 100644 --- a/BackgroundEffects/Checkerboard1File2x2.lua +++ b/BackgroundEffects/Checkerboard1File2x2.lua @@ -1,16 +1,16 @@ -local Color = color(Var "Color1"); - -local a = LoadActor(Var "File1") .. { - OnCommand=cmd(zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color;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; +local Color = color(Var "Color1"); + +local a = LoadActor(Var "File1") .. { + OnCommand=cmd(zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color;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; diff --git a/BackgroundEffects/Checkerboard2File2x2.lua b/BackgroundEffects/Checkerboard2File2x2.lua index 9a2f881395..36c87f5e65 100644 --- a/BackgroundEffects/Checkerboard2File2x2.lua +++ b/BackgroundEffects/Checkerboard2File2x2.lua @@ -1,16 +1,16 @@ -local Color = color(Var "Color1"); -local a = LoadActor(Var "File2") .. { - OnCommand=cmd(zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color;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; - +local Color = color(Var "Color1"); +local a = LoadActor(Var "File2") .. { + OnCommand=cmd(zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color;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; + diff --git a/BackgroundEffects/Kaleidoscope2x2.lua b/BackgroundEffects/Kaleidoscope2x2.lua index b6d282ff3e..e1410ac6cc 100644 --- a/BackgroundEffects/Kaleidoscope2x2.lua +++ b/BackgroundEffects/Kaleidoscope2x2.lua @@ -1,16 +1,16 @@ -local Color = color(Var "Color1"); - -local a = LoadActor(Var "File1") .. { - OnCommand=cmd(zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color;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; +local Color = color(Var "Color1"); + +local a = LoadActor(Var "File1") .. { + OnCommand=cmd(zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color;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; diff --git a/BackgroundEffects/SongBgWithMovieViz.lua b/BackgroundEffects/SongBgWithMovieViz.lua index 6cea5b694f..ab1264e885 100644 --- a/BackgroundEffects/SongBgWithMovieViz.lua +++ b/BackgroundEffects/SongBgWithMovieViz.lua @@ -1,16 +1,16 @@ -local Color1 = color(Var "Color1"); -local Color2 = color(Var "Color2"); - -local t = Def.ActorFrame { - Def.Sprite { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomtowidth,SCREEN_WIDTH;zoomtoheight,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music"); - }; - - LoadActor(Var "File1") .. { - OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomtowidth,SCREEN_WIDTH;zoomtoheight,SCREEN_HEIGHT;diffuse,Color2;effectclock,"music"); - GainFocusCommand=cmd(play); - LoseFocusCommand=cmd(pause); - }; -}; - -return t; +local Color1 = color(Var "Color1"); +local Color2 = color(Var "Color2"); + +local t = Def.ActorFrame { + Def.Sprite { + OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomtowidth,SCREEN_WIDTH;zoomtoheight,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music"); + }; + + LoadActor(Var "File1") .. { + OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomtowidth,SCREEN_WIDTH;zoomtoheight,SCREEN_HEIGHT;diffuse,Color2;effectclock,"music"); + GainFocusCommand=cmd(play); + LoseFocusCommand=cmd(pause); + }; +}; + +return t; diff --git a/BackgroundEffects/StretchNoLoop.lua b/BackgroundEffects/StretchNoLoop.lua index 30a5cf9112..7c063cda1f 100644 --- a/BackgroundEffects/StretchNoLoop.lua +++ b/BackgroundEffects/StretchNoLoop.lua @@ -1,10 +1,10 @@ -local Color = color(Var "Color1"); -local t = Def.ActorFrame { - LoadActor(Var "File1") .. { - OnCommand=cmd(scale_or_crop_background;diffuse,Color;loop,false;effectclock,"music"); - GainFocusCommand=cmd(play); - LoseFocusCommand=cmd(pause); - }; -}; - -return t; +local Color = color(Var "Color1"); +local t = Def.ActorFrame { + LoadActor(Var "File1") .. { + OnCommand=cmd(scale_or_crop_background;diffuse,Color;loop,false;effectclock,"music"); + GainFocusCommand=cmd(play); + LoseFocusCommand=cmd(pause); + }; +}; + +return t; diff --git a/BackgroundEffects/StretchNormal.lua b/BackgroundEffects/StretchNormal.lua index f97767eaa3..a58834ec72 100644 --- a/BackgroundEffects/StretchNormal.lua +++ b/BackgroundEffects/StretchNormal.lua @@ -1,11 +1,11 @@ -local Color = color(Var "Color1"); - -local t = Def.ActorFrame { - LoadActor(Var "File1") .. { - OnCommand=cmd(scale_or_crop_background;diffuse,Color;effectclock,"music"); - GainFocusCommand=cmd(play); - LoseFocusCommand=cmd(pause); - }; -}; - -return t; +local Color = color(Var "Color1"); + +local t = Def.ActorFrame { + LoadActor(Var "File1") .. { + OnCommand=cmd(scale_or_crop_background;diffuse,Color;effectclock,"music"); + GainFocusCommand=cmd(play); + LoseFocusCommand=cmd(pause); + }; +}; + +return t; diff --git a/BackgroundEffects/StretchNormalAlignLeft.lua b/BackgroundEffects/StretchNormalAlignLeft.lua index 81946b540a..2d7b6a2704 100644 --- a/BackgroundEffects/StretchNormalAlignLeft.lua +++ b/BackgroundEffects/StretchNormalAlignLeft.lua @@ -1,12 +1,12 @@ --- Align left when cropping to 4:3. -local Color = color(Var "Color1"); - -local t = Def.ActorFrame { - LoadActor(Var "File1") .. { - OnCommand=cmd(horizalign,left;scaletocover,0,0,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color(Color);effectclock,"music"); - GainFocusCommand=cmd(play); - LoseFocusCommand=cmd(pause); - }; -}; - -return t; +-- Align left when cropping to 4:3. +local Color = color(Var "Color1"); + +local t = Def.ActorFrame { + LoadActor(Var "File1") .. { + OnCommand=cmd(horizalign,left;scaletocover,0,0,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color(Color);effectclock,"music"); + GainFocusCommand=cmd(play); + LoseFocusCommand=cmd(pause); + }; +}; + +return t; diff --git a/BackgroundEffects/StretchPaused.lua b/BackgroundEffects/StretchPaused.lua index 3ad028f558..b741b21574 100644 --- a/BackgroundEffects/StretchPaused.lua +++ b/BackgroundEffects/StretchPaused.lua @@ -1,11 +1,11 @@ -local Color = color(Var "Color1"); - -local t = Def.ActorFrame { - LoadActor(Var "File1") .. { - OnCommand=cmd(scale_or_crop_background;diffuse,Color;pause;effectclock,"music"); - GainFocusCommand=cmd(play); - LoseFocusCommand=cmd(pause); - }; -}; - -return t; +local Color = color(Var "Color1"); + +local t = Def.ActorFrame { + LoadActor(Var "File1") .. { + OnCommand=cmd(scale_or_crop_background;diffuse,Color;pause;effectclock,"music"); + GainFocusCommand=cmd(play); + LoseFocusCommand=cmd(pause); + }; +}; + +return t; diff --git a/BackgroundEffects/StretchRewind.lua b/BackgroundEffects/StretchRewind.lua index c6e6d192db..b0dc6cc09b 100644 --- a/BackgroundEffects/StretchRewind.lua +++ b/BackgroundEffects/StretchRewind.lua @@ -1,12 +1,12 @@ -local Color = color(Var "Color1"); - -local t = Def.ActorFrame { - LoadActor(Var "File1") .. { - OnCommand=cmd(scale_or_crop_background;diffuse,Color;position,0;effectclock,"music"); - GainFocusCommand=cmd(play); - LoseFocusCommand=cmd(pause); - }; -}; - -return t; - +local Color = color(Var "Color1"); + +local t = Def.ActorFrame { + LoadActor(Var "File1") .. { + OnCommand=cmd(scale_or_crop_background;diffuse,Color;position,0;effectclock,"music"); + GainFocusCommand=cmd(play); + LoseFocusCommand=cmd(pause); + }; +}; + +return t; + diff --git a/BackgroundEffects/UpperLeft.lua b/BackgroundEffects/UpperLeft.lua index ee323bc219..01f0d33979 100644 --- a/BackgroundEffects/UpperLeft.lua +++ b/BackgroundEffects/UpperLeft.lua @@ -1,13 +1,13 @@ --- upper left corner -local Color = color(Var "Color1"); - -local t = Def.ActorFrame { - LoadActor(Var "File1") .. { - OnCommand=cmd(diffuse,Color;effectclock,"music"); - GainFocusCommand=cmd(play); - LoseFocusCommand=cmd(pause); - }; -}; - -return t; - +-- upper left corner +local Color = color(Var "Color1"); + +local t = Def.ActorFrame { + LoadActor(Var "File1") .. { + OnCommand=cmd(diffuse,Color;effectclock,"music"); + GainFocusCommand=cmd(play); + LoseFocusCommand=cmd(pause); + }; +}; + +return t; +