More lua to fix.

2013-07-01 21:00:52 -04:00
parent 5a5724d13f
commit d20290ad2f
21 changed files with 593 additions and 255 deletions
@@ -1,18 +1,39 @@
-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;
+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;