Merging Source v1.7.2: UI changes

2014-10-18 21:30:38 -04:00
parent 9f9e117c95
commit 735af276c8
7 changed files with 347 additions and 206 deletions
@@ -24,42 +24,50 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets;

 public class Archs extends Component {

-	private static final float SCROLL_SPEED	= 20f;
-	
-	private SkinnedBlock arcsBg;
-	private SkinnedBlock arcsFg;
-	
-	public boolean reversed = false;
-	
-	@Override
-	protected void createChildren() {
-		arcsBg = new SkinnedBlock( 1, 1, Assets.ARCS_BG );
-		add( arcsBg );
-		
-		arcsFg = new SkinnedBlock( 1, 1, Assets.ARCS_FG );
-		add( arcsFg );
-	}
-	
-	@Override
-	protected void layout() {
-		arcsBg.size( width, height );
-		arcsBg.offset( arcsBg.texture.width / 4 - (width % arcsBg.texture.width) / 2, 0 );
-		
-		arcsFg.size( width, height );
-		arcsFg.offset( arcsFg.texture.width / 4 - (width % arcsFg.texture.width) / 2, 0 );
-	}
-	
-	@Override
-	public void update() {
-		
-		super.update();
-		
-		float shift = Game.elapsed * SCROLL_SPEED;
-		if (reversed) {
-			shift = -shift;
-		}
-		
-		arcsBg.offset( 0, shift );
-		arcsFg.offset( 0, shift * 2 );
-	}
+    private static final float SCROLL_SPEED	= 20f;
+
+    private SkinnedBlock arcsBg;
+    private SkinnedBlock arcsFg;
+
+    private static float offsB = 0;
+    private static float offsF = 0;
+
+    public boolean reversed = false;
+
+    @Override
+    protected void createChildren() {
+        arcsBg = new SkinnedBlock( 1, 1, Assets.ARCS_BG );
+        arcsBg.offsetTo( 0,  offsB );
+        add( arcsBg );
+
+        arcsFg = new SkinnedBlock( 1, 1, Assets.ARCS_FG );
+        arcsFg.offsetTo( 0,  offsF );
+        add( arcsFg );
+    }
+
+    @Override
+    protected void layout() {
+        arcsBg.size( width, height );
+        arcsBg.offset( arcsBg.texture.width / 4 - (width % arcsBg.texture.width) / 2, 0 );
+
+        arcsFg.size( width, height );
+        arcsFg.offset( arcsFg.texture.width / 4 - (width % arcsFg.texture.width) / 2, 0 );
+    }
+
+    @Override
+    public void update() {
+
+        super.update();
+
+        float shift = Game.elapsed * SCROLL_SPEED;
+        if (reversed) {
+            shift = -shift;
+        }
+
+        arcsBg.offset( 0, shift );
+        arcsFg.offset( 0, shift * 2 );
+
+        offsB = arcsBg.offsetY();
+        offsF = arcsFg.offsetY();
+    }
 }