diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/MainMenu.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/MainMenu.java index 79c531e0047c12b9a101984bfc1c889a25315c3f..119360f0a2439369382245467c6c6ff3911f7a33 100644 --- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/MainMenu.java +++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/Screen/MainMenu.java @@ -27,8 +27,8 @@ public class MainMenu implements Screen { public MainMenu(Main main){ this.main = main; background = new Texture("1080p.png"); - newGame = new NewGameButton(main.WIDTH/2, main.HEIGHT/2, 248, 50, this); - quit = new QuitButton(main.WIDTH/2, main.HEIGHT/2 - 100, 248, 50, this); + newGame = new NewGameButton(main.WIDTH/2 - 124, main.HEIGHT/2 - 25, 248, 50, this); + quit = new QuitButton(main.WIDTH/2 - 75 , main.HEIGHT/2 - 100 - 25, 248, 50, this); stage = new Stage(); stage.addActor(quit); diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Ship/ShipView.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Ship/ShipView.java index 6e4871a408ea5382917371fbed232ab6b02a74e9..c4b2a3e08e779514181be09c864cfffe2f5c5422 100644 --- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Ship/ShipView.java +++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/Ship/ShipView.java @@ -101,16 +101,17 @@ public class ShipView extends AbstractShip { super(main, ship, stage, game); //java.util.List crew = ship.get ?? + this.map = map; + rooms = new HashMap<>(); List<Room> existingRooms = ship.getSystems(); for(Room r : existingRooms) { //TODO wie system das zu raum gehört? dann sys id als key, roomui als value } - - weaponAutofire = new AutofireButton(main.WIDTH/2, main.HEIGHT - 200, 248, 50, this); //TODO xywh - moveButton = new MoveButton(main.WIDTH/2, main.HEIGHT - 100, 248, 50, this); - inventory = new ShipButton(main.WIDTH/2 + 250,main.HEIGHT - 100, 248, 50, this); + weaponAutofire = new AutofireButton(1020, 130, 248, 50, this); + moveButton = new MoveButton(850, main.HEIGHT - 90, 300, 500, this); //TODO same here + inventory = new ShipButton(750,main.HEIGHT - 80, 450, 500, this); //TODO warum ändert sich die größe nicht money = new ScrapUI(main, ship.getCoins()); hull = new HullUI(main, ship.getHp()); @@ -132,16 +133,15 @@ public class ShipView extends AbstractShip { @Override public void render() { - stage.draw(); - main.batch.begin(); - main.batch.draw(shipBackground, 0, 0, 0, 0); //TODO xywh - main.batch.draw(shipRoomBackground, 0, 0, 10, 10); - main.batch.draw(weaponGeneralBackground, 0, 0, 0, 0); + main.batch.draw(shipBackground, main.WIDTH -1730, main.HEIGHT/2 - shipBackground.getHeight()/2 - 200, 1000, 1000); //TODO xywh + main.batch.draw(shipRoomBackground, main.WIDTH -1500, main.HEIGHT/2 - shipRoomBackground.getHeight()/2 - 100, 550, 550); + main.batch.draw(weaponGeneralBackground, 700, 100, 328, 90); main.batch.end(); money.render(); hull.render(); + energy.render(); if(inventoryUI != null) { inventoryUI.render(); diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/EnergyUI.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/EnergyUI.java index 86a1ace4291c21b736ef35c681599867ba9c832d..f12904ebd3b82b119f7c0e8a78f8289a15807db4 100644 --- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/EnergyUI.java +++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/EnergyUI.java @@ -53,10 +53,10 @@ public class EnergyUI { public void render() { main.batch.begin(); - float x = 0; //TODO + float y = 100; for(int i =0; i<=currentTexture; i++) { - main.batch.draw(energyTexture, x, 0, 0, 0); //TODO xywh - x+=10; + main.batch.draw(energyTexture, 25, y, 44, 13); + y+=20; } main.batch.end(); } diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/HullUI.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/HullUI.java index a63917a42f5a797a8a995f3df19217e5f62697ba..400e101ba049987453cbe55213cc8679d98e9a25 100644 --- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/HullUI.java +++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/HullUI.java @@ -63,12 +63,12 @@ public class HullUI { */ public void render() { main.batch.begin(); - main.batch.draw(hullBackgroundTexture, 0, 0, 0, 0); //TODO xywh - float x = 0; + float x = 25; for(int i=0; i<=currentTexture; i++) { - main.batch.draw(hullTexture, x, 0, 10, 10); - x+=5; + main.batch.draw(hullTexture, x, main.HEIGHT - 83, 25, 25); + x+=12; } + main.batch.draw(hullBackgroundTexture, 25, main.HEIGHT - 112, 577, 97); main.batch.end(); } diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/ScrapUI.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/ScrapUI.java index 05d54a709c4aba38e6a60936913aae2cd6e8af0f..ae60a80c119f8572cb25da7f3b2683b5e3b72079 100644 --- a/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/ScrapUI.java +++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/View/UI/ShipInformation/ScrapUI.java @@ -40,7 +40,7 @@ public class ScrapUI { */ public void render() { main.batch.begin(); - main.batch.draw(scrapBackground, 0, 0, 0, 0); //TODO xy, w, h + main.batch.draw(scrapBackground, 600, main.HEIGHT - 90, 147, 60); main.batch.end(); }