Changed hit.

Author: payne911

CHANGES

@@ -5,12 +5,15 @@
 - `getMaxRadius` has been renamed to `getCurrentRadius`.
 - `minRadius` has been renamed to `preferredRadius`.
 - Introduced a new `individuals` demo (named "RadialButtons") to showcase the new `RadialGroup` class.
-- Hotfix for a `RadialGroup` containing other `PieMenu`.
-- Hotfix on `hit` for when a contained Actor extends beyond the limits of the widget itself.
-- Hotfix on `hit` for the `middleCancel` flag of `PieMenu`.
+- Changed the way the scene2d `hit` method works with the widget.
+- Fixed the `hit` for when a contained Actor extends beyond the limits of the widget itself.
+- Fixed `RadialGroup` containing other `PieMenu`.
+- Fixed non-regular width and height values on Animated widgets.
+- Fixed `centerOnActor` method used on an Actor that was contained within a `Group`.
+todo: should PieWidget `hit` return `this` when hitting a background ? (define "isBackgroundHit()" method for custom approach without duplicating `hit`)
 
 [3.1.0]
-- Hotfix for "floating" `Group` that contained `RadialGroup`.
+- Fixed the "floating" `Group` that contained `RadialGroup`.
 - More efficient evaluation for the reset of the hover on mouse-exit.
 - The `background` image can now be a `Drawable` as well (but keep in mind that `Drawable` cannot be rotated).
 

src/main/java/com/payne/games/piemenu/AnimatedPieMenu.java

@@ -7,6 +7,7 @@
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.utils.Align;
+
 import java.util.HashMap;
 
 
@@ -286,7 +287,7 @@ public void layout() {
             vector2.set(dist, 0);
             vector2.rotate(degreesPerChild*(i + half) + startDegreesOffset);
             modifyActor(actor, degreesPerChild, dist); // overridden by user
-            actor.setPosition(vector2.x+ getCurrentRadius(), vector2.y+ getCurrentRadius(), Align.center);
+            actor.setPosition(vector2.x + getWidth()/2, vector2.y + getHeight()/2, Align.center);
 
             /* Updating alpha (fade-in animation). */
             if(isCurrentlyAnimated()) {

src/main/java/com/payne/games/piemenu/AnimatedPieWidget.java

@@ -7,6 +7,7 @@
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.utils.Align;
+
 import java.util.HashMap;
 
 
@@ -286,7 +287,7 @@ public void layout() {
             vector2.set(dist, 0);
             vector2.rotate(degreesPerChild*(i + half) + startDegreesOffset);
             modifyActor(actor, degreesPerChild, dist); // overridden by user
-            actor.setPosition(vector2.x+ getCurrentRadius(), vector2.y+ getCurrentRadius(), Align.center);
+            actor.setPosition(vector2.x + getWidth()/2, vector2.y + getHeight()/2, Align.center);
 
             /* Updating alpha (fade-in animation). */
             if(isCurrentlyAnimated()) {

src/main/java/com/payne/games/piemenu/PieMenu.java

@@ -4,12 +4,7 @@
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.math.Vector2;
-import com.badlogic.gdx.scenes.scene2d.Actor;
-import com.badlogic.gdx.scenes.scene2d.Event;
-import com.badlogic.gdx.scenes.scene2d.EventListener;
-import com.badlogic.gdx.scenes.scene2d.InputEvent;
-import com.badlogic.gdx.scenes.scene2d.InputListener;
-import com.badlogic.gdx.scenes.scene2d.Touchable;
+import com.badlogic.gdx.scenes.scene2d.*;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
@@ -18,7 +13,8 @@
 
 /**
  * A PieMenu reuses the {@link PieWidget}'s functionalities to provide a way
- * to interact with the contained Actors through the "hit-box" of the slices.
+ * to interact with the contained Actors through the "hit-box" of the slices.<br/>
+ * Basically, each slice ends up acting like a button.
  *
  * @author Jérémi Grenier-Berthiaume (aka "payne")
  */
@@ -388,21 +384,6 @@ public int findChildIndexAtStage(float x, float y) {
                 : getAmountOfChildren(); // "getAmountOfChildren" is equivalent to "invalid"
     }
 
-    /**
-     * Checks whether or not the input coordinate is within (exclusively)
-     * the inner-radius.
-     *
-     * @param x x-coordinate relative to the center of the widget's
-     * @param y y-coordinate relative to the center of the widget's
-     * @return 'true' only if the coordinates fall within the widget's
-     *         inner radius.
-     */
-    public boolean isWithinInnerRadius(float x, float y) {
-        float distance = pow2(x) + pow2(y);
-        float innerRadSquared = pow2(getInnerRadiusLength());
-        return distance < innerRadSquared;
-    }
-
     /**
      * Used to transform an index into a known range: it'll either remain itself
      * if it was designating a valid child index, else it becomes the
@@ -415,43 +396,6 @@ public int mapIndex(int index) {
         return isValidIndex(index) ? index : defaultIndex;
     }
 
-    /**
-     * @param x x-coordinate relative to the origin (bottom left) of the widget
-     * @param y y-coordinate relative to the origin (bottom left) of the widget
-     * @param touchable if {@code true}, hit detection will respect the
-     *                  {@link #setTouchable(Touchable) touchability}.
-     * @return deepest child's hit at (x,y). Else, the widget itself if it's
-     *         the background. Else {@code null} if {@link #middleCancel} is
-     *         {@code true} and within the {@link #getInnerRadiusLength()}.
-     *         Else the widget itself if with infinite range. Else {@code null}.
-     */
-    @Override
-    public Actor hit(float x, float y, boolean touchable) {
-        if (touchable && getTouchable() == Touchable.disabled) return null;
-        if (!isVisible()) return null;
-
-        localToStageCoordinates(vector2.set(x,y));
-        int childIndex = findChildIndexAtStage(vector2.x,vector2.y);
-        if (isValidIndex(childIndex)) {
-            if(middleCancel && isWithinInnerRadius(x + getWidth()/2, y + getHeight()/2))
-                return null;
-            Actor child = getChildren().get(childIndex);
-            if(child.getTouchable() == Touchable.disabled)
-                return this;
-            child.parentToLocalCoordinates(vector2.set(x,y));
-            Actor hit = child.hit(vector2.x, vector2.y, touchable);
-            if(hit != null)
-                return hit;
-            else
-                return this;
-        }
-
-        if(infiniteSelectionRange)
-            return this;
-
-        return null;
-    }
-
     @Override
     public Color getColor(int index) {
         if(style.hoverSelectedColor != null

src/main/java/com/payne/games/piemenu/PieWidget.java

@@ -12,11 +12,14 @@
 import com.badlogic.gdx.utils.Align;
 import space.earlygrey.shapedrawer.ShapeDrawer;
 
+
 /**
  * A PieWidget aims at providing the user with a simple way to lay out
  * the contained Actors in a circular fashion. It uses a
- * {@link ShapeDrawer} to draw certain elements, when necessary.
- * Basically, it uses a Style (compared to the {@link RadialGroup}).
+ * {@link ShapeDrawer} to draw certain elements, when necessary.<br/>
+ * Basically, if you are not finding yourself happy with the results
+ * coming from using a {@link PieWidgetStyle}, then you might want to
+ * consider using a simple {@link RadialGroup}.
  *
  * @author Jérémi Grenier-Berthiaume (aka "payne")
  */
@@ -404,13 +407,16 @@ protected void drawWithShapeDrawer(Batch batch, float parentAlpha, float degrees
             float restoreAlpha = bc.a;
             batch.setColor(bc.r, bc.g, bc.b, bc.a * globalAlphaMultiplier);
             if(style.background instanceof TransformDrawable) {
+                // todo: can "getX()" screw up because relative to parent? (TO TEST)
                 ((TransformDrawable)(style.background)).draw(batch,
-                        getX(Align.center) - getCurrentRadius(), getY(Align.center) - getCurrentRadius(),
+                        getX(Align.center) - getCurrentRadius(),
+                        getY(Align.center) - getCurrentRadius(),
                         getCurrentRadius(), getCurrentRadius(),
                         getCurrentDiameter(), getCurrentDiameter(),
                         getScaleX(), getScaleY(),
                         getRotation());
             } else {
+                // todo: can "getX()" screw up because relative to parent? (TO TEST)
                 style.background.draw(batch,
                         getX(Align.center) - getCurrentRadius(),
                         getY(Align.center) - getCurrentRadius(),
@@ -449,6 +455,20 @@ protected void drawChildSeparator(Vector2 vector2, float drawnRadianAngle) {
         }
     }
 
+    /**
+     * To get the coordinates of a point along a line traced from the center,
+     * along the designated angle, at the designated distance from the center.
+     *
+     * @param center center point of the Circle
+     * @param radius how far from the center the desired point is
+     * @param radian the angle along which the line is calculated
+     * @return the point associated with those parameters
+     */
+    public Vector2 pointAtAngle(Vector2 output, Vector2 center, float radius, float radian) {
+        output.set(center.x + radius * MathUtils.cos(radian), center.y + radius * MathUtils.sin(radian));
+        return output;
+    }
+
     /**
      * Determines the color of the slice in which resides the Actor designated
      * by the {@code index} parameter. By default, the colors come from the way
@@ -501,7 +521,19 @@ protected void drawChildCircumference(Vector2 vector2, float startAngle, float r
             sd.arc(vector2.x, vector2.y, radius, startAngle, radian, style.circumferenceWidth);
         }
     }
-        /*
+
+
+
+
+
+
+
+
+
+
+
+
+    /*
     =================================== STYLE ==================================
      */
 

src/main/java/com/payne/games/piemenu/RadialGroup.java

@@ -340,21 +340,6 @@ protected void updateOrigin() {
         setOrigin(getWidth()/2, getHeight()/2); // to support rotations around the center
     }
 
-
-    /**
-     * To get the coordinates of a point along a line traced from the center,
-     * along the designated angle, at the designated distance from the center.
-     *
-     * @param center center point of the Circle
-     * @param radius how far from the center the desired point is
-     * @param radian the angle along which the line is calculated
-     * @return the point associated with those parameters
-     */
-    public Vector2 pointAtAngle(Vector2 output, Vector2 center, float radius, float radian) {
-        output.set(center.x + radius * MathUtils.cos(radian), center.y + radius * MathUtils.sin(radian));
-        return output;
-    }
-
     /**
      * @param x x-coordinate relative to the origin (bottom left) of the widget
      * @param y y-coordinate relative to the origin (bottom left) of the widget
@@ -368,23 +353,41 @@ public Actor hit(float x, float y, boolean touchable) {
         if (touchable && getTouchable() == Touchable.disabled) return null;
         if (!isVisible()) return null;
 
-        localToStageCoordinates(vector2.set(x,y));
-        int childIndex = findChildIndexAtStage(vector2.x,vector2.y);
-        if (isValidIndex(childIndex)) {
-            Actor child = getChildren().get(childIndex);
+        /* Checking all children first to catch the ones extending beyond the widget. */
+        for (Actor child : getChildren()) {
             if(child.getTouchable() == Touchable.disabled)
-                return this;
+                continue;
             child.parentToLocalCoordinates(vector2.set(x,y));
             Actor hit = child.hit(vector2.x, vector2.y, touchable);
-            if(hit != null)
+            if(hit != null) {
+//                System.out.println("hit");
                 return hit;
-            else
-                return this;
+            }
+        }
+
+        /* Then we want to consider the widget's boundaries itself. */
+        localToStageCoordinates(vector2.set(x,y));
+        int childIndex = findChildIndexAtStage(vector2.x,vector2.y);
+        if(isValidIndex(childIndex)) {
+//            System.out.println("this valid");
+            return this;
         }
 
+//        // todo: shouldn't return `null` if hitting background
+//        if(isBackgroundHit(x,y)) {
+//            System.out.println("this background");
+//            return this;
+//        }
+
+//        System.out.println("null");
         return null;
     }
 
+//    public boolean isBackgroundHit(float x, float y) {
+//        stageToLocalCoordinates(vector2.set(x,y));
+//        return isWithinInnerRadius(vector2.x - getWidth()/2, vector2.y - getHeight()/2);
+//    }
+
     /**
      * Given a coordinate, find the index of the child (if any).
      *
@@ -429,7 +432,7 @@ public float angleAtStage(float x, float y) {
         return normalizeAngle(
                 MathUtils.radiansToDegrees
                         * MathUtils.atan2(y - vector2.y, x - vector2.x)
-                - getTotalRotation() - startDegreesOffset
+                        - getTotalRotation() - startDegreesOffset
         );
     }
 
@@ -461,14 +464,26 @@ public float normalizeAngle(float angle) {
         return ((angle % 360 + 360) % 360);
     }
 
+    /**
+     * Given a child index, find whether or not it would be a valid candidate to
+     * highlight or select.
+     *
+     * @param index an integer that would usually be the output of
+     *              {@link #findChildIndexAtStage(float, float)}.
+     * @return {@code true} only if the index is linked to a valid child sector.
+     */
+    public boolean isValidIndex(int index) {
+        return !(index <= -1 || index >= getAmountOfChildren());
+    }
+
     /**
      * Checks whether or not the input coordinate is in between (inclusively)
      * the inner-radius and the current radius of the widget (which can
      * be bigger than {@link #preferredRadius} if you use {@link #setFillParent(boolean)},
      * for example).
      *
-     * @param x x-coordinate relative to the center of the widget's
-     * @param y y-coordinate relative to the center of the widget's
+     * @param x x-coordinate relative to the center of the widget.
+     * @param y y-coordinate relative to the center of the widget.
      * @return 'true' only if the coordinates fall within the widget's radii.
      */
     public boolean isWithinRadii(float x, float y) {
@@ -478,6 +493,21 @@ public boolean isWithinRadii(float x, float y) {
         return distance >= innerRadSquared && distance <= radSquared;
     }
 
+    /**
+     * Checks whether or not the input coordinate is within (exclusively)
+     * the inner-radius.
+     *
+     * @param x x-coordinate relative to the center of the widget.
+     * @param y y-coordinate relative to the center of the widget.
+     * @return 'true' only if the coordinates fall within the widget's
+     *         inner radius.
+     */
+    public boolean isWithinInnerRadius(float x, float y) {
+        float distance = pow2(x) + pow2(y);
+        float innerRadSquared = pow2(getInnerRadiusLength());
+        return distance < innerRadSquared;
+    }
+
     /**
      * Returns the input to the power of 2.
      *
@@ -511,20 +541,8 @@ public void centerOnScreen() {
     public void centerOnActor(Actor actor) {
         if(actor == null)
             return;
-        // todo: possibly needs to be fixed for Contained Actors ?
-        setPosition(actor.getX(Align.center), actor.getY(Align.center), Align.center);
-    }
-
-    /**
-     * Given a child index, find whether or not it would be a valid candidate to
-     * highlight or select.
-     *
-     * @param index an integer that would usually be the output of
-     *              {@link #findChildIndexAtStage(float, float)}.
-     * @return {@code true} only if the index is linked to a valid child sector.
-     */
-    public boolean isValidIndex(int index) {
-        return !(index <= -1 || index >= getAmountOfChildren());
+        actor.localToStageCoordinates(vector2.set(actor.getWidth()/2, actor.getHeight()/2));
+        setPosition(vector2.x, vector2.y, Align.center);
     }