Made some changes to the project structure and changed the cam movement

src/main/java/engine/Display.java

@@ -2,6 +2,7 @@
 
 import engine.listeners.Keyboard;
 import engine.listeners.Mouse;
+import engine.rendering.Graphics;
 
 import javax.swing.*;
 import java.awt.*;
@@ -105,6 +106,33 @@ public Display setBackgroundColor(Color bgColor) {
         return this;
     }
 
+    /**
+     * makes the window resizable
+     */
+    public Display makeResizable(boolean b){
+        frame.setResizable(b);
+        return this;
+    }
+
+    /**
+     * Sets the width of the window
+     * @param width The value you want the width to be set to
+     */
+    public Display setWidth(int width){
+        this.width = width;
+        frame.setSize(this.width, this.height);
+        return this;
+    }
+    /**
+     * Sets the height of the window
+     * @param height The value you want the height to be set to
+     */
+    public Display setHeight(int height){
+        this.height = height;
+        frame.setSize(this.width, this.height);
+        return this;
+    }
+
     /**
      * set the window's title to a given string
      *
@@ -158,14 +186,14 @@ public BufferStrategy bs() {
      * @return Returns the screen width.
      */
     public int getWidth() {
-        return canvas.getWidth();
+        return width;
     }
 
     /**
      * @return Returns the screen height.
      */
     public int getHeight() {
-        return canvas.getHeight();
+        return height;
     }
 
     /**

src/main/java/engine/Game.java

@@ -3,6 +3,7 @@
 import engine.editor.EditScene;
 import engine.editor.SettingsScene;
 import engine.loops.Loop;
+import engine.rendering.Graphics;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -15,6 +16,7 @@ public class Game {
     private static final Map<String, Display> displays = new HashMap<>();
     private static final Map<String, Scene> scenes = new HashMap<>();
     private static Loop loop;
+    private static int FPS = 60;
 
     private Game() {
         throw new IllegalStateException("Utility class");
@@ -26,6 +28,7 @@ private Game() {
     public static void start() {
         loop = new Loop();
         loop.start();
+        loop.setFrameRate(FPS);
     }
 
     /**
@@ -35,7 +38,9 @@ public static void start() {
      * @param frameRate The frame rate you want.
      */
     public static void setFrameRate(int frameRate) {
-        loop.setFrameRate(frameRate);
+        FPS = frameRate;
+        if (loop != null)
+            loop.setFrameRate(frameRate);
     }
 
     /**

src/main/java/engine/editor/EditScene.java

@@ -2,7 +2,7 @@
 
 import engine.Game;
 import engine.Scene;
-import engine.editor.menu.Button;
+import engine.mechanics.Button;
 import engine.editor.menu.Sprite;
 import engine.listeners.MouseButtons;
 import engine.mechanics.*;
@@ -37,7 +37,7 @@ public void init() {
             g.fillRect(1100, 451, 1280, 720);
         });
         TickBox t = new TickBox(1190, 650, 30, 30, this);
-        Button b = new Button(1130, 500, 100, 40)
+        Button b = new Button(1130, 500, 100, 40, this)
                 .addEvent(MouseButtons.LEFT_DOWN, this::mouseHandler)
                 .addEvent(MouseButtons.RIGHT_DOWN, this::mouseHandler)
                 .addEvent(MouseButtons.MIDDLE_DOWN, this::mouseHandler)
@@ -47,7 +47,7 @@ public void init() {
                 .setTextColor(Color.red)
                 .setFontSize(15)
                 .setFont("JhengHei UI");
-        Button settings = new Button(1130, 600, 100, 40)
+        Button settings = new Button(1130, 600, 100, 40, this)
                 .addEvent(MouseButtons.LEFT_DOWN, e -> display.attachScene("Settings"))
                 .setColor(Color.GREEN)
                 .setText("Settings")

src/main/java/engine/editor/SettingsScene.java

@@ -1,7 +1,7 @@
 package engine.editor;
 
 import engine.Scene;
-import engine.editor.menu.Button;
+import engine.mechanics.Button;
 import engine.listeners.MouseButtons;
 import engine.mechanics.TextBox;
 
@@ -23,7 +23,7 @@ public void init() {
                 .setMatcher("[0-9]*")
                 .setMaxValue(4)
                 .setText(String.valueOf(gridHeight));
-        Button back = new Button(20, 20, 100, 40)
+        Button back = new Button(20, 20, 100, 40, this)
                 .addEvent(MouseButtons.LEFT_DOWN, e -> {
                     gridWidth = Integer.parseInt(gridWidthBox.getText());
                     gridHeight = Integer.parseInt(gridHeightBox.getText());

src/main/java/engine/listeners/Mouse.java

@@ -144,10 +144,10 @@ public Point getMousePos() {
     }
 
     private double scaledX(int x) {
-        return (x / ((double) (display.getWidth()) / 1280));
+        return (x / ((double) (display.getWidth()) / Graphics.stdWidth));
     }
 
     private double scaledY(int y) {
-        return (y / ((double) (display.getHeight()) / 720));
+        return (y / ((double) (display.getHeight()) / Graphics.stdHeight));
     }
 }

src/main/java/engine/editor/menu/Button.java → src/main/java/engine/mechanics/Button.java

@@ -1,10 +1,9 @@
-package engine.editor.menu;
+package engine.mechanics;
 
 import engine.Entity;
-import engine.Game;
+import engine.Scene;
 import engine.listeners.Mouse;
 import engine.listeners.MouseButtons;
-import engine.mechanics.Hitbox;
 
 import java.awt.*;
 import java.awt.event.MouseEvent;
@@ -16,7 +15,7 @@
 import static engine.rendering.Graphics.g;
 
 public class Button implements Entity {
-    private final Mouse mouseListener = Game.getScene("EditScene").mouseListener;
+    private final Mouse mouseListener;
     private final Hitbox h;
     private final Map<MouseButtons, Predicate<MouseEvent>> events = new EnumMap<>(MouseButtons.class);
     private final int x;
@@ -32,7 +31,8 @@ public class Button implements Entity {
     private int fontSize = 13;
     private String fontFace = "Comic Sans MS";
 
-    public Button(int x, int y, int width, int height) {
+    public Button(int x, int y, int width, int height, Scene scene) {
+        this.mouseListener = scene.mouseListener;
         this.x = x;
         this.y = y;
         this.width = width;

src/main/java/engine/rendering/Graphics.java

@@ -19,6 +19,8 @@ public class Graphics {
     public static Graphics2D g;
     private static int xOffset = 0;
     private static int yOffset = 0;
+    public static double stdWidth = 1280d;
+    public static double stdHeight = 720d;
 
     private Graphics() {
         throw new IllegalStateException("Utility class");
@@ -31,9 +33,9 @@ public static void graphicsLoop() {
         Game.getDisplays().values().forEach(e -> {
             BufferStrategy bs = e.bs();
             g = (Graphics2D) bs.getDrawGraphics();
-            g.setColor(Color.white);
+            g.setColor(e.getCanvas().getBackground());
             g.fillRect(0, 0, e.getWidth(), e.getHeight());
-            g.scale(e.getWidth() / 1280d, e.getHeight() / 720d);
+            g.scale(e.getWidth() / stdWidth, e.getHeight() / stdHeight);
             Graphics.g.translate(xOffset, yOffset);
             Scene s = Game.getScene(e.getAttachedScene());
             if (s != null) {
@@ -53,12 +55,12 @@ public static void graphicsLoop() {
      * @param y The y offset
      */
     public static void moveCam(int x, int y) {
-        xOffset = -x + 640;
-        yOffset = -y + 360;
+        xOffset = x;
+        yOffset = y;
     }
 
     /**
-     * @return Returns the current offset
+     * @return Returns the current camera position
      */
     public static Point getCamPos() {
         return new Point(xOffset, yOffset);

src/main/java/engine/rendering/Image.java

@@ -31,7 +31,6 @@ public static BufferedImage load(String path) {
             return image;
         } catch (IOException | IllegalArgumentException e) {
             e.printStackTrace();
-            System.exit(1);
             return null;
         }
     }