From f9c08d4a195e4f06bc5a66deef7eb1afc2d4ed58 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Fri, 5 May 2006 21:48:00 +0000
Subject: [PATCH] backgrounds fixup

---
 .../BackgroundEffects/SongBgWithMovieViz.xml  | 19 +++++++++++++------
 stepmania/BackgroundEffects/StretchNoLoop.xml |  4 ++--
 stepmania/BackgroundEffects/StretchNormal.xml | 10 ++++++----
 .../StretchNormalAlignLeft.xml                | 11 +++++++++++
 stepmania/BackgroundEffects/StretchPaused.xml |  4 ++--
 stepmania/BackgroundEffects/StretchRewind.xml |  4 ++--
 6 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 stepmania/BackgroundEffects/StretchNormalAlignLeft.xml

diff --git a/stepmania/BackgroundEffects/SongBgWithMovieViz.xml b/stepmania/BackgroundEffects/SongBgWithMovieViz.xml
index ec81eea3b9..7f6172a7d2 100644
--- a/stepmania/BackgroundEffects/SongBgWithMovieViz.xml
+++ b/stepmania/BackgroundEffects/SongBgWithMovieViz.xml
@@ -1,11 +1,18 @@
 <ActorFrame><children>
-	<Sprite
-		Command="LoadBackground,GAMESTATE:GetCurrentSong():GetBackgroundPath();x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;ZoomToWidth,SCREEN_WIDTH;ZoomToHeight,SCREEN_HEIGHT;diffuse,color(Color1)"
-	/>
-	<AutoActor
+	<Layer
+		Type="Sprite"
+		InitCommand="%function(self) self:LoadBackground( GAMESTATE:GetCurrentSong():GetBackgroundPath() ) end"
+		OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;ZoomToWidth,SCREEN_WIDTH;ZoomToHeight,SCREEN_HEIGHT;diffuse,color(self.Color1)"
+	>
+		<Input Name="Color1" />
+	</Layer>
+	<Layer
 		File="@File1"
-		OnCommand="Pause;blend,add;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;ZoomToWidth,SCREEN_WIDTH;ZoomToHeight,SCREEN_HEIGHT;diffuse,color(Color2)"
+		InitCommand="Pause"
+		OnCommand="blend,add;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;ZoomToWidth,SCREEN_WIDTH;ZoomToHeight,SCREEN_HEIGHT;diffuse,color(self.Color2)"
 		GainFocusCommand="Play"
 		LoseFocusCommand="Pause"
-	/>
+	>
+		<Input Name="Color2" />
+	</Layer>
 </children></ActorFrame>
diff --git a/stepmania/BackgroundEffects/StretchNoLoop.xml b/stepmania/BackgroundEffects/StretchNoLoop.xml
index a35ece2d1b..915c4c2dad 100644
--- a/stepmania/BackgroundEffects/StretchNoLoop.xml
+++ b/stepmania/BackgroundEffects/StretchNoLoop.xml
@@ -1,6 +1,6 @@
 <ActorFrame><children>
 	<AutoActor 
 		File="@File1" 
-		OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomtowidth,SCREEN_WIDTH;zoomtoheight,SCREEN_HEIGHT;loop,0"
+		OnCommand="scale_or_crop_background;loop,0"
 	/>
-</children></ActorFrame>
\ No newline at end of file
+</children></ActorFrame>
diff --git a/stepmania/BackgroundEffects/StretchNormal.xml b/stepmania/BackgroundEffects/StretchNormal.xml
index 14b1771d69..3d308a1532 100644
--- a/stepmania/BackgroundEffects/StretchNormal.xml
+++ b/stepmania/BackgroundEffects/StretchNormal.xml
@@ -1,8 +1,10 @@
 <ActorFrame><children>
-	<AutoActor 
+	<Layer
 		File="@File1" 
-		OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomtowidth,SCREEN_WIDTH;zoomtoheight,SCREEN_HEIGHT;diffuse,color(Color1)" 
+		OnCommand="scale_or_crop_background;diffuse,color(self.Color1)" 
 		GainFocusCommand="Play"
 		LoseFocusCommand="Pause"
-	/>
-</children></ActorFrame>
\ No newline at end of file
+	>
+		<Input Name="Color1" />
+	</Layer>
+</children></ActorFrame>
diff --git a/stepmania/BackgroundEffects/StretchNormalAlignLeft.xml b/stepmania/BackgroundEffects/StretchNormalAlignLeft.xml
new file mode 100644
index 0000000000..9afc36fd9a
--- /dev/null
+++ b/stepmania/BackgroundEffects/StretchNormalAlignLeft.xml
@@ -0,0 +1,11 @@
+<!-- Align left when cropping to 4:3.  Avoid this; it's not compatible with PS2 movie pre-rendering. -->
+<ActorFrame><children>
+	<Layer
+		File="@File1" 
+		OnCommand="horizalign,left;scaletocover,0,0,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color(self.Color1)" 
+		GainFocusCommand="Play"
+		LoseFocusCommand="Pause"
+	>
+		<Input Name="Color1" />
+	</Layer>
+</children></ActorFrame>
diff --git a/stepmania/BackgroundEffects/StretchPaused.xml b/stepmania/BackgroundEffects/StretchPaused.xml
index 364c1055b7..d09e54f534 100644
--- a/stepmania/BackgroundEffects/StretchPaused.xml
+++ b/stepmania/BackgroundEffects/StretchPaused.xml
@@ -1,6 +1,6 @@
 <ActorFrame><children>
 	<AutoActor 
 		File="@File1" 
-		OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomtowidth,SCREEN_WIDTH;zoomtoheight,SCREEN_HEIGHT;Pause" 
+		OnCommand="scale_or_crop_background;Pause" 
 	/>
-</children></ActorFrame>
\ No newline at end of file
+</children></ActorFrame>
diff --git a/stepmania/BackgroundEffects/StretchRewind.xml b/stepmania/BackgroundEffects/StretchRewind.xml
index ce6333135c..bd2f6ca947 100644
--- a/stepmania/BackgroundEffects/StretchRewind.xml
+++ b/stepmania/BackgroundEffects/StretchRewind.xml
@@ -1,6 +1,6 @@
 <ActorFrame><children>
 	<AutoActor 
 		File="@File1" 
-		OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomtowidth,SCREEN_WIDTH;zoomtoheight,SCREEN_HEIGHT;position,0"
+		OnCommand="scale_or_crop_background;position,0"
 	/>
-</children></ActorFrame>
\ No newline at end of file
+</children></ActorFrame>