Skip to content
Snippets Groups Projects
Commit 3cf556cc authored by Robert Goldmann's avatar Robert Goldmann
Browse files

implemented dynamic level stage size

parent d46dd9cb
Branches
Tags
No related merge requests found
......@@ -3,20 +3,35 @@ package de.bricked.game;
import de.bricked.game.levels.Level;
import de.bricked.game.levels.LevelPack;
import de.bricked.game.levels.LevelPackReader;
import de.bricked.game.settings.GameSize;
import de.bricked.game.settings.Settings;
public class Game
{
private Settings settings;
private LevelPack levelPack;
private Level level;
public Game()
{
this.settings = new Settings();
settings.setGameSize(GameSize.FULL_SCREEN);
// DEBUG
LevelPackReader reader = new LevelPackReader("default.json");
this.levelPack = reader.read();
this.level = null;
}
public Settings getSettings()
{
return settings;
}
public void setSettings(Settings settings)
{
this.settings = settings;
}
public void setLevelPack(LevelPack levelPack)
{
this.levelPack = levelPack;
......
......@@ -33,7 +33,7 @@ public class Settings
}
catch(Exception e)
{
e.printStackTrace();
Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
}
}
else
......@@ -44,7 +44,7 @@ public class Settings
}
catch(Exception e)
{
e.printStackTrace();
Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
}
}
}
......@@ -73,10 +73,30 @@ public class Settings
public void load() throws Exception
{
String jsonContent = new String(Files.readAllBytes(FileSystems.getDefault().getPath(directory + filename)));
String jsonContent = new String(Files.readAllBytes(FileSystems.getDefault().getPath(PathUtils.getOSindependentPath().toAbsolutePath() + directory + filename)));
Settings loadedSettings = gson.fromJson(jsonContent, Settings.class);
this.gameSize = loadedSettings.gameSize;
this.language = loadedSettings.language;
// MORE settings go here
}
public GameSize getGameSize()
{
return gameSize;
}
public void setGameSize(GameSize gameSize)
{
this.gameSize = gameSize;
}
public String getLanguage()
{
return language;
}
public void setLanguage(String language)
{
this.language = language;
}
}
\ No newline at end of file
......@@ -115,7 +115,7 @@ public class LevelSelectController
Parent root = (Parent)fxmlLoader.load();
Stage newStage = new Stage();
newStage.setScene(new Scene(root, 1000, 800));
newStage.setScene(new Scene(root, game.getSettings().getGameSize().getWidth(), game.getSettings().getGameSize().getHeight()));
newStage.setTitle(game.getLevel().getName());
newStage.initOwner(stage);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment