From 3943a9a49033629aec9d1d75834fcb99a3909596 Mon Sep 17 00:00:00 2001
From: OldTeaOwl <oldteaowl2@gmail.com>
Date: Tue, 12 Nov 2024 17:08:51 +0700
Subject: [PATCH] fix errors after code review, added entity height and width
 properties for inner editor use

---
 src/model/Entity.java       | 26 +++++++++++++++++++++++++-
 src/repository/Project.java |  3 +--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/model/Entity.java b/src/model/Entity.java
index b2dd800..2ec8ce9 100644
--- a/src/model/Entity.java
+++ b/src/model/Entity.java
@@ -8,10 +8,13 @@ public class Entity {
 	private Hitbox thisHitbox;
 	private String type;
 	private BufferedImage sprite;
+	private int width = 0;
+	private int height = 0;
 	
-	public Entity(String name,String drawbox,String hitbox) {
+	public Entity(String name, String drawbox, String hitbox, BufferedImage sprite) {
 		thisName = new String(name);
 		thisDrawbox = new Drawbox(drawbox);
+		setImage(sprite); // updates entity width and height, should be called before creating hitbox
 		thisHitbox = new Hitbox(hitbox);
 	}
 	
@@ -58,8 +61,13 @@ public class Entity {
 		return sprite;
 	}
 	
+	/** NOTE: Image setter updates entity width and height */
 	public void setImage(BufferedImage sprite) {
 		this.sprite = sprite;
+		if(sprite != null) {
+			width = sprite.getHeight();
+			height = sprite.getHeight();
+		}
 	}
 	
 	public void PrintEntity() {
@@ -69,4 +77,20 @@ public class Entity {
 		this.thisHitbox.printToConsole();
 		System.out.println("---------------------");
 	}
+
+	public int getWidth() {
+		return width;
+	}
+
+	public void setWidth(int width) {
+		this.width = width;
+	}
+
+	public int getHeight() {
+		return height;
+	}
+
+	public void setHeight(int height) {
+		this.height = height;
+	}
 }
diff --git a/src/repository/Project.java b/src/repository/Project.java
index 11087e0..48667f1 100644
--- a/src/repository/Project.java
+++ b/src/repository/Project.java
@@ -174,9 +174,8 @@ public class Project implements Iterable<Entity>, EntityDrawboxChangedListener {
 				}
 			}
 			
-			Entity e = new Entity(entityName, newDrawbox, newHitbox);
+			Entity e = new Entity(entityName, newDrawbox, newHitbox, sprite);
 			e.setType(type);
-			e.setImage(sprite);
 			listEntity.add(e);
 		}
 	}