Fixes issue where components on layers weren't working correctly with…

… the intersects function of the component class.
Valkryst · May 14, 2018 · c681b0a · c681b0a
1 parent 50e4b68
commit c681b0a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 7 deletions.
diff --git a/src/com/valkryst/VTerminal/Screen.java b/src/com/valkryst/VTerminal/Screen.java
@@ -365,6 +365,9 @@ public void draw() {
     /**
      * Adds a component to the screen.
      *
+     * This function should never be called when the parameter is a layer within a layer. It will throw-off
+     * the algorithm that adjusts the bounding box offsets for all of the components.
+     *
      * @param component
      *          The component.
      */
@@ -374,9 +377,7 @@ public void addComponent(final Component component) {
         }
 
         if (component instanceof Layer) {
-            for (final Component layerComponent : ((Layer) component).getComponents()) {
-                addComponent(layerComponent);
-            }
+            addLayerComponent((Layer) component, new Point(0, 0));
         }
 
         // Add the component
@@ -396,6 +397,30 @@ public void addComponent(final Component component) {
         }
     }
 
+    /**
+     * Adds the components of a layer to the screen.
+     *
+     * @param layer
+     *          The layer.
+     *
+     * @param boundingBoxOffset
+     *          The offset to apply to each of the layer's components, so their intersection functions work
+     *          correctly.
+     */
+    private void addLayerComponent(final Layer layer, final Point boundingBoxOffset) {
+        for (final Component component : layer.getComponents()) {
+            if (component instanceof Layer) {
+                final int x = boundingBoxOffset.x + component.getTiles().getXPosition();
+                final int y = boundingBoxOffset.y + component.getTiles().getYPosition();
+
+                addLayerComponent((Layer) component, new Point(x, y));
+            } else {
+                component.setBoundingBoxOffset(boundingBoxOffset);
+                addComponent(component);
+            }
+        }
+    }
+
     /**
      * Removes a component from the screen.
      *

diff --git a/src/com/valkryst/VTerminal/component/Component.java b/src/com/valkryst/VTerminal/component/Component.java
@@ -18,6 +18,9 @@ public class Component {
     /** The tiles. */
     @Getter protected final TileGrid tiles;
 
+    // todo Java Doc
+    @Getter @Setter private Point boundingBoxOffset = new Point(0, 0);
+
     /** The event listeners. */
     protected final List<EventListener> eventListeners = new LinkedList<>();
 
@@ -67,10 +70,10 @@ public boolean intersects(final Point point) {
             return false;
         }
 
-        boolean intersects = point.x >= tiles.getXPosition();
-        intersects &= point.x < (tiles.getWidth() + tiles.getXPosition());
-        intersects &= point.y >= tiles.getYPosition();
-        intersects &= point.y < (tiles.getHeight() + tiles.getYPosition());
+        boolean intersects = point.x >= (tiles.getXPosition() + boundingBoxOffset.x);
+        intersects &= point.x < (tiles.getWidth() + tiles.getXPosition() + boundingBoxOffset.x);
+        intersects &= point.y >= (tiles.getYPosition() + boundingBoxOffset.y);
+        intersects &= point.y < (tiles.getHeight() + tiles.getYPosition() + boundingBoxOffset.y);
         return intersects;
     }