From 20eea068eb52e7a89bd8486c1b1b5b8d562e9f46 Mon Sep 17 00:00:00 2001
From: Nico Nico Nii <niconiconii@pop-os.localdomain>
Date: Sun, 22 May 2022 22:24:05 -0500
Subject: [PATCH] Sprite enum system implemented

Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com>
---
 src/sig/RabiClone.java          |  8 +++-----
 src/sig/engine/Panel.java       | 29 ++---------------------------
 src/sig/engine/Sprite.java      | 29 +++++++++++++++++++++++++----
 src/sig/engine/SpriteImage.java |  0
 4 files changed, 30 insertions(+), 36 deletions(-)
 create mode 100644 src/sig/engine/SpriteImage.java

diff --git a/src/sig/RabiClone.java b/src/sig/RabiClone.java
index 56d5718..ab83445 100644
--- a/src/sig/RabiClone.java
+++ b/src/sig/RabiClone.java
@@ -1,11 +1,9 @@
 package sig;
 
-import javax.imageio.ImageIO;
 import javax.swing.JFrame;
+
 import sig.engine.Panel;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
+import sig.engine.Sprite;
 
 public class RabiClone {
 	public static final String PROGRAM_NAME="Sig's Java Project Template";
@@ -20,7 +18,7 @@ public class RabiClone {
 		f.setSize(1280,720);
 		f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		f.setVisible(true);
-		
+
 		p.render();
 	}
 }
diff --git a/src/sig/engine/Panel.java b/src/sig/engine/Panel.java
index fcef71d..b276f93 100644
--- a/src/sig/engine/Panel.java
+++ b/src/sig/engine/Panel.java
@@ -6,15 +6,11 @@ import java.awt.Image;
 import java.awt.Toolkit;
 import java.awt.image.ColorModel;
 import java.awt.image.MemoryImageSource;
-import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.awt.image.BufferedImage;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
 
-import javax.imageio.ImageIO;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
@@ -36,21 +32,12 @@ public class Panel extends JPanel implements Runnable,ComponentListener {
     int frameCount=0;
 	long lastSecond=0;
 	int lastFrameCount=0;
-	Sprite nana_sprite;
 	boolean resizing=false;
 
     public Panel(JFrame f) {
         super(true);
 		this.window=f;
         thread = new Thread(this, "MyPanel Thread");
-
-		BufferedImage nana;
-		try {
-			nana = ImageIO.read(new File("..","3x.png"));
-			nana_sprite = Get_Nana(nana);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
     }
 
     /**
@@ -125,7 +112,7 @@ public class Panel extends JPanel implements Runnable,ComponentListener {
         		p[y*getWidth()+x]=(0<<16)+(0<<8)+0;//RGB
         	}
         }
-		Draw_Nana(nana_sprite);
+		Draw_Sprite(Sprite.NANA);
     }
 
 	private void resizeUpdate() {
@@ -303,19 +290,7 @@ public class Panel extends JPanel implements Runnable,ComponentListener {
 		}
 	}
 
-	public Sprite Get_Nana(BufferedImage b_image){
-		Sprite sprite_input = new Sprite();
-		sprite_input.height = b_image.getHeight();
-		sprite_input.width = b_image.getWidth();
-		sprite_input.bi_array = new int [b_image.getWidth()*b_image.getHeight()];
-		for(int x=0;x<b_image.getHeight();x++){
-			for(int y=0;y<b_image.getWidth();y++){
-				sprite_input.bi_array[y*b_image.getWidth()+x] = b_image.getRGB(x,y);
-			}	
-		}
-		return sprite_input;
-	}
-	public void Draw_Nana(Sprite sprite){
+	public void Draw_Sprite(Sprite sprite){
 		int[] p = pixel;
 		for(int x=0;x<sprite.height;x++){
 			for(int y=0;y<sprite.width;y++){
diff --git a/src/sig/engine/Sprite.java b/src/sig/engine/Sprite.java
index 1e6b832..5891864 100644
--- a/src/sig/engine/Sprite.java
+++ b/src/sig/engine/Sprite.java
@@ -1,8 +1,29 @@
 package sig.engine;
 
-public class Sprite{
-int height;
-int width;
-int[] bi_array;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.nio.file.Path;
+
+import javax.imageio.ImageIO;
+
+public enum Sprite{
+    NANA(Path.of("..","3x.png"));
+    BufferedImage img;
+    int height;
+    int width;
+    int[] bi_array;
+    
+    Sprite(Path filename){
+        try {
+            BufferedImage img = ImageIO.read(filename.toFile());
+            this.width=img.getWidth();
+            this.height=img.getHeight();
+            this.bi_array = new int[width*height];
+            img.getRGB(0,0,width,height,this.bi_array,0,width);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.println("Loaded sprite for "+this+".");
+    };
 
 }
\ No newline at end of file
diff --git a/src/sig/engine/SpriteImage.java b/src/sig/engine/SpriteImage.java
new file mode 100644
index 0000000..e69de29