From 51ab79e277178eb18a55659bfeb7b0bb625d28b8 Mon Sep 17 00:00:00 2001
From: filipsasala <filipsasala@outlook.com>
Date: Thu, 12 May 2022 19:06:44 +0200
Subject: [PATCH] Resizable item overlay

---
 .idea/workspace.xml                           |  6 ++--
 .../bludisko/rt/game/entities/Player.java     | 28 +++++++++++++------
 .../bludisko/rt/game/graphics/Texture.java    |  2 +-
 .../rt/game/window/screens/GameScreen.java    | 12 ++++----
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e9e43f1..54d1af7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,13 +12,9 @@
   <component name="ChangeListManager">
     <list default="true" id="b56b9792-09b5-4a62-8384-5317f301f33f" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/bludisko_rt.iml" beforeDir="false" afterPath="$PROJECT_DIR$/bludisko_rt.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/res/textures/items/portalgun.png" beforeDir="false" afterPath="$PROJECT_DIR$/res/textures/items/portalGun.png" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/sk/bytecode/bludisko/rt/game/entities/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/sk/bytecode/bludisko/rt/game/entities/Player.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/sk/bytecode/bludisko/rt/game/graphics/Camera.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/sk/bytecode/bludisko/rt/game/graphics/Camera.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/sk/bytecode/bludisko/rt/game/graphics/Texture.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/sk/bytecode/bludisko/rt/game/graphics/Texture.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/sk/bytecode/bludisko/rt/game/graphics/TextureManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/sk/bytecode/bludisko/rt/game/graphics/TextureManager.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/sk/bytecode/bludisko/rt/game/map/Chamber1.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/sk/bytecode/bludisko/rt/game/map/Chamber1.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/sk/bytecode/bludisko/rt/game/window/screens/GameScreen.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/sk/bytecode/bludisko/rt/game/window/screens/GameScreen.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -240,6 +236,7 @@
       <workItem from="1641463671402" duration="47309000" />
       <workItem from="1641844474103" duration="2789000" />
       <workItem from="1650711453218" duration="2228000" />
+      <workItem from="1652372506759" duration="2568000" />
     </task>
     <servers />
   </component>
@@ -267,6 +264,7 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/src/sk/bytecode/bludisko/rt/game/entities/Player.java b/src/sk/bytecode/bludisko/rt/game/entities/Player.java
index e2cb0d2..f630566 100644
--- a/src/sk/bytecode/bludisko/rt/game/entities/Player.java
+++ b/src/sk/bytecode/bludisko/rt/game/entities/Player.java
@@ -10,8 +10,10 @@
 import sk.bytecode.bludisko.rt.game.map.World;
 import sk.bytecode.bludisko.rt.game.math.MathUtils;
 import sk.bytecode.bludisko.rt.game.math.Vector2;
+import sk.bytecode.bludisko.rt.game.util.NullSafe;
 
 import java.awt.*;
+import java.lang.ref.WeakReference;
 
 /**
  * A Player object representing the real player. Handles input and moves the camera accordingly.
@@ -19,10 +21,10 @@
 public class Player extends Entity implements GameInputManagerDelegate {
 
     private Map worldWallMap;
+    private WeakReference<Camera> camera;
+    private Rectangle screenSize;
 
-    private Camera camera;
     private Vector2 movementVector;
-
     private Item heldItem;
 
     private float walkingSpeed = 1.75f;
@@ -63,7 +65,7 @@ public void setWorld(World world) {
      * @param camera Camera to control
      */
     public void setCamera(Camera camera) {
-        this.camera = camera;
+        this.camera = new WeakReference<>(camera);
     }
 
     /**
@@ -86,7 +88,7 @@ public Item getHeldItem() {
     @Override
     public void tick(float dt) {
         move(dt);
-        camera.bind(this);
+        NullSafe.acceptWeak(camera, camera -> camera.bind(this));
     }
 
     /**
@@ -94,10 +96,20 @@ public void tick(float dt) {
      * @param graphics Graphics content to draw on
      */
     public void drawItemOverlay(@NotNull Graphics graphics) {
-        if(heldItem != null) {
-            var overlay = heldItem.getOverlay().toImage();
-            graphics.drawImage(overlay, 0, 0, 320, 240, null);
-        }
+        NullSafe.accept(heldItem, heldItem -> {
+            var texture = heldItem.getOverlay();
+            var image = texture.asImage();
+
+            float resizingRatio = screenSize.height / (float)texture.getHeight();
+            int scaledWidth = (int) (texture.getWidth() * resizingRatio);
+            int offset = (screenSize.width - scaledWidth) / 2;
+
+            graphics.drawImage(image, offset, 0, scaledWidth, screenSize.height, null);
+        });
+    }
+
+    public void setItemOverlayScreenSizeInformation(@NotNull Rectangle bounds) {
+        screenSize = bounds;
     }
 
     // MARK: - Input
diff --git a/src/sk/bytecode/bludisko/rt/game/graphics/Texture.java b/src/sk/bytecode/bludisko/rt/game/graphics/Texture.java
index 7c8d423..b6e62d7 100644
--- a/src/sk/bytecode/bludisko/rt/game/graphics/Texture.java
+++ b/src/sk/bytecode/bludisko/rt/game/graphics/Texture.java
@@ -105,7 +105,7 @@ public int getHeight() {
      * overhead.
      * @return BufferedImage from this texture.
      */
-    public BufferedImage toImage() {
+    public BufferedImage asImage() {
         return image;
     }
 
diff --git a/src/sk/bytecode/bludisko/rt/game/window/screens/GameScreen.java b/src/sk/bytecode/bludisko/rt/game/window/screens/GameScreen.java
index 49a7bd8..a9b5a08 100644
--- a/src/sk/bytecode/bludisko/rt/game/window/screens/GameScreen.java
+++ b/src/sk/bytecode/bludisko/rt/game/window/screens/GameScreen.java
@@ -7,6 +7,7 @@
 import sk.bytecode.bludisko.rt.game.items.PortalGun;
 import sk.bytecode.bludisko.rt.game.map.Chamber1;
 import sk.bytecode.bludisko.rt.game.map.World;
+import sk.bytecode.bludisko.rt.game.util.NullSafe;
 import sk.bytecode.bludisko.rt.game.window.Window;
 
 import java.awt.Graphics;
@@ -68,20 +69,17 @@ public InputManager getInputManager() {
     public void screenDidAppear() {
         super.screenDidAppear();
 
-        Window window = this.window.get();
-        if(window != null) {
-            window.setCursorVisible(false);
-        }
+        NullSafe.acceptWeak(window, window -> window.setCursorVisible(false));
     }
 
     @Override
     public void screenDidChangeBounds(Rectangle bounds) {
         super.screenDidChangeBounds(bounds);
 
-        var window = this.window.get();
-        if(window != null) {
+        NullSafe.acceptWeak(window, window -> {
             camera.setScreenSize(window.canvasBounds());
-        }
+            player.setItemOverlayScreenSizeInformation(window.canvasBounds());
+        });
     }
 
     // MARK: - Game loop