From 30857951e0458e40194c97ca3361235389e85272 Mon Sep 17 00:00:00 2001
From: ondra <ondra@T60>
Date: Wed, 23 Apr 2014 14:17:49 +0200
Subject: [PATCH] fixed minor mistake in world layer

---
 src/mightypork/rogue/screens/ingame/WorldLayer.java    | 5 ++++-
 src/mightypork/rogue/screens/ingame/WorldRenderer.java | 4 ++--
 src/mightypork/rogue/screens/main_menu/MenuLayer.java  | 9 +++++----
 src/mightypork/rogue/world/level/Level.java            | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/mightypork/rogue/screens/ingame/WorldLayer.java b/src/mightypork/rogue/screens/ingame/WorldLayer.java
index 009e766..756530c 100644
--- a/src/mightypork/rogue/screens/ingame/WorldLayer.java
+++ b/src/mightypork/rogue/screens/ingame/WorldLayer.java
@@ -17,6 +17,7 @@ import mightypork.rogue.world.World;
 import mightypork.rogue.world.entity.Entity;
 import mightypork.rogue.world.entity.models.EntityMoveListener;
 import mightypork.rogue.world.level.Level;
+import mightypork.util.constraints.num.Num;
 import mightypork.util.ion.Ion;
 
 
@@ -49,9 +50,11 @@ public class WorldLayer extends ScreenLayer {
 //			System.exit(1);
 //			return;
 //		}
+
+		final Num minWH = root.width().min(root.height()).max(700); // avoid too small shrinking
 		
 		final WorldRenderer wr = new WorldRenderer(w);
-		wr.setRect(root);
+		wr.setRect(root.shrinkBottom(minWH.perc(7)));
 		root.add(wr);
 		
 		final PlayerControl c = w.getPlayerControl();
diff --git a/src/mightypork/rogue/screens/ingame/WorldRenderer.java b/src/mightypork/rogue/screens/ingame/WorldRenderer.java
index 868618e..d834f96 100644
--- a/src/mightypork/rogue/screens/ingame/WorldRenderer.java
+++ b/src/mightypork/rogue/screens/ingame/WorldRenderer.java
@@ -34,7 +34,7 @@ public class WorldRenderer extends InputComponent implements Updateable {
 		leftShadow = leftEdge().growRight(grX);
 		rightShadow = rightEdge().growLeft(grX);
 		topShadow = topEdge().growDown(grY);
-		bottomShadow = bottomEdge().growUp(grY).moveY(minWH.perc(-6));
+		bottomShadow = bottomEdge().growUp(grY); //.moveY(minWH.perc(-6))
 	}
 	
 	
@@ -48,7 +48,7 @@ public class WorldRenderer extends InputComponent implements Updateable {
 	@Override
 	protected void renderComponent()
 	{
-		world.render(this, 8, 6, 110);
+		world.render(this, 8, 7, 100);
 		
 		Render.quadGradH(leftShadow, RGB.BLACK, RGB.NONE);
 		Render.quadGradH(rightShadow, RGB.NONE, RGB.BLACK);
diff --git a/src/mightypork/rogue/screens/main_menu/MenuLayer.java b/src/mightypork/rogue/screens/main_menu/MenuLayer.java
index a99504e..3563536 100644
--- a/src/mightypork/rogue/screens/main_menu/MenuLayer.java
+++ b/src/mightypork/rogue/screens/main_menu/MenuLayer.java
@@ -12,6 +12,7 @@ import mightypork.rogue.screens.CrossfadeRequest;
 import mightypork.util.constraints.num.Num;
 import mightypork.util.constraints.rect.Rect;
 import mightypork.util.control.Action;
+import mightypork.util.math.color.COMMODORE;
 import mightypork.util.math.color.PAL16;
 
 
@@ -40,16 +41,16 @@ class MenuLayer extends ScreenLayer {
 		
 		TextPainter tp;
 		MenuButton b0, b1, b2, b3, b4;
-		tp = new TextPainter(Res.getFont("main_menu_title"), AlignX.CENTER, PAL16.ZORNSKIN, "Rogue!");
-		b0 = new MenuButton("Ingame", PAL16.SLIMEGREEN);
+		tp = new TextPainter(Res.getFont("main_menu_title"), AlignX.CENTER, COMMODORE.PURPLE, "Rogue!");
+		b0 = new MenuButton("World Test", PAL16.SLIMEGREEN);
 		b1 = new MenuButton("Gradientz", PAL16.BLAZE);
-		b2 = new MenuButton("Bouncy Cubes", PAL16.NEWPOOP);
+		b2 = new MenuButton("Bouncy Cubes", PAL16.CLOUDBLUE);
 		b3 = new MenuButton("Flying Cat", PAL16.PIGMEAT);
 		b4 = new MenuButton("Bye!", PAL16.BLOODRED);
 		
 		int r = 0;
 		
-		layout.put(tp, r, 0, 4, 1);
+		layout.put(tp, r, 0, 3, 1);
 		r += 5;
 		layout.put(b0, r, 0, 2, 1);
 		r += 3;
diff --git a/src/mightypork/rogue/world/level/Level.java b/src/mightypork/rogue/world/level/Level.java
index 83c6367..781a5f1 100644
--- a/src/mightypork/rogue/world/level/Level.java
+++ b/src/mightypork/rogue/world/level/Level.java
@@ -254,7 +254,7 @@ public class Level implements MapAccess, IonBinary {
 		
 		//tileSize -= tileSize % 8;
 		
-		final VectConst vpCenter = r.center().sub(tileSize * 0.5, tileSize).freeze(); // 0.5 to center, 1 to move up (down is teh navbar)
+		final VectConst vpCenter = r.center().sub(tileSize * 0.5, tileSize * 0.5).freeze(); // 0.5 to center, 1 to move up (down is teh navbar)
 		
 		final double playerX = pos.getVisualX();
 		final double playerY = pos.getVisualY();