From 1628c41cd2d28535adc4e219a39bf0b15578aa15 Mon Sep 17 00:00:00 2001 From: GammelJan Date: Sat, 25 Apr 2020 22:24:46 +0200 Subject: [PATCH] COOOOOOL --- core/assets/tileset_floor_1.png | Bin 0 -> 27022 bytes .../dungeoncrawler/control/Controller.java | 4 ++- .../com/dungeoncrawler/view/GameScreen.java | 2 +- .../src/com/dungeoncrawler/view/MainMenu.java | 34 +++++++++++------- 4 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 core/assets/tileset_floor_1.png diff --git a/core/assets/tileset_floor_1.png b/core/assets/tileset_floor_1.png new file mode 100644 index 0000000000000000000000000000000000000000..50a789713173d748962b3c2f7f8a4336b57a864d GIT binary patch literal 27022 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 TDDu(cWB?@vb@?h;vylG*u}BKh literal 0 HcmV?d00001 diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index 946621b..a048b75 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -396,7 +396,9 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ m = new GameScreen(d, volume); return true; case 1: - + v.cleanUp(); + v = null; + m = new GameScreen(d, volume); return true; } diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index a0d76ab..fc351c7 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -81,7 +81,7 @@ public class GameScreen { m = new Map(); camera = new OrthographicCamera(1, h/w); - MapGenerator mg = new MapGenerator(new Texture(Gdx.files.internal("tiles.png"))); + MapGenerator mg = new MapGenerator(new Texture(Gdx.files.internal("tileset_floor_1.png"))); TiledMap[][][] maps = mg.generateMap(d); m.setMaps(maps); diff --git a/core/src/com/dungeoncrawler/view/MainMenu.java b/core/src/com/dungeoncrawler/view/MainMenu.java index 1c133d7..cfb45cd 100644 --- a/core/src/com/dungeoncrawler/view/MainMenu.java +++ b/core/src/com/dungeoncrawler/view/MainMenu.java @@ -8,6 +8,8 @@ import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.Sprite; +import com.badlogic.gdx.math.Intersector; +import com.badlogic.gdx.math.Rectangle; public class MainMenu{ @@ -30,8 +32,8 @@ public class MainMenu{ public MainMenu(float volume) { //MENU-SCREEN - float w = Gdx.graphics.getWidth(); - float h = Gdx.graphics.getHeight(); + w = Gdx.graphics.getWidth(); + h = Gdx.graphics.getHeight(); float wc = w/2; @@ -44,17 +46,19 @@ public class MainMenu{ quitButtonSprite = new Sprite(quitButtonTexture); backgroundSprite = new Sprite(backgroundTexture); - startButtonSprite.setBounds(100f, 350f, startButtonTexture.getWidth(), startButtonTexture.getHeight()); - quitButtonSprite.setBounds(50f, 50f, quitButtonTexture.getWidth(), quitButtonTexture.getHeight()); - backgroundSprite.setX(0f); - backgroundSprite.setY(0f); - + startButtonSprite.setX(100); + startButtonSprite.setY(350); + quitButtonSprite.setX(50); + quitButtonSprite.setY(50); + backgroundSprite.setX(0); + backgroundSprite.setY(0); + /* camera = new OrthographicCamera(1, h/w); - camera.zoom = 1200f; camera.translate(backgroundSprite.getWidth()/2, backgroundSprite.getHeight()/2); + camera.zoom = 1150f; camera.update(); - + */ Pixmap pm = new Pixmap(Gdx.files.internal("cursor.png")); Gdx.graphics.setCursor(Gdx.graphics.newCursor(pm, 0, 0)); pm.dispose(); @@ -67,6 +71,9 @@ public class MainMenu{ music = Gdx.audio.newMusic(Gdx.files.internal("mainmenu.mp3")); music.setVolume(volume); music.play(); + + System.out.println(startButtonSprite.getWidth()); + System.out.println(startButtonSprite.getHeight()); } @@ -75,7 +82,7 @@ public class MainMenu{ Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); batch.begin(); - batch.setProjectionMatrix(camera.combined); + //batch.setProjectionMatrix(camera.combined); backgroundSprite.draw(batch); startButtonSprite.draw(batch); quitButtonSprite.draw(batch); @@ -84,13 +91,14 @@ public class MainMenu{ public int click(int x, int y){ // prueft ob cursor mit button (START) ueberlappt - if(x >= (int) startButtonSprite.getX() && x <= (int) startButtonSprite.getX()+ (int) startButtonSprite.getWidth() && y>= (int) startButtonSprite.getY() && y <= (int) startButtonSprite.getY() + (int) startButtonSprite.getHeight()){ + Rectangle r = new Rectangle(); + r.set(x, h-y, 1, 1); + if(Intersector.overlaps(r, startButtonSprite.getBoundingRectangle())){ return 0; } - if(x >= (int) quitButtonSprite.getX() && x <= (int) quitButtonSprite.getX()+ (int) quitButtonSprite.getWidth() && y>= (int) quitButtonSprite.getY() && y <= (int) quitButtonSprite.getY() + (int) quitButtonSprite.getHeight()){ + if(Intersector.overlaps(r, quitButtonSprite.getBoundingRectangle())){ return 1; } - return -1; }