overlays system

src/mightypork/rogue/App.java

@@ -66,11 +66,11 @@ public class App extends BaseApp {
 	@Override
 	protected void initScreens(ScreenRegistry screens)
 	{
-		screens.add(new ScreenTestBouncy(this));
-		screens.add(new ScreenTestCat(this));
-		screens.add(new ScreenTestRender(this));
+		screens.addScreen(new ScreenTestBouncy(this));
+		screens.addScreen(new ScreenTestCat(this));
+		screens.addScreen(new ScreenTestRender(this));
 		
-		screens.add(new ScreenMainMenu(this));
+		screens.addScreen(new ScreenMainMenu(this));
 		
 		screens.showScreen("rogue.menu");
 	}

src/mightypork/rogue/screens/LayerFps.java

@@ -3,7 +3,7 @@ package mightypork.rogue.screens;
 
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.painters.TextPainter;
-import mightypork.gamecore.gui.screens.Screen;
+import mightypork.gamecore.gui.screens.BaseScreen;
 import mightypork.gamecore.gui.screens.ScreenLayer;
 import mightypork.gamecore.input.KeyStroke;
 import mightypork.gamecore.input.Keys;
@@ -21,7 +21,7 @@ public class LayerFps extends ScreenLayer {
 	TextPainter tp;
 	
 	
-	public LayerFps(Screen screen) {
+	public LayerFps(BaseScreen screen) {
 		super(screen);
 		
 		/*
@@ -56,13 +56,6 @@ public class LayerFps extends ScreenLayer {
 	}
 	
 	
-	@Override
-	protected void renderLayer()
-	{
-		super.renderLayer();
-	}
-	
-	
 	@Override
 	public int getPriority()
 	{

src/mightypork/rogue/screens/main_menu/MenuLayer.java

@@ -4,7 +4,7 @@ package mightypork.rogue.screens.main_menu;
 import mightypork.gamecore.control.events.ScreenRequestEvent;
 import mightypork.gamecore.gui.AlignY;
 import mightypork.gamecore.gui.components.layout.VerticalFixedFlowLayout;
-import mightypork.gamecore.gui.screens.Screen;
+import mightypork.gamecore.gui.screens.BaseScreen;
 import mightypork.gamecore.gui.screens.ScreenLayer;
 import mightypork.rogue.events.ActionRequest;
 import mightypork.rogue.events.ActionRequest.RequestType;
@@ -16,7 +16,7 @@ import mightypork.util.math.color.Color;
 
 class MenuLayer extends ScreenLayer {
 	
-	public MenuLayer(Screen screen) {
+	public MenuLayer(BaseScreen screen) {
 		super(screen);
 		
 		init();

src/mightypork/rogue/screens/test_bouncyboxes/LayerBouncyBoxes.java

@@ -7,7 +7,7 @@ import java.util.List;
 import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.layout.RowHolder;
 import mightypork.gamecore.gui.components.painters.TextPainter;
-import mightypork.gamecore.gui.screens.Screen;
+import mightypork.gamecore.gui.screens.BaseScreen;
 import mightypork.gamecore.gui.screens.ScreenLayer;
 import mightypork.gamecore.input.KeyStroke;
 import mightypork.gamecore.input.Keys;
@@ -23,7 +23,7 @@ public class LayerBouncyBoxes extends ScreenLayer {
 	private RowHolder layout;
 	
 	
-	public LayerBouncyBoxes(Screen screen) {
+	public LayerBouncyBoxes(BaseScreen screen) {
 		super(screen);
 		
 		bindKeyStroke(new KeyStroke(true, Keys.KEY_RIGHT), new Runnable() {

src/mightypork/rogue/screens/test_cat_sound/LayerColor.java

@@ -2,14 +2,14 @@ package mightypork.rogue.screens.test_cat_sound;
 
 
 import mightypork.gamecore.gui.components.painters.QuadPainter;
-import mightypork.gamecore.gui.screens.Screen;
+import mightypork.gamecore.gui.screens.BaseScreen;
 import mightypork.gamecore.gui.screens.ScreenLayer;
 import mightypork.util.math.color.Color;
 
 
 public class LayerColor extends ScreenLayer {
 	
-	public LayerColor(Screen screen, Color color) {
+	public LayerColor(BaseScreen screen, Color color) {
 		super(screen);
 		
 		root.add(new QuadPainter(color));

src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java

@@ -8,7 +8,7 @@ import mightypork.gamecore.gui.AlignX;
 import mightypork.gamecore.gui.components.painters.ImagePainter;
 import mightypork.gamecore.gui.components.painters.QuadPainter;
 import mightypork.gamecore.gui.components.painters.TextPainter;
-import mightypork.gamecore.gui.screens.Screen;
+import mightypork.gamecore.gui.screens.BaseScreen;
 import mightypork.gamecore.gui.screens.ScreenLayer;
 import mightypork.gamecore.input.KeyStroke;
 import mightypork.gamecore.input.Keys;
@@ -29,7 +29,7 @@ public class LayerFlyingCat extends ScreenLayer implements MouseButtonEvent.List
 	private final Random rand = new Random();
 	
 	
-	public LayerFlyingCat(Screen screen) {
+	public LayerFlyingCat(BaseScreen screen) {
 		super(screen);
 		
 		// timing

src/mightypork/rogue/screens/test_render/LayerTestGradient.java

@@ -1,7 +1,7 @@
 package mightypork.rogue.screens.test_render;
 
 
-import mightypork.gamecore.gui.screens.Screen;
+import mightypork.gamecore.gui.screens.BaseScreen;
 import mightypork.gamecore.gui.screens.ScreenLayer;
 import mightypork.gamecore.render.Render;
 import mightypork.util.constraints.rect.proxy.RectBound;
@@ -14,7 +14,7 @@ public class LayerTestGradient extends ScreenLayer {
 	private final RectBound pos2;
 	
 	
-	public LayerTestGradient(Screen screen) {
+	public LayerTestGradient(BaseScreen screen) {
 		super(screen);
 		
 		pos1 = root.topEdge().growDown(64);
@@ -23,7 +23,7 @@ public class LayerTestGradient extends ScreenLayer {
 	
 	
 	@Override
-	protected void renderLayer()
+	public void render()
 	{
 		Render.quadColor(root, Color.WHITE, Color.BLUE, Color.BLACK, Color.MAGENTA);
 		Render.quadGradH(pos1.getRect(), Color.GREEN, Color.RED);