(#10, #12) Cleaned up drawable/transform code

fastjengine · Jun 24, 2021 · 41a9f69 · 41a9f69
1 parent fe257b1
commit 41a9f69
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 50 deletions.
diff --git a/src/example/java/tech/fastj/example/bullethell/scripts/PlayerCannon.java b/src/example/java/tech/fastj/example/bullethell/scripts/PlayerCannon.java
@@ -2,10 +2,10 @@
 
 import tech.fastj.engine.FastJEngine;
 import tech.fastj.math.Pointf;
-import tech.fastj.graphics.util.DrawUtil;
 import tech.fastj.graphics.Drawable;
 import tech.fastj.graphics.game.GameObject;
 import tech.fastj.graphics.game.Polygon2D;
+import tech.fastj.graphics.util.DrawUtil;
 
 import tech.fastj.systems.behaviors.Behavior;
 import tech.fastj.systems.input.keyboard.Keyboard;

diff --git a/src/example/java/tech/fastj/example/bullethell/scripts/PlayerHealthBar.java b/src/example/java/tech/fastj/example/bullethell/scripts/PlayerHealthBar.java
@@ -2,10 +2,10 @@
 
 import tech.fastj.engine.FastJEngine;
 import tech.fastj.math.Pointf;
-import tech.fastj.graphics.util.DrawUtil;
 import tech.fastj.graphics.game.GameObject;
 import tech.fastj.graphics.game.Polygon2D;
 import tech.fastj.graphics.game.Text2D;
+import tech.fastj.graphics.util.DrawUtil;
 
 import tech.fastj.systems.behaviors.Behavior;
 import tech.fastj.systems.control.SceneManager;

diff --git a/src/example/java/tech/fastj/example/oldhelloworld/scenes/GameScene.java b/src/example/java/tech/fastj/example/oldhelloworld/scenes/GameScene.java
@@ -3,11 +3,11 @@
 import tech.fastj.engine.FastJEngine;
 import tech.fastj.math.Pointf;
 import tech.fastj.graphics.Display;
-import tech.fastj.graphics.util.DrawUtil;
 import tech.fastj.graphics.game.GameObject;
 import tech.fastj.graphics.game.Polygon2D;
 import tech.fastj.graphics.ui.UIElement;
 import tech.fastj.graphics.ui.elements.Button;
+import tech.fastj.graphics.util.DrawUtil;
 
 import tech.fastj.systems.behaviors.Behavior;
 import tech.fastj.systems.control.Scene;

diff --git a/src/main/java/tech/fastj/graphics/Drawable.java b/src/main/java/tech/fastj/graphics/Drawable.java
@@ -37,7 +37,6 @@ public abstract class Drawable extends TaggableEntity {
     protected Path2D.Float collisionPath;
     protected Path2D.Float transformedCollisionPath;
     private boolean shouldRender;
-    private Pointf[] boundaries;
     protected final Transform2D transform;
     private Pointf initialCenter;
 
@@ -109,23 +108,6 @@ public Pointf[] getBounds() {
         return DrawUtil.createBox((Rectangle2D.Float) transformedCollisionPath.getBounds2D());
     }
 
-    /**
-     * Sets the boundaries of the {@code Drawable} to the specified {@code Pointf} array.
-     * <p>
-     * The specified array must be exactly 4 points. If there is any deviancy from this, the game will crash out with an
-     * error specifying this.
-     *
-     * @param bounds The {@code Pointf} array that the boundaries of the {@code Drawable} will be set to.
-     */
-    protected void setBounds(Pointf[] bounds) {
-        if (bounds.length != 4) {
-            FastJEngine.error(CrashMessages.illegalAction(getClass()),
-                    new IllegalArgumentException("The boundaries for a Drawable must only have 4 points."));
-        }
-
-        boundaries = bounds;
-    }
-
     /**
      * Gets one of the boundaries of the {@code Drawable}, based on the specified {@code Boundary} parameter.
      *
@@ -374,7 +356,6 @@ protected void destroyTheRest(Scene origin) {
         clearTags();
 
         collisionPath = null;
-        boundaries = null;
     }
 
     private void updateTransformedCollisionPath() {

diff --git a/src/main/java/tech/fastj/graphics/game/Model2D.java b/src/main/java/tech/fastj/graphics/game/Model2D.java
@@ -52,7 +52,6 @@ public Model2D(Polygon2D[] polygonArray, boolean show) {
         polyArr = polygonArray;
 
         setCollisionPoints();
-        setBounds(createBounds());
 
 
         setShouldRender(show);
@@ -77,14 +76,10 @@ public Model2D(Polygon2D[] polygonArray, Pointf location, float rotVal, Pointf s
 
         setCollisionPoints();
 
-        setBounds(createBounds());
-
         setTranslation(location);
         setRotation(rotVal);
         setScale(scaleVal);
 
-        setBounds(createBounds());
-
         setShouldRender(shouldBeShown);
     }
 

diff --git a/src/main/java/tech/fastj/graphics/game/Polygon2D.java b/src/main/java/tech/fastj/graphics/game/Polygon2D.java
@@ -10,7 +10,6 @@
 import java.awt.Paint;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Path2D;
-import java.awt.geom.Rectangle2D;
 import java.util.Arrays;
 import java.util.Objects;
 
@@ -61,7 +60,6 @@ public Polygon2D(Pointf[] pts, Paint paint, boolean fill, boolean show) {
         points = pts;
 
         renderPath = DrawUtil.createPath(points);
-        setBoundaries(renderPath);
         setCollisionPath(renderPath);
 
         setPaint(paint);
@@ -74,20 +72,19 @@ public Polygon2D(Pointf[] pts, Paint paint, boolean fill, boolean show) {
      * {@code Polygon2D} constructor that takes in a set of points, a paint variable, fill variable, a show variable,
      * and the translation, rotation, and scale of the polygon.
      *
-     * @param pts         {@code Pointf} array that defines the points for the polygon.
+     * @param pts            {@code Pointf} array that defines the points for the polygon.
      * @param setTranslation {@code Pointf} to set the initial translation of the polygon.
-     * @param setRotation {@code Pointf} to set the initial rotation of the polygon.
-     * @param setScale    {@code Pointf} to set the initial scale of the polygon.
-     * @param paint       {@code Paint} variable that sets the paint of the polygon.
-     * @param fill        Boolean that determines whether the polygon should be filled, or only outlined.
-     * @param show        Boolean that determines whether the polygon should be shown on screen.
+     * @param setRotation    {@code Pointf} to set the initial rotation of the polygon.
+     * @param setScale       {@code Pointf} to set the initial scale of the polygon.
+     * @param paint          {@code Paint} variable that sets the paint of the polygon.
+     * @param fill           Boolean that determines whether the polygon should be filled, or only outlined.
+     * @param show           Boolean that determines whether the polygon should be shown on screen.
      */
     public Polygon2D(Pointf[] pts, Pointf setTranslation, float setRotation, Pointf setScale, Paint paint, boolean fill, boolean show) {
         super();
         points = pts;
 
         renderPath = DrawUtil.createPath(points);
-        setBoundaries(renderPath);
         setCollisionPath(renderPath);
 
         setTranslation(setTranslation);
@@ -199,12 +196,10 @@ public void modifyPoints(Pointf[] pts, boolean resetTranslation, boolean resetRo
                 transform.resetRotation();
             }
             if (resetScale) {
-                System.out.println("reset?");
                 transform.resetScale();
             }
         }
 
-        setBoundaries(renderPath);
         setCollisionPath(renderPath);
     }
 
@@ -242,15 +237,6 @@ public void destroy(Scene originScene) {
 
     }
 
-    /**
-     * Sets the boundaries of the polygon, using the specified {@code Path2D.Float}.
-     *
-     * @param p The {@code Path2D.Float} which the boundaries will be based off of.
-     */
-    private void setBoundaries(Path2D.Float p) {
-        super.setBounds(DrawUtil.createBox((Rectangle2D.Float) p.getBounds2D()));
-    }
-
     /**
      * Checks for equality between the {@code Polygon2D} and the other specified.
      *

diff --git a/src/main/java/tech/fastj/graphics/game/Text2D.java b/src/main/java/tech/fastj/graphics/game/Text2D.java
@@ -2,7 +2,6 @@
 
 import tech.fastj.engine.FastJEngine;
 import tech.fastj.math.Pointf;
-import tech.fastj.graphics.util.DrawUtil;
 
 import tech.fastj.systems.control.Scene;
 
@@ -232,7 +231,6 @@ private void setMetrics(Graphics2D g) {
 
         Pointf translation = getTranslation();
         final Rectangle2D.Float bounds = new Rectangle2D.Float(translation.x, translation.y, textWidth, textHeight);
-        setBounds(DrawUtil.createBox(bounds));
 
         setCollisionPath(createMetricsPath(bounds));
 

diff --git a/src/main/java/tech/fastj/graphics/ui/elements/Button.java b/src/main/java/tech/fastj/graphics/ui/elements/Button.java
@@ -64,7 +64,6 @@ public Button(Scene origin, Pointf location, Pointf initialSize) {
 
         this.location = location;
         Pointf[] buttonCoords = DrawUtil.createBox(this.location, initialSize);
-        super.setBounds(buttonCoords);
 
         renderPath = DrawUtil.createPath(buttonCoords);
         super.setCollisionPath(renderPath);