diff --git a/src/de/miaurizius/jgame2d/core/AssetSetter.java b/src/de/miaurizius/jgame2d/core/AssetSetter.java index 9654cdb..09978d2 100644 --- a/src/de/miaurizius/jgame2d/core/AssetSetter.java +++ b/src/de/miaurizius/jgame2d/core/AssetSetter.java @@ -14,35 +14,35 @@ public class AssetSetter { } public void setObject() { - panel.obj[0] = new KeyObj(); + panel.obj[0] = new KeyObj(panel); panel.obj[0].worldX = 23 * panel.tileSize; panel.obj[0].worldY = 7 * panel.tileSize; - panel.obj[1] = new KeyObj(); + panel.obj[1] = new KeyObj(panel); panel.obj[1].worldX = 23 * panel.tileSize; panel.obj[1].worldY = 40 * panel.tileSize; - panel.obj[2] = new KeyObj(); + panel.obj[2] = new KeyObj(panel); panel.obj[2].worldX = 37 * panel.tileSize; panel.obj[2].worldY = 7 * panel.tileSize; - panel.obj[3] = new DoorObj(); + panel.obj[3] = new DoorObj(panel); panel.obj[3].worldX = 10 * panel.tileSize; panel.obj[3].worldY = 11 * panel.tileSize; - panel.obj[4] = new DoorObj(); + panel.obj[4] = new DoorObj(panel); panel.obj[4].worldX = 8 * panel.tileSize; panel.obj[4].worldY = 28 * panel.tileSize; - panel.obj[5] = new DoorObj(); + panel.obj[5] = new DoorObj(panel); panel.obj[5].worldX = 12 * panel.tileSize; panel.obj[5].worldY = 22 * panel.tileSize; - panel.obj[6] = new ChestObj(); + panel.obj[6] = new ChestObj(panel); panel.obj[6].worldX = 10 * panel.tileSize; panel.obj[6].worldY = 7 * panel.tileSize; - panel.obj[7] = new BootsObj(); + panel.obj[7] = new BootsObj(panel); panel.obj[7].worldX = 37 * panel.tileSize; panel.obj[7].worldY = 42 * panel.tileSize; } diff --git a/src/de/miaurizius/jgame2d/core/UI.java b/src/de/miaurizius/jgame2d/core/UI.java index 9b5313e..d4309d0 100644 --- a/src/de/miaurizius/jgame2d/core/UI.java +++ b/src/de/miaurizius/jgame2d/core/UI.java @@ -23,7 +23,7 @@ public class UI { this.panel = panel; arial_40 = new Font("Arial", Font.PLAIN, 40); arial_80B = new Font("Arial", Font.BOLD, 80); - keyImage = new KeyObj().image; + keyImage = new KeyObj(panel).image; } public void showMessage(String text) { diff --git a/src/de/miaurizius/jgame2d/object/BootsObj.java b/src/de/miaurizius/jgame2d/object/BootsObj.java index afc7ffe..301822a 100644 --- a/src/de/miaurizius/jgame2d/object/BootsObj.java +++ b/src/de/miaurizius/jgame2d/object/BootsObj.java @@ -1,6 +1,8 @@ package de.miaurizius.jgame2d.object; import de.miaurizius.jgame2d.core.Boot; +import de.miaurizius.jgame2d.core.GamePanel; +import de.miaurizius.jgame2d.core.Utility; import javax.imageio.ImageIO; import java.io.FileInputStream; @@ -9,10 +11,13 @@ import java.util.logging.Level; public class BootsObj extends SuperObject { - public BootsObj() { + GamePanel panel; + + public BootsObj(GamePanel panel) { + this.panel = panel; name = "boots"; try { - image = ImageIO.read(new FileInputStream("assets/objects/boots.png")); + image = Utility.scaleImage(ImageIO.read(new FileInputStream("assets/objects/boots.png")), panel.tileSize, panel.tileSize); } catch(IOException e) { Boot.logger.log(Level.SEVERE, "Could not load image", e); } diff --git a/src/de/miaurizius/jgame2d/object/ChestObj.java b/src/de/miaurizius/jgame2d/object/ChestObj.java index ca03197..8c37e46 100644 --- a/src/de/miaurizius/jgame2d/object/ChestObj.java +++ b/src/de/miaurizius/jgame2d/object/ChestObj.java @@ -1,6 +1,8 @@ package de.miaurizius.jgame2d.object; import de.miaurizius.jgame2d.core.Boot; +import de.miaurizius.jgame2d.core.GamePanel; +import de.miaurizius.jgame2d.core.Utility; import javax.imageio.ImageIO; import java.io.FileInputStream; @@ -9,10 +11,13 @@ import java.util.logging.Level; public class ChestObj extends SuperObject { - public ChestObj() { + GamePanel panel; + + public ChestObj(GamePanel panel) { + this.panel = panel; name = "chest"; try { - image = ImageIO.read(new FileInputStream("assets/objects/chest.png")); + image = Utility.scaleImage(ImageIO.read(new FileInputStream("assets/objects/chest.png")), panel.tileSize, panel.tileSize); } catch(IOException e) { Boot.logger.log(Level.SEVERE, "Could not load image", e); } diff --git a/src/de/miaurizius/jgame2d/object/DoorObj.java b/src/de/miaurizius/jgame2d/object/DoorObj.java index ee8cbb7..9de76fd 100644 --- a/src/de/miaurizius/jgame2d/object/DoorObj.java +++ b/src/de/miaurizius/jgame2d/object/DoorObj.java @@ -1,6 +1,8 @@ package de.miaurizius.jgame2d.object; import de.miaurizius.jgame2d.core.Boot; +import de.miaurizius.jgame2d.core.GamePanel; +import de.miaurizius.jgame2d.core.Utility; import javax.imageio.ImageIO; import java.io.FileInputStream; @@ -9,10 +11,13 @@ import java.util.logging.Level; public class DoorObj extends SuperObject { - public DoorObj() { + GamePanel panel; + + public DoorObj(GamePanel panel) { + this.panel = panel; name = "door"; try { - image = ImageIO.read(new FileInputStream("assets/objects/door.png")); + image = Utility.scaleImage(ImageIO.read(new FileInputStream("assets/objects/door.png")), panel.tileSize, panel.tileSize); } catch(IOException e) { Boot.logger.log(Level.SEVERE, "Could not load image", e); } diff --git a/src/de/miaurizius/jgame2d/object/KeyObj.java b/src/de/miaurizius/jgame2d/object/KeyObj.java index e95cfc3..1fed856 100644 --- a/src/de/miaurizius/jgame2d/object/KeyObj.java +++ b/src/de/miaurizius/jgame2d/object/KeyObj.java @@ -1,6 +1,8 @@ package de.miaurizius.jgame2d.object; import de.miaurizius.jgame2d.core.Boot; +import de.miaurizius.jgame2d.core.GamePanel; +import de.miaurizius.jgame2d.core.Utility; import javax.imageio.ImageIO; import java.io.FileInputStream; @@ -9,10 +11,13 @@ import java.util.logging.Level; public class KeyObj extends SuperObject { - public KeyObj() { + GamePanel panel; + + public KeyObj(GamePanel panel) { + this.panel = panel; name = "key"; try { - image = ImageIO.read(new FileInputStream("assets/objects/key.png")); + image = Utility.scaleImage(ImageIO.read(new FileInputStream("assets/objects/key.png")), panel.tileSize, panel.tileSize); } catch(IOException e) { Boot.logger.log(Level.SEVERE, "Could not load image", e); }