From eb981454c0e9b450d4fc5eaf1a22ce21e0f32931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Tue, 15 Apr 2014 08:11:55 +0200 Subject: [PATCH] Moved some classes. Added LayoutChangeEvent class. --- .../gamecore/audio/players/LoopPlayer.java | 4 +-- .../gamecore/control/bus/EventBus.java | 31 +++++++++++++++++-- .../control/bus/clients/DelegatingClient.java | 4 ++- .../control/bus/events/LayoutChangeEvent.java | 26 ++++++++++++++++ .../control/bus/events/MouseButtonEvent.java | 2 +- .../gui/components/BusEnabledPainter.java | 2 +- .../gamecore/gui/components/Component.java | 2 +- .../gui/components/PluggableRenderable.java | 4 +-- .../gui/components/SimplePainter.java | 2 +- .../gui/components/layout/AbstractLayout.java | 2 +- .../gui/components/layout/ColumnHolder.java | 2 +- .../gui/components/layout/RowHolder.java | 2 +- .../gamecore/gui/screens/Screen.java | 2 +- .../gamecore/gui/screens/ScreenLayer.java | 2 +- .../gamecore/render/DisplaySystem.java | 2 +- src/mightypork/rogue/screens/LayerFps.java | 2 +- .../screens/test_bouncyboxes/BouncyBox.java | 6 ++-- .../test_cat_sound/LayerFlyingCat.java | 6 ++-- .../test_render/LayerTestGradient.java | 2 +- src/mightypork/utils/math/Calc.java | 1 - .../utils/math/{animation => }/Easing.java | 2 +- src/mightypork/utils/math/Polar.java | 8 ++--- .../num/NumAnimated.java} | 18 +++++------ .../num/NumAnimatedDeg.java} | 11 ++++--- .../num/NumAnimatedRad.java} | 11 ++++--- .../utils/math/constraints/num/NumBound.java | 1 + .../math/constraints/num/NumBoundAdapter.java | 1 - .../{ => num}/PluggableNumBound.java | 3 +- .../{ => rect}/PluggableRectBound.java | 2 +- .../utils/math/constraints/rect/Rect.java | 1 - .../constraints/{ => rect}/RectBound.java | 3 +- .../constraints/rect/RectBoundAdapter.java | 2 -- .../{ => vect}/PluggableVectBound.java | 2 +- .../utils/math/constraints/vect/Vect.java | 1 - .../math/constraints/vect/VectAnimated.java | 16 +++++----- .../constraints/{ => vect}/VectBound.java | 3 +- .../constraints/vect/VectBoundAdapter.java | 2 -- 37 files changed, 118 insertions(+), 75 deletions(-) create mode 100644 src/mightypork/gamecore/control/bus/events/LayoutChangeEvent.java rename src/mightypork/utils/math/{animation => }/Easing.java (99%) rename src/mightypork/utils/math/{animation/AnimDouble.java => constraints/num/NumAnimated.java} (93%) rename src/mightypork/utils/math/{animation/AnimDoubleDeg.java => constraints/num/NumAnimatedDeg.java} (70%) rename src/mightypork/utils/math/{animation/AnimDoubleRad.java => constraints/num/NumAnimatedRad.java} (70%) rename src/mightypork/utils/math/constraints/{ => num}/PluggableNumBound.java (67%) rename src/mightypork/utils/math/constraints/{ => rect}/PluggableRectBound.java (80%) rename src/mightypork/utils/math/constraints/{ => rect}/RectBound.java (61%) rename src/mightypork/utils/math/constraints/{ => vect}/PluggableVectBound.java (81%) rename src/mightypork/utils/math/constraints/{ => vect}/VectBound.java (67%) diff --git a/src/mightypork/gamecore/audio/players/LoopPlayer.java b/src/mightypork/gamecore/audio/players/LoopPlayer.java index a5dd532..4a53564 100644 --- a/src/mightypork/gamecore/audio/players/LoopPlayer.java +++ b/src/mightypork/gamecore/audio/players/LoopPlayer.java @@ -5,7 +5,7 @@ import mightypork.gamecore.audio.DeferredAudio; import mightypork.gamecore.audio.Volume; import mightypork.gamecore.control.timing.Pauseable; import mightypork.gamecore.control.timing.Updateable; -import mightypork.utils.math.animation.AnimDouble; +import mightypork.utils.math.constraints.num.NumAnimated; import org.lwjgl.openal.AL10; @@ -20,7 +20,7 @@ public class LoopPlayer extends BaseAudioPlayer implements Updateable, Pauseable private int sourceID = -1; /** animator for fade in and fade out */ - private final AnimDouble fadeAnim = new AnimDouble(0); + private final NumAnimated fadeAnim = new NumAnimated(0); private double lastUpdateGain = 0; diff --git a/src/mightypork/gamecore/control/bus/EventBus.java b/src/mightypork/gamecore/control/bus/EventBus.java index 17aaa84..5ee44a9 100644 --- a/src/mightypork/gamecore/control/bus/EventBus.java +++ b/src/mightypork/gamecore/control/bus/EventBus.java @@ -1,10 +1,12 @@ package mightypork.gamecore.control.bus; +import java.util.Collection; import java.util.concurrent.DelayQueue; import java.util.concurrent.Delayed; import java.util.concurrent.TimeUnit; +import mightypork.gamecore.control.bus.clients.DelegatingClient; import mightypork.gamecore.control.bus.events.Event; import mightypork.gamecore.control.bus.events.types.DelayedEvent; import mightypork.gamecore.control.bus.events.types.ImmediateEvent; @@ -116,7 +118,7 @@ final public class EventBus implements Destroyable { /** - * Send based on annotation. + * Send based on annotation.clients * * @param event event */ @@ -187,6 +189,16 @@ final public class EventBus implements Destroyable { } + public void sendDirectToChildren(DelegatingClient delegatingClient, Event event) + { + assertLive(); + + if (shallLog(event)) Log.f3(" Di sub " + Log.str(event)); + + doDispatch(delegatingClient.getChildClients(), event); + } + + /** * Send immediately.
* Should be used for real-time events that require immediate response, such @@ -201,6 +213,21 @@ final public class EventBus implements Destroyable { channels.setBuffering(true); clients.setBuffering(true); + doDispatch(clients, event); + + channels.setBuffering(false); + clients.setBuffering(false); + } + + + /** + * Send to a set of clients + * + * @param clients clients + * @param event event + */ + private void doDispatch(Collection clients, Event event) + { boolean sent = false; boolean accepted = false; @@ -218,8 +245,6 @@ final public class EventBus implements Destroyable { if (!accepted) Log.e(" Not accepted by any channel: " + Log.str(event)); if (!sent && shallLog(event)) Log.w(" Not delivered: " + Log.str(event)); - channels.setBuffering(false); - clients.setBuffering(false); } diff --git a/src/mightypork/gamecore/control/bus/clients/DelegatingClient.java b/src/mightypork/gamecore/control/bus/clients/DelegatingClient.java index 4676a6e..089726a 100644 --- a/src/mightypork/gamecore/control/bus/clients/DelegatingClient.java +++ b/src/mightypork/gamecore/control/bus/clients/DelegatingClient.java @@ -5,7 +5,9 @@ import java.util.Collection; /** - * Client containing child clients + * Client containing child clients. According to the contract, if the collection + * of clients is ordered, the clients will be served in that order. In any case, + * the {@link DelegatingClient} itself will be served beforehand. * * @author MightyPork */ diff --git a/src/mightypork/gamecore/control/bus/events/LayoutChangeEvent.java b/src/mightypork/gamecore/control/bus/events/LayoutChangeEvent.java new file mode 100644 index 0000000..1c10781 --- /dev/null +++ b/src/mightypork/gamecore/control/bus/events/LayoutChangeEvent.java @@ -0,0 +1,26 @@ +package mightypork.gamecore.control.bus.events; + + +import mightypork.gamecore.control.bus.events.types.ImmediateEvent; +import mightypork.gamecore.control.timing.Pollable; + + +/** + * Intended use is to notify UI component sub-clients that they should poll + * their cached constraints. + * + * @author MightyPork + */ +@ImmediateEvent +public class LayoutChangeEvent implements Event { + + public LayoutChangeEvent() { + } + + + @Override + public void handleBy(Pollable handler) + { + handler.poll(); + } +} diff --git a/src/mightypork/gamecore/control/bus/events/MouseButtonEvent.java b/src/mightypork/gamecore/control/bus/events/MouseButtonEvent.java index e6cfd0a..e3f2a2b 100644 --- a/src/mightypork/gamecore/control/bus/events/MouseButtonEvent.java +++ b/src/mightypork/gamecore/control/bus/events/MouseButtonEvent.java @@ -1,7 +1,7 @@ package mightypork.gamecore.control.bus.events; -import mightypork.utils.math.constraints.RectBound; +import mightypork.utils.math.constraints.rect.RectBound; import mightypork.utils.math.constraints.vect.Vect; diff --git a/src/mightypork/gamecore/gui/components/BusEnabledPainter.java b/src/mightypork/gamecore/gui/components/BusEnabledPainter.java index a52bf39..1747a4c 100644 --- a/src/mightypork/gamecore/gui/components/BusEnabledPainter.java +++ b/src/mightypork/gamecore/gui/components/BusEnabledPainter.java @@ -10,8 +10,8 @@ import mightypork.gamecore.control.bus.EventBus; import mightypork.gamecore.control.bus.clients.ClientHub; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.render.DisplaySystem; -import mightypork.utils.math.constraints.RectBound; import mightypork.utils.math.constraints.rect.Rect; +import mightypork.utils.math.constraints.rect.RectBound; public abstract class BusEnabledPainter extends SimplePainter implements ClientHub, Component, AppAccess { diff --git a/src/mightypork/gamecore/gui/components/Component.java b/src/mightypork/gamecore/gui/components/Component.java index 520132a..1870881 100644 --- a/src/mightypork/gamecore/gui/components/Component.java +++ b/src/mightypork/gamecore/gui/components/Component.java @@ -4,8 +4,8 @@ package mightypork.gamecore.gui.components; import mightypork.gamecore.control.bus.clients.ToggleableClient; import mightypork.gamecore.control.interf.Enableable; import mightypork.gamecore.gui.Hideable; -import mightypork.utils.math.constraints.RectBound; import mightypork.utils.math.constraints.rect.Rect; +import mightypork.utils.math.constraints.rect.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/PluggableRenderable.java b/src/mightypork/gamecore/gui/components/PluggableRenderable.java index 90274b9..bfcabc3 100644 --- a/src/mightypork/gamecore/gui/components/PluggableRenderable.java +++ b/src/mightypork/gamecore/gui/components/PluggableRenderable.java @@ -1,9 +1,9 @@ package mightypork.gamecore.gui.components; -import mightypork.utils.math.constraints.PluggableRectBound; -import mightypork.utils.math.constraints.RectBound; +import mightypork.utils.math.constraints.rect.PluggableRectBound; import mightypork.utils.math.constraints.rect.Rect; +import mightypork.utils.math.constraints.rect.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/SimplePainter.java b/src/mightypork/gamecore/gui/components/SimplePainter.java index bce8e6a..d44a761 100644 --- a/src/mightypork/gamecore/gui/components/SimplePainter.java +++ b/src/mightypork/gamecore/gui/components/SimplePainter.java @@ -1,8 +1,8 @@ package mightypork.gamecore.gui.components; -import mightypork.utils.math.constraints.RectBound; import mightypork.utils.math.constraints.rect.Rect; +import mightypork.utils.math.constraints.rect.RectBound; import mightypork.utils.math.constraints.rect.RectBoundAdapter; diff --git a/src/mightypork/gamecore/gui/components/layout/AbstractLayout.java b/src/mightypork/gamecore/gui/components/layout/AbstractLayout.java index 74c9aa0..40dced3 100644 --- a/src/mightypork/gamecore/gui/components/layout/AbstractLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/AbstractLayout.java @@ -9,7 +9,7 @@ import mightypork.gamecore.gui.components.BusEnabledPainter; import mightypork.gamecore.gui.components.PluggableRenderable; import mightypork.gamecore.gui.components.Renderable; import mightypork.gamecore.gui.components.SimplePainter; -import mightypork.utils.math.constraints.RectBound; +import mightypork.utils.math.constraints.rect.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java b/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java index 18b59f6..e3f55c5 100644 --- a/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java +++ b/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java @@ -3,7 +3,7 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.components.PluggableRenderable; -import mightypork.utils.math.constraints.RectBound; +import mightypork.utils.math.constraints.rect.RectBound; import mightypork.utils.math.constraints.rect.TiledRect; diff --git a/src/mightypork/gamecore/gui/components/layout/RowHolder.java b/src/mightypork/gamecore/gui/components/layout/RowHolder.java index ea03b6b..91fa7cb 100644 --- a/src/mightypork/gamecore/gui/components/layout/RowHolder.java +++ b/src/mightypork/gamecore/gui/components/layout/RowHolder.java @@ -3,7 +3,7 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.components.PluggableRenderable; -import mightypork.utils.math.constraints.RectBound; +import mightypork.utils.math.constraints.rect.RectBound; import mightypork.utils.math.constraints.rect.TiledRect; diff --git a/src/mightypork/gamecore/gui/screens/Screen.java b/src/mightypork/gamecore/gui/screens/Screen.java index 32dd613..c3fdcc6 100644 --- a/src/mightypork/gamecore/gui/screens/Screen.java +++ b/src/mightypork/gamecore/gui/screens/Screen.java @@ -10,8 +10,8 @@ import mightypork.gamecore.input.KeyBindingPool; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.render.Render; import mightypork.utils.annotations.DefaultImpl; -import mightypork.utils.math.constraints.RectBound; import mightypork.utils.math.constraints.rect.Rect; +import mightypork.utils.math.constraints.rect.RectBound; import mightypork.utils.math.constraints.vect.Vect; diff --git a/src/mightypork/gamecore/gui/screens/ScreenLayer.java b/src/mightypork/gamecore/gui/screens/ScreenLayer.java index 1b1a211..73d11b7 100644 --- a/src/mightypork/gamecore/gui/screens/ScreenLayer.java +++ b/src/mightypork/gamecore/gui/screens/ScreenLayer.java @@ -8,8 +8,8 @@ import mightypork.gamecore.input.KeyBinder; import mightypork.gamecore.input.KeyBindingPool; import mightypork.gamecore.input.KeyStroke; import mightypork.utils.annotations.DefaultImpl; -import mightypork.utils.math.constraints.RectBound; import mightypork.utils.math.constraints.rect.Rect; +import mightypork.utils.math.constraints.rect.RectBound; import mightypork.utils.math.constraints.vect.Vect; diff --git a/src/mightypork/gamecore/render/DisplaySystem.java b/src/mightypork/gamecore/render/DisplaySystem.java index 5bf9b61..449cd28 100644 --- a/src/mightypork/gamecore/render/DisplaySystem.java +++ b/src/mightypork/gamecore/render/DisplaySystem.java @@ -10,8 +10,8 @@ import mightypork.gamecore.control.AppModule; import mightypork.gamecore.control.bus.events.ScreenChangeEvent; import mightypork.gamecore.control.timing.FpsMeter; import mightypork.utils.logging.Log; -import mightypork.utils.math.constraints.RectBound; import mightypork.utils.math.constraints.rect.Rect; +import mightypork.utils.math.constraints.rect.RectBound; import mightypork.utils.math.constraints.vect.Vect; import org.lwjgl.BufferUtils; diff --git a/src/mightypork/rogue/screens/LayerFps.java b/src/mightypork/rogue/screens/LayerFps.java index 36aca1a..0a0fb26 100644 --- a/src/mightypork/rogue/screens/LayerFps.java +++ b/src/mightypork/rogue/screens/LayerFps.java @@ -11,7 +11,7 @@ import mightypork.gamecore.render.fonts.FontRenderer.Align; import mightypork.gamecore.render.fonts.GLFont; import mightypork.rogue.Res; import mightypork.utils.math.color.RGB; -import mightypork.utils.math.constraints.RectBound; +import mightypork.utils.math.constraints.rect.RectBound; import mightypork.utils.math.constraints.vect.Vect; import mightypork.utils.string.StringProvider; diff --git a/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java b/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java index 573e235..fbd7c22 100644 --- a/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java +++ b/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java @@ -7,9 +7,9 @@ import mightypork.gamecore.control.bus.events.ScreenChangeEvent; import mightypork.gamecore.control.timing.Updateable; import mightypork.gamecore.gui.components.SimplePainter; import mightypork.gamecore.render.Render; -import mightypork.utils.math.animation.AnimDouble; -import mightypork.utils.math.animation.Easing; +import mightypork.utils.math.Easing; import mightypork.utils.math.color.RGB; +import mightypork.utils.math.constraints.num.NumAnimated; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.rect.Rect; @@ -20,7 +20,7 @@ public class BouncyBox extends SimplePainter implements Updateable, ScreenChange private final Rect box; - private final AnimDouble pos = new AnimDouble(0, Easing.BOUNCE_OUT); + private final NumAnimated pos = new NumAnimated(0, Easing.BOUNCE_OUT); public BouncyBox() { diff --git a/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java b/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java index 584e0f4..e69dece 100644 --- a/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java +++ b/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java @@ -14,9 +14,9 @@ import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.Keys; import mightypork.gamecore.render.fonts.FontRenderer.Align; import mightypork.rogue.Res; -import mightypork.utils.math.animation.AnimDouble; -import mightypork.utils.math.animation.Easing; +import mightypork.utils.math.Easing; import mightypork.utils.math.color.RGB; +import mightypork.utils.math.constraints.num.NumAnimated; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.rect.Rect; import mightypork.utils.math.constraints.vect.Vect; @@ -25,7 +25,7 @@ import mightypork.utils.math.constraints.vect.VectAnimated; public class LayerFlyingCat extends ScreenLayer implements Updateable, MouseButtonEvent.Listener { - private final AnimDouble size = new AnimDouble(400, Easing.SINE_BOTH); + private final NumAnimated size = new NumAnimated(400, Easing.SINE_BOTH); private final VectAnimated pos = VectAnimated.makeVar(Easing.ELASTIC_OUT); private final Random rand = new Random(); diff --git a/src/mightypork/rogue/screens/test_render/LayerTestGradient.java b/src/mightypork/rogue/screens/test_render/LayerTestGradient.java index ef8f545..b7a774d 100644 --- a/src/mightypork/rogue/screens/test_render/LayerTestGradient.java +++ b/src/mightypork/rogue/screens/test_render/LayerTestGradient.java @@ -5,7 +5,7 @@ import mightypork.gamecore.gui.screens.Screen; import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.gamecore.render.Render; import mightypork.utils.math.color.RGB; -import mightypork.utils.math.constraints.RectBound; +import mightypork.utils.math.constraints.rect.RectBound; public class LayerTestGradient extends ScreenLayer { diff --git a/src/mightypork/utils/math/Calc.java b/src/mightypork/utils/math/Calc.java index 17d4bfe..516dc7d 100644 --- a/src/mightypork/utils/math/Calc.java +++ b/src/mightypork/utils/math/Calc.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import mightypork.utils.math.animation.Easing; import mightypork.utils.math.constraints.vect.Vect; import org.lwjgl.BufferUtils; diff --git a/src/mightypork/utils/math/animation/Easing.java b/src/mightypork/utils/math/Easing.java similarity index 99% rename from src/mightypork/utils/math/animation/Easing.java rename to src/mightypork/utils/math/Easing.java index 386f4bb..926f63a 100644 --- a/src/mightypork/utils/math/animation/Easing.java +++ b/src/mightypork/utils/math/Easing.java @@ -1,4 +1,4 @@ -package mightypork.utils.math.animation; +package mightypork.utils.math; import mightypork.utils.annotations.FactoryMethod; diff --git a/src/mightypork/utils/math/Polar.java b/src/mightypork/utils/math/Polar.java index 801b3fb..4f6b6af 100644 --- a/src/mightypork/utils/math/Polar.java +++ b/src/mightypork/utils/math/Polar.java @@ -1,8 +1,6 @@ package mightypork.utils.math; -import mightypork.utils.math.Calc.Deg; -import mightypork.utils.math.Calc.Rad; import mightypork.utils.math.constraints.vect.Vect; @@ -42,7 +40,7 @@ public class Polar { */ public Polar(double angle, boolean deg, double distance) { this.radius = distance; - this.angle = deg ? Deg.toRad(angle) : angle; + this.angle = deg ? Math.toRadians(angle) : angle; } @@ -60,7 +58,7 @@ public class Polar { */ public double getAngleDeg() { - return Rad.toDeg(angle); + return Math.toDegrees(angle); } @@ -78,7 +76,7 @@ public class Polar { */ public void setAngleDeg(double angle) { - this.angle = Deg.toRad(angle); + this.angle = Math.toRadians(angle); } diff --git a/src/mightypork/utils/math/animation/AnimDouble.java b/src/mightypork/utils/math/constraints/num/NumAnimated.java similarity index 93% rename from src/mightypork/utils/math/animation/AnimDouble.java rename to src/mightypork/utils/math/constraints/num/NumAnimated.java index eca40da..d3626c3 100644 --- a/src/mightypork/utils/math/animation/AnimDouble.java +++ b/src/mightypork/utils/math/constraints/num/NumAnimated.java @@ -1,10 +1,10 @@ -package mightypork.utils.math.animation; +package mightypork.utils.math.constraints.num; import mightypork.gamecore.control.timing.Pauseable; import mightypork.gamecore.control.timing.Updateable; import mightypork.utils.math.Calc; -import mightypork.utils.math.constraints.num.NumMutable; +import mightypork.utils.math.Easing; /** @@ -12,7 +12,7 @@ import mightypork.utils.math.constraints.num.NumMutable; * * @author MightyPork */ -public class AnimDouble extends NumMutable implements Updateable, Pauseable { +public class NumAnimated extends NumMutable implements Updateable, Pauseable { /** target double */ protected double to = 0; @@ -41,7 +41,7 @@ public class AnimDouble extends NumMutable implements Updateable, Pauseable { * * @param value initial value */ - public AnimDouble(double value) { + public NumAnimated(double value) { setTo(value); } @@ -52,7 +52,7 @@ public class AnimDouble extends NumMutable implements Updateable, Pauseable { * @param value initial value * @param easing easing function */ - public AnimDouble(double value, Easing easing) { + public NumAnimated(double value, Easing easing) { this(value); setEasing(easing); } @@ -63,7 +63,7 @@ public class AnimDouble extends NumMutable implements Updateable, Pauseable { * * @param other other animator */ - public AnimDouble(AnimDouble other) { + public NumAnimated(NumAnimated other) { setTo(other); } @@ -213,7 +213,7 @@ public class AnimDouble extends NumMutable implements Updateable, Pauseable { * * @param other */ - public void setTo(AnimDouble other) + public void setTo(NumAnimated other) { this.from = other.from; this.to = other.to; @@ -314,9 +314,9 @@ public class AnimDouble extends NumMutable implements Updateable, Pauseable { * @return copy */ @Override - public AnimDouble clone() + public NumAnimated clone() { - return new AnimDouble(this); + return new NumAnimated(this); } diff --git a/src/mightypork/utils/math/animation/AnimDoubleDeg.java b/src/mightypork/utils/math/constraints/num/NumAnimatedDeg.java similarity index 70% rename from src/mightypork/utils/math/animation/AnimDoubleDeg.java rename to src/mightypork/utils/math/constraints/num/NumAnimatedDeg.java index 56a448c..7549eb2 100644 --- a/src/mightypork/utils/math/animation/AnimDoubleDeg.java +++ b/src/mightypork/utils/math/constraints/num/NumAnimatedDeg.java @@ -1,7 +1,8 @@ -package mightypork.utils.math.animation; +package mightypork.utils.math.constraints.num; import mightypork.utils.math.Calc; +import mightypork.utils.math.Easing; import mightypork.utils.math.Calc.Deg; @@ -10,19 +11,19 @@ import mightypork.utils.math.Calc.Deg; * * @author MightyPork */ -public class AnimDoubleDeg extends AnimDouble { +public class NumAnimatedDeg extends NumAnimated { - public AnimDoubleDeg(AnimDouble other) { + public NumAnimatedDeg(NumAnimated other) { super(other); } - public AnimDoubleDeg(double value) { + public NumAnimatedDeg(double value) { super(value); } - public AnimDoubleDeg(double value, Easing easing) { + public NumAnimatedDeg(double value, Easing easing) { super(value, easing); } diff --git a/src/mightypork/utils/math/animation/AnimDoubleRad.java b/src/mightypork/utils/math/constraints/num/NumAnimatedRad.java similarity index 70% rename from src/mightypork/utils/math/animation/AnimDoubleRad.java rename to src/mightypork/utils/math/constraints/num/NumAnimatedRad.java index 7665664..cd7df9c 100644 --- a/src/mightypork/utils/math/animation/AnimDoubleRad.java +++ b/src/mightypork/utils/math/constraints/num/NumAnimatedRad.java @@ -1,7 +1,8 @@ -package mightypork.utils.math.animation; +package mightypork.utils.math.constraints.num; import mightypork.utils.math.Calc; +import mightypork.utils.math.Easing; import mightypork.utils.math.Calc.Rad; @@ -10,19 +11,19 @@ import mightypork.utils.math.Calc.Rad; * * @author MightyPork */ -public class AnimDoubleRad extends AnimDouble { +public class NumAnimatedRad extends NumAnimated { - public AnimDoubleRad(AnimDouble other) { + public NumAnimatedRad(NumAnimated other) { super(other); } - public AnimDoubleRad(double value) { + public NumAnimatedRad(double value) { super(value); } - public AnimDoubleRad(double value, Easing easing) { + public NumAnimatedRad(double value, Easing easing) { super(value, easing); } diff --git a/src/mightypork/utils/math/constraints/num/NumBound.java b/src/mightypork/utils/math/constraints/num/NumBound.java index 911fd0b..2f18266 100644 --- a/src/mightypork/utils/math/constraints/num/NumBound.java +++ b/src/mightypork/utils/math/constraints/num/NumBound.java @@ -1,6 +1,7 @@ package mightypork.utils.math.constraints.num; + /** * Numeric constraint * diff --git a/src/mightypork/utils/math/constraints/num/NumBoundAdapter.java b/src/mightypork/utils/math/constraints/num/NumBoundAdapter.java index b3ddde7..ada4955 100644 --- a/src/mightypork/utils/math/constraints/num/NumBoundAdapter.java +++ b/src/mightypork/utils/math/constraints/num/NumBoundAdapter.java @@ -1,7 +1,6 @@ package mightypork.utils.math.constraints.num; -import mightypork.utils.math.constraints.PluggableNumBound; public class NumBoundAdapter extends NumAdapter implements PluggableNumBound { diff --git a/src/mightypork/utils/math/constraints/PluggableNumBound.java b/src/mightypork/utils/math/constraints/num/PluggableNumBound.java similarity index 67% rename from src/mightypork/utils/math/constraints/PluggableNumBound.java rename to src/mightypork/utils/math/constraints/num/PluggableNumBound.java index f96fca8..ba71230 100644 --- a/src/mightypork/utils/math/constraints/PluggableNumBound.java +++ b/src/mightypork/utils/math/constraints/num/PluggableNumBound.java @@ -1,7 +1,6 @@ -package mightypork.utils.math.constraints; +package mightypork.utils.math.constraints.num; -import mightypork.utils.math.constraints.num.NumBound; /** diff --git a/src/mightypork/utils/math/constraints/PluggableRectBound.java b/src/mightypork/utils/math/constraints/rect/PluggableRectBound.java similarity index 80% rename from src/mightypork/utils/math/constraints/PluggableRectBound.java rename to src/mightypork/utils/math/constraints/rect/PluggableRectBound.java index faec1bb..d5cb0cd 100644 --- a/src/mightypork/utils/math/constraints/PluggableRectBound.java +++ b/src/mightypork/utils/math/constraints/rect/PluggableRectBound.java @@ -1,4 +1,4 @@ -package mightypork.utils.math.constraints; +package mightypork.utils.math.constraints.rect; /** diff --git a/src/mightypork/utils/math/constraints/rect/Rect.java b/src/mightypork/utils/math/constraints/rect/Rect.java index d3315f0..db92f16 100644 --- a/src/mightypork/utils/math/constraints/rect/Rect.java +++ b/src/mightypork/utils/math/constraints/rect/Rect.java @@ -3,7 +3,6 @@ package mightypork.utils.math.constraints.rect; import mightypork.utils.annotations.FactoryMethod; import mightypork.utils.math.constraints.Digestable; -import mightypork.utils.math.constraints.RectBound; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.num.NumConst; import mightypork.utils.math.constraints.vect.Vect; diff --git a/src/mightypork/utils/math/constraints/RectBound.java b/src/mightypork/utils/math/constraints/rect/RectBound.java similarity index 61% rename from src/mightypork/utils/math/constraints/RectBound.java rename to src/mightypork/utils/math/constraints/rect/RectBound.java index 5789f1e..a112c41 100644 --- a/src/mightypork/utils/math/constraints/RectBound.java +++ b/src/mightypork/utils/math/constraints/rect/RectBound.java @@ -1,7 +1,6 @@ -package mightypork.utils.math.constraints; +package mightypork.utils.math.constraints.rect; -import mightypork.utils.math.constraints.rect.Rect; /** diff --git a/src/mightypork/utils/math/constraints/rect/RectBoundAdapter.java b/src/mightypork/utils/math/constraints/rect/RectBoundAdapter.java index fac045b..deabf5a 100644 --- a/src/mightypork/utils/math/constraints/rect/RectBoundAdapter.java +++ b/src/mightypork/utils/math/constraints/rect/RectBoundAdapter.java @@ -1,8 +1,6 @@ package mightypork.utils.math.constraints.rect; -import mightypork.utils.math.constraints.PluggableRectBound; -import mightypork.utils.math.constraints.RectBound; /** diff --git a/src/mightypork/utils/math/constraints/PluggableVectBound.java b/src/mightypork/utils/math/constraints/vect/PluggableVectBound.java similarity index 81% rename from src/mightypork/utils/math/constraints/PluggableVectBound.java rename to src/mightypork/utils/math/constraints/vect/PluggableVectBound.java index 22e1457..90719f4 100644 --- a/src/mightypork/utils/math/constraints/PluggableVectBound.java +++ b/src/mightypork/utils/math/constraints/vect/PluggableVectBound.java @@ -1,4 +1,4 @@ -package mightypork.utils.math.constraints; +package mightypork.utils.math.constraints.vect; /** diff --git a/src/mightypork/utils/math/constraints/vect/Vect.java b/src/mightypork/utils/math/constraints/vect/Vect.java index 67e0d14..a6b0e85 100644 --- a/src/mightypork/utils/math/constraints/vect/Vect.java +++ b/src/mightypork/utils/math/constraints/vect/Vect.java @@ -4,7 +4,6 @@ package mightypork.utils.math.constraints.vect; import mightypork.utils.annotations.DefaultImpl; import mightypork.utils.annotations.FactoryMethod; import mightypork.utils.math.constraints.Digestable; -import mightypork.utils.math.constraints.VectBound; import mightypork.utils.math.constraints.num.Num; import mightypork.utils.math.constraints.num.NumConst; import mightypork.utils.math.constraints.rect.Rect; diff --git a/src/mightypork/utils/math/constraints/vect/VectAnimated.java b/src/mightypork/utils/math/constraints/vect/VectAnimated.java index 562cb42..1cc88eb 100644 --- a/src/mightypork/utils/math/constraints/vect/VectAnimated.java +++ b/src/mightypork/utils/math/constraints/vect/VectAnimated.java @@ -4,8 +4,8 @@ package mightypork.utils.math.constraints.vect; import mightypork.gamecore.control.timing.Pauseable; import mightypork.gamecore.control.timing.Updateable; import mightypork.utils.annotations.FactoryMethod; -import mightypork.utils.math.animation.AnimDouble; -import mightypork.utils.math.animation.Easing; +import mightypork.utils.math.Easing; +import mightypork.utils.math.constraints.num.NumAnimated; /** @@ -15,7 +15,7 @@ import mightypork.utils.math.animation.Easing; */ public class VectAnimated extends VectMutable implements Pauseable, Updateable { - private final AnimDouble x, y, z; + private final NumAnimated x, y, z; private double defaultDuration = 0; @@ -27,7 +27,7 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable { * @param y y animator * @param z z animator */ - public VectAnimated(AnimDouble x, AnimDouble y, AnimDouble z) { + public VectAnimated(NumAnimated x, NumAnimated y, NumAnimated z) { this.x = x; this.y = y; this.z = z; @@ -41,9 +41,9 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable { * @param easing animation easing */ public VectAnimated(Vect start, Easing easing) { - x = new AnimDouble(start.x(), easing); - y = new AnimDouble(start.y(), easing); - z = new AnimDouble(start.z(), easing); + x = new NumAnimated(start.x(), easing); + y = new NumAnimated(start.y(), easing); + z = new NumAnimated(start.z(), easing); } @@ -255,7 +255,7 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable { * @return animated mutable vector */ @FactoryMethod - public static VectAnimated makeVar(AnimDouble x, AnimDouble y, AnimDouble z) + public static VectAnimated makeVar(NumAnimated x, NumAnimated y, NumAnimated z) { return new VectAnimated(x, y, z); } diff --git a/src/mightypork/utils/math/constraints/VectBound.java b/src/mightypork/utils/math/constraints/vect/VectBound.java similarity index 67% rename from src/mightypork/utils/math/constraints/VectBound.java rename to src/mightypork/utils/math/constraints/vect/VectBound.java index 86f07b7..08c4014 100644 --- a/src/mightypork/utils/math/constraints/VectBound.java +++ b/src/mightypork/utils/math/constraints/vect/VectBound.java @@ -1,7 +1,6 @@ -package mightypork.utils.math.constraints; +package mightypork.utils.math.constraints.vect; -import mightypork.utils.math.constraints.vect.Vect; /** diff --git a/src/mightypork/utils/math/constraints/vect/VectBoundAdapter.java b/src/mightypork/utils/math/constraints/vect/VectBoundAdapter.java index 5eed2db..43b1055 100644 --- a/src/mightypork/utils/math/constraints/vect/VectBoundAdapter.java +++ b/src/mightypork/utils/math/constraints/vect/VectBoundAdapter.java @@ -1,8 +1,6 @@ package mightypork.utils.math.constraints.vect; -import mightypork.utils.math.constraints.PluggableVectBound; -import mightypork.utils.math.constraints.VectBound; public class VectBoundAdapter extends VectAdapter implements PluggableVectBound {