|
@@ -2,21 +2,24 @@ package pathgame;
|
|
|
|
|
|
import me.hammerle.snuviengine.api.IGame;
|
|
|
import me.hammerle.snuviengine.api.Renderer;
|
|
|
+import pathgame.gameplay.EscMenu;
|
|
|
import pathgame.gameplay.Gamestate;
|
|
|
import pathgame.gameplay.Gamestates;
|
|
|
import pathgame.gameplay.Keys;
|
|
|
-import pathgame.gameplay.Menu;
|
|
|
+import pathgame.gameplay.MainMenu;
|
|
|
import pathgame.rendering.TileMapRenderer;
|
|
|
import pathgame.tilemap.TileMap;
|
|
|
import pathgame.tilemap.TileMapGenerator;
|
|
|
import pathgame.gameplay.Player;
|
|
|
+import pathgame.rendering.EscMenuRenderer;
|
|
|
import pathgame.rendering.HUDRenderer;
|
|
|
-import pathgame.rendering.MenuRenderer;
|
|
|
+import pathgame.rendering.MainMenuRenderer;
|
|
|
import pathgame.rendering.PlayerRenderer;
|
|
|
import pathgame.rendering.TileRenderer;
|
|
|
|
|
|
public class PathGame implements IGame
|
|
|
{
|
|
|
+
|
|
|
private final Gamestate gamestate = new Gamestate();
|
|
|
|
|
|
private final TileMapRenderer mapRenderer = new TileMapRenderer();
|
|
@@ -25,9 +28,12 @@ public class PathGame implements IGame
|
|
|
private final PlayerRenderer playerRenderer = new PlayerRenderer();
|
|
|
private final Player player = new Player(100, 10);
|
|
|
|
|
|
- private final MenuRenderer menuRenderer = new MenuRenderer();
|
|
|
- private final Menu menu = new Menu();
|
|
|
+ private final MainMenuRenderer menuRenderer = new MainMenuRenderer();
|
|
|
+ private final MainMenu menu = new MainMenu();
|
|
|
|
|
|
+ private final EscMenuRenderer escMenuRenderer = new EscMenuRenderer();
|
|
|
+ private final EscMenu escMenu = new EscMenu();
|
|
|
+
|
|
|
private final HUDRenderer hudRenderer = new HUDRenderer();
|
|
|
|
|
|
private float lastScale = 1.0f;
|
|
@@ -40,20 +46,21 @@ public class PathGame implements IGame
|
|
|
@Override
|
|
|
public void tick()
|
|
|
{
|
|
|
+ checkForGamestateChange();
|
|
|
mapRenderer.tick();
|
|
|
switch(gamestate.getState())
|
|
|
{
|
|
|
case ESCMENU:
|
|
|
+ escMenu.tick(gamestate);
|
|
|
break;
|
|
|
case GAMEPLAY:
|
|
|
player.tick(map);
|
|
|
break;
|
|
|
case MAINMENU:
|
|
|
- menu.tick(gamestate);
|
|
|
+ menu.tick(gamestate);
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
-
|
|
|
|
|
|
lastScale = scale;
|
|
|
if(Keys.ZOOM_IN_KEY.isDown())
|
|
@@ -81,7 +88,8 @@ public class PathGame implements IGame
|
|
|
switch(gamestate.getState())
|
|
|
{
|
|
|
case ESCMENU:
|
|
|
- break;
|
|
|
+ escMenuRenderer.renderTick(r, lag, escMenu);
|
|
|
+ break;
|
|
|
case GAMEPLAY:
|
|
|
playerRenderer.renderTick(map, mapRenderer, r, player, lag, offX, offY);
|
|
|
hudRenderer.renderTick(r, player, lag);
|
|
@@ -131,4 +139,16 @@ public class PathGame implements IGame
|
|
|
{
|
|
|
//System.out.println("stopped game");
|
|
|
}
|
|
|
+
|
|
|
+ private void checkForGamestateChange()
|
|
|
+ {
|
|
|
+ if(Keys.ESCAPE_KEY.isDown() && Keys.ESCAPE_KEY.getTime() == 1 && gamestate.isGamestate(Gamestates.GAMEPLAY))
|
|
|
+ {
|
|
|
+ gamestate.setState(Gamestates.ESCMENU);
|
|
|
+ }
|
|
|
+ else if(Keys.ESCAPE_KEY.isDown() && Keys.ESCAPE_KEY.getTime() == 1 && gamestate.isGamestate(Gamestates.ESCMENU))
|
|
|
+ {
|
|
|
+ gamestate.setState(Gamestates.GAMEPLAY);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|