Fix ui draw

This commit is contained in:
Makussu 2024-06-10 08:10:54 +02:00
parent a7aa6a579e
commit 08d256e0cd
2 changed files with 39 additions and 18 deletions

View File

@ -15,6 +15,8 @@ public class Fenster extends PApplet {
FileHandleUtil savefile = FileHandleUtil.getInstance(); FileHandleUtil savefile = FileHandleUtil.getInstance();
Player player; Player player;
Tiles tiles; Tiles tiles;
int translate_x = 0;
int translate_y = 0;
float tilewidth = 40.0f; float tilewidth = 40.0f;
@ -54,7 +56,6 @@ public class Fenster extends PApplet {
size(800, 800); size(800, 800);
setupPlayer(); setupPlayer();
classSetup();
tiles.settings(); tiles.settings();
@ -90,14 +91,18 @@ public class Fenster extends PApplet {
@Override @Override
public void draw() { public void draw() {
// System.out.println(frameRate); // System.out.println(frameRate);
pushMatrix();
translate(translate_x, translate_y);
if(player.pos.get().x > width) { if(player.pos.get().x > width) {
translate(-800, 0); translate_x = -800;
System.out.println("translate: " + translate_x + " : " + translate_y);
} else {
translate_x = 0;
} }
if(player.pos.get().y > height) { if(player.pos.get().y > height) {
translate(0, -800); translate_y = -800;
} System.out.println("translate: " + translate_x + " : " + translate_y);
} else translate_y = 0;
if(!startScreen.draw()) { if(!startScreen.draw()) {
if(!gameScreen.active() && !fightScreen.active()) { if(!gameScreen.active() && !fightScreen.active()) {
@ -110,7 +115,8 @@ public class Fenster extends PApplet {
deathScreen.draw(); deathScreen.draw();
popMatrix();
ui.draw();
if (gametitel) { if (gametitel) {
fill(color(49, 54, 63), gametitel_gamma); fill(color(49, 54, 63), gametitel_gamma);
rect(0, 0, 800, 800); rect(0, 0, 800, 800);
@ -144,10 +150,12 @@ public class Fenster extends PApplet {
gametitel_fade = true; gametitel_fade = true;
} }
} }
if (key == 'w') { switch(key) {
case 'w':
// code block
dead(); dead();
} case 'u':
if (key == 'u') { // code block
try { try {
closeGame(); closeGame();
} catch (IOException e) { } catch (IOException e) {
@ -172,13 +180,16 @@ public class Fenster extends PApplet {
List<Score> allSaves = savefile.readLatestScores(); List<Score> allSaves = savefile.readLatestScores();
if (allSaves.size() == 0) { if (allSaves.size() == 0) {
player = new Player(this); player = new Player(this);
classSetup();
} else { } else {
save = allSaves.getLast(); save = allSaves.getLast();
player = new Player(this, save.getScore(), save.getPosition(), save.getHealth()); player = new Player(this, save.getScore(), save.getPosition(), save.getHealth());
System.out.println(save.getPosition().x + " : " + save.getPosition().y); System.out.println(save.getPosition().x + " : " + save.getPosition().y);
classSetupWithSave();
} }
} catch (IOException e) { } catch (IOException e) {
player = new Player(this); player = new Player(this);
classSetup();
} }
} }
@ -200,6 +211,16 @@ public class Fenster extends PApplet {
deathScreen = new DeathScreen(this); deathScreen = new DeathScreen(this);
} }
void classSetupWithSave() {
tiles = new Tiles(this, 40.0f);
startScreen = new StartScreen(this);
gameScreen = new GameScreen(this);
fightScreen = new FightScreen(this);
deathScreen = new DeathScreen(this);
startScreen.isState = false;
gameScreen.isState = true;
}
public void dead() { public void dead() {
soundTrack.stop(); soundTrack.stop();
deathSound.play(); deathSound.play();

View File

@ -45,7 +45,7 @@ public class GameScreen implements State {
tiles.set(player.pos.grid_x, player.pos.grid_y, player); tiles.set(player.pos.grid_x, player.pos.grid_y, player);
ui.draw();
} }
return isState; return isState;
} }