diff --git a/src/mightypork/gamecore/gui/components/BaseComponent.java b/src/mightypork/gamecore/gui/components/BaseComponent.java index 082e945..439f407 100644 --- a/src/mightypork/gamecore/gui/components/BaseComponent.java +++ b/src/mightypork/gamecore/gui/components/BaseComponent.java @@ -3,9 +3,9 @@ package mightypork.gamecore.gui.components; import mightypork.dynmath.num.Num; import mightypork.dynmath.rect.Rect; +import mightypork.dynmath.rect.RectBound; import mightypork.dynmath.rect.caching.AbstractRectCache; -import mightypork.dynmath.rect.proxy.RectBound; -import mightypork.dynmath.rect.proxy.RectBoundAdapter; +import mightypork.dynmath.rect.proxy.RectProxy; import mightypork.gamecore.gui.Enableable; import mightypork.gamecore.gui.events.LayoutChangeEvent; import mightypork.gamecore.gui.events.LayoutChangeListener; @@ -41,7 +41,7 @@ public abstract class BaseComponent extends AbstractRectCache implements Compone @Override public void setRect(RectBound rect) { - this.source = new RectBoundAdapter(rect); + this.source = new RectProxy(rect); } diff --git a/src/mightypork/gamecore/gui/components/LayoutComponent.java b/src/mightypork/gamecore/gui/components/LayoutComponent.java index 9266807..db66402 100644 --- a/src/mightypork/gamecore/gui/components/LayoutComponent.java +++ b/src/mightypork/gamecore/gui/components/LayoutComponent.java @@ -4,7 +4,7 @@ package mightypork.gamecore.gui.components; import java.util.Collection; import java.util.LinkedList; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.gamecore.core.modules.AppAccess; import mightypork.gamecore.core.modules.AppSubModule; import mightypork.gamecore.eventbus.EventBus; diff --git a/src/mightypork/gamecore/gui/components/LinearComponent.java b/src/mightypork/gamecore/gui/components/LinearComponent.java index 8f6d494..5a52d3d 100644 --- a/src/mightypork/gamecore/gui/components/LinearComponent.java +++ b/src/mightypork/gamecore/gui/components/LinearComponent.java @@ -3,7 +3,7 @@ package mightypork.gamecore.gui.components; import mightypork.dynmath.num.Num; import mightypork.dynmath.rect.Rect; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.dynmath.vect.Vect; import mightypork.dynmath.vect.proxy.VectAdapter; diff --git a/src/mightypork/gamecore/gui/components/PluggableRenderable.java b/src/mightypork/gamecore/gui/components/PluggableRenderable.java index e5130ba..744ac93 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.dynmath.rect.PluggableRectBound; import mightypork.dynmath.rect.Rect; -import mightypork.dynmath.rect.proxy.PluggableRectBound; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.gamecore.render.Renderable; diff --git a/src/mightypork/gamecore/gui/components/layout/ColumnLayout.java b/src/mightypork/gamecore/gui/components/layout/ColumnLayout.java index fd0900e..17a48e3 100644 --- a/src/mightypork/gamecore/gui/components/layout/ColumnLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/ColumnLayout.java @@ -1,7 +1,7 @@ package mightypork.gamecore.gui.components.layout; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.gamecore.core.modules.AppAccess; import mightypork.gamecore.gui.components.Component; diff --git a/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java b/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java index 61438a2..64ac1f5 100644 --- a/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java @@ -1,7 +1,7 @@ package mightypork.gamecore.gui.components.layout; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.gamecore.core.modules.AppAccess; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; diff --git a/src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java b/src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java index ae32a13..6e9a2e9 100644 --- a/src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/FlowColumnLayout.java @@ -3,7 +3,7 @@ package mightypork.gamecore.gui.components.layout; import mightypork.dynmath.num.Num; import mightypork.dynmath.rect.Rect; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.gamecore.core.modules.AppAccess; import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.Component; diff --git a/src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java b/src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java index 4ebf77b..7ec13a1 100644 --- a/src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/FlowRowLayout.java @@ -3,7 +3,7 @@ package mightypork.gamecore.gui.components.layout; import mightypork.dynmath.num.Num; import mightypork.dynmath.rect.Rect; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.gamecore.core.modules.AppAccess; import mightypork.gamecore.gui.AlignY; import mightypork.gamecore.gui.components.Component; diff --git a/src/mightypork/gamecore/gui/components/layout/GridLayout.java b/src/mightypork/gamecore/gui/components/layout/GridLayout.java index d95471d..9585d52 100644 --- a/src/mightypork/gamecore/gui/components/layout/GridLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/GridLayout.java @@ -1,8 +1,8 @@ package mightypork.gamecore.gui.components.layout; +import mightypork.dynmath.rect.RectBound; import mightypork.dynmath.rect.builders.TiledRect; -import mightypork.dynmath.rect.proxy.RectBound; import mightypork.gamecore.core.modules.AppAccess; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; diff --git a/src/mightypork/gamecore/gui/components/layout/RowLayout.java b/src/mightypork/gamecore/gui/components/layout/RowLayout.java index 65315ab..d5edfba 100644 --- a/src/mightypork/gamecore/gui/components/layout/RowLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/RowLayout.java @@ -1,7 +1,7 @@ package mightypork.gamecore.gui.components.layout; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.gamecore.core.modules.AppAccess; import mightypork.gamecore.gui.components.Component; diff --git a/src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java b/src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java index c9ce181..3f71d57 100644 --- a/src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/linear/LinearLayout.java @@ -2,8 +2,8 @@ package mightypork.gamecore.gui.components.layout.linear; import mightypork.dynmath.num.Num; -import mightypork.dynmath.num.NumSum; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.num.batch.NumSum; +import mightypork.dynmath.rect.RectBound; import mightypork.dynmath.vect.Vect; import mightypork.dynmath.vect.proxy.VectAdapter; import mightypork.gamecore.core.modules.AppAccess; diff --git a/src/mightypork/gamecore/gui/screens/Screen.java b/src/mightypork/gamecore/gui/screens/Screen.java index 55eaa61..7fdf2de 100644 --- a/src/mightypork/gamecore/gui/screens/Screen.java +++ b/src/mightypork/gamecore/gui/screens/Screen.java @@ -2,7 +2,7 @@ package mightypork.gamecore.gui.screens; import mightypork.dynmath.rect.Rect; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.gamecore.core.modules.AppAccess; import mightypork.gamecore.core.modules.AppSubModule; import mightypork.gamecore.gui.events.LayoutChangeEvent; diff --git a/src/mightypork/gamecore/input/events/MouseButtonEvent.java b/src/mightypork/gamecore/input/events/MouseButtonEvent.java index 2bf2895..3aaac01 100644 --- a/src/mightypork/gamecore/input/events/MouseButtonEvent.java +++ b/src/mightypork/gamecore/input/events/MouseButtonEvent.java @@ -1,7 +1,7 @@ package mightypork.gamecore.input.events; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.dynmath.vect.Vect; import mightypork.dynmath.vect.VectConst; import mightypork.gamecore.eventbus.BusEvent; diff --git a/src/mightypork/gamecore/render/DisplaySystem.java b/src/mightypork/gamecore/render/DisplaySystem.java index 07d4c26..c99c7e6 100644 --- a/src/mightypork/gamecore/render/DisplaySystem.java +++ b/src/mightypork/gamecore/render/DisplaySystem.java @@ -6,7 +6,7 @@ import static org.lwjgl.opengl.GL11.*; import java.nio.ByteBuffer; import mightypork.dynmath.rect.Rect; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.dynmath.vect.Vect; import mightypork.gamecore.core.modules.AppAccess; import mightypork.gamecore.core.modules.AppModule; diff --git a/src/mightypork/gamecore/util/math/timing/TimedTask.java b/src/mightypork/gamecore/util/math/timing/TimedTask.java index 21c5e5a..b9c0cbe 100644 --- a/src/mightypork/gamecore/util/math/timing/TimedTask.java +++ b/src/mightypork/gamecore/util/math/timing/TimedTask.java @@ -1,8 +1,7 @@ package mightypork.gamecore.util.math.timing; -import mightypork.gamecore.util.math.timing.animation.NumAnimated; - +import mightypork.gamecore.util.math.timing.animation.NumAnimated; /** diff --git a/src/mightypork/rogue/screens/FpsOverlay.java b/src/mightypork/rogue/screens/FpsOverlay.java index c5615b3..b9a22ae 100644 --- a/src/mightypork/rogue/screens/FpsOverlay.java +++ b/src/mightypork/rogue/screens/FpsOverlay.java @@ -2,7 +2,7 @@ package mightypork.rogue.screens; import mightypork.dynmath.num.Num; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.dynmath.vect.Vect; import mightypork.gamecore.core.Config; import mightypork.gamecore.core.modules.AppAccess; diff --git a/src/mightypork/rogue/screens/game/IngameNav.java b/src/mightypork/rogue/screens/game/IngameNav.java index 8cdd2c3..f7f9b2e 100644 --- a/src/mightypork/rogue/screens/game/IngameNav.java +++ b/src/mightypork/rogue/screens/game/IngameNav.java @@ -2,7 +2,7 @@ package mightypork.rogue.screens.game; import mightypork.dynmath.rect.Rect; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.gamecore.core.modules.AppAccess; import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.LayoutComponent; diff --git a/src/mightypork/rogue/world/level/render/TileRenderContext.java b/src/mightypork/rogue/world/level/render/TileRenderContext.java index 8b86ac5..98e699d 100644 --- a/src/mightypork/rogue/world/level/render/TileRenderContext.java +++ b/src/mightypork/rogue/world/level/render/TileRenderContext.java @@ -2,7 +2,7 @@ package mightypork.rogue.world.level.render; import mightypork.dynmath.rect.Rect; -import mightypork.dynmath.rect.proxy.RectBound; +import mightypork.dynmath.rect.RectBound; import mightypork.gamecore.util.math.algo.Coord; import mightypork.gamecore.util.math.algo.Move; import mightypork.gamecore.util.math.noise.NoiseGen; diff --git a/src/mightypork/rogue/world/tile/DroppedItemRenderer.java b/src/mightypork/rogue/world/tile/DroppedItemRenderer.java index 86b4719..e96833d 100644 --- a/src/mightypork/rogue/world/tile/DroppedItemRenderer.java +++ b/src/mightypork/rogue/world/tile/DroppedItemRenderer.java @@ -4,9 +4,9 @@ package mightypork.rogue.world.tile; import java.util.Collection; import mightypork.dynmath.num.Num; -import mightypork.dynmath.num.proxy.NumBoundAdapter; +import mightypork.dynmath.num.proxy.NumProxy; import mightypork.dynmath.rect.Rect; -import mightypork.dynmath.rect.proxy.RectBoundAdapter; +import mightypork.dynmath.rect.proxy.RectProxy; import mightypork.gamecore.util.math.Easing; import mightypork.gamecore.util.math.timing.animation.Animator; import mightypork.gamecore.util.math.timing.animation.AnimatorBounce; @@ -19,8 +19,8 @@ public class DroppedItemRenderer { private final Animator itemAnim = new AnimatorBounce(2, Easing.SINE_BOTH); // prepared constraints, to avoid re-building each frame - private final RectBoundAdapter tileRectAdapter = new RectBoundAdapter(); - private final NumBoundAdapter offsAdapter = new NumBoundAdapter(); + private final RectProxy tileRectAdapter = new RectProxy(); + private final NumProxy offsAdapter = new NumProxy(); private final Rect itemRect = tileRectAdapter.shrink(tileRectAdapter.height().perc(12)).moveY(offsAdapter.neg().mul(tileRectAdapter.height().mul(0.2)));