diff --git a/src/mightypork/gamecore/audio/DeferredAudio.java b/src/mightypork/gamecore/audio/DeferredAudio.java index 7235a15..693b94e 100644 --- a/src/mightypork/gamecore/audio/DeferredAudio.java +++ b/src/mightypork/gamecore/audio/DeferredAudio.java @@ -4,9 +4,9 @@ package mightypork.gamecore.audio; import java.io.IOException; import mightypork.gamecore.loading.DeferredResource; +import mightypork.util.constraints.vect.Vect; import mightypork.util.files.FileUtils; import mightypork.util.logging.LogAlias; -import mightypork.util.math.constraints.vect.Vect; import org.newdawn.slick.openal.Audio; import org.newdawn.slick.openal.SoundStore; diff --git a/src/mightypork/gamecore/audio/SoundSystem.java b/src/mightypork/gamecore/audio/SoundSystem.java index 57f6302..5612211 100644 --- a/src/mightypork/gamecore/audio/SoundSystem.java +++ b/src/mightypork/gamecore/audio/SoundSystem.java @@ -9,11 +9,11 @@ import mightypork.gamecore.audio.players.EffectPlayer; import mightypork.gamecore.audio.players.LoopPlayer; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.events.ResourceLoadRequest; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.mutable.VectVar; import mightypork.util.control.eventbus.clients.RootBusNode; import mightypork.util.control.timing.Updateable; import mightypork.util.math.Calc.Buffers; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.mutable.VectVar; import org.lwjgl.openal.AL; import org.lwjgl.openal.AL10; diff --git a/src/mightypork/gamecore/audio/players/EffectPlayer.java b/src/mightypork/gamecore/audio/players/EffectPlayer.java index 1e24187..922503b 100644 --- a/src/mightypork/gamecore/audio/players/EffectPlayer.java +++ b/src/mightypork/gamecore/audio/players/EffectPlayer.java @@ -3,7 +3,7 @@ package mightypork.gamecore.audio.players; import mightypork.gamecore.audio.DeferredAudio; import mightypork.gamecore.audio.Volume; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/audio/players/LoopPlayer.java b/src/mightypork/gamecore/audio/players/LoopPlayer.java index f734b32..6e4a041 100644 --- a/src/mightypork/gamecore/audio/players/LoopPlayer.java +++ b/src/mightypork/gamecore/audio/players/LoopPlayer.java @@ -3,9 +3,9 @@ package mightypork.gamecore.audio.players; import mightypork.gamecore.audio.DeferredAudio; import mightypork.gamecore.audio.Volume; +import mightypork.util.constraints.num.mutable.NumAnimated; import mightypork.util.control.timing.Pauseable; import mightypork.util.control.timing.Updateable; -import mightypork.util.math.constraints.num.mutable.NumAnimated; import org.lwjgl.openal.AL10; diff --git a/src/mightypork/gamecore/control/events/MouseButtonEvent.java b/src/mightypork/gamecore/control/events/MouseButtonEvent.java index 385aafe..c520055 100644 --- a/src/mightypork/gamecore/control/events/MouseButtonEvent.java +++ b/src/mightypork/gamecore/control/events/MouseButtonEvent.java @@ -1,9 +1,9 @@ package mightypork.gamecore.control.events; +import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.vect.Vect; import mightypork.util.control.eventbus.events.Event; -import mightypork.util.math.constraints.rect.proxy.RectBound; -import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/control/events/MouseMotionEvent.java b/src/mightypork/gamecore/control/events/MouseMotionEvent.java index 5ba5ed2..45c700c 100644 --- a/src/mightypork/gamecore/control/events/MouseMotionEvent.java +++ b/src/mightypork/gamecore/control/events/MouseMotionEvent.java @@ -1,10 +1,10 @@ package mightypork.gamecore.control.events; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.VectConst; import mightypork.util.control.eventbus.events.Event; import mightypork.util.control.eventbus.events.flags.UnloggedEvent; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.VectConst; /** diff --git a/src/mightypork/gamecore/control/events/ScreenChangeEvent.java b/src/mightypork/gamecore/control/events/ScreenChangeEvent.java index 0ffb582..b4d45ef 100644 --- a/src/mightypork/gamecore/control/events/ScreenChangeEvent.java +++ b/src/mightypork/gamecore/control/events/ScreenChangeEvent.java @@ -1,8 +1,8 @@ package mightypork.gamecore.control.events; +import mightypork.util.constraints.vect.Vect; import mightypork.util.control.eventbus.events.Event; -import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/gui/components/Component.java b/src/mightypork/gamecore/gui/components/Component.java index 3e1629f..80e21f6 100644 --- a/src/mightypork/gamecore/gui/components/Component.java +++ b/src/mightypork/gamecore/gui/components/Component.java @@ -2,8 +2,8 @@ package mightypork.gamecore.gui.components; import mightypork.gamecore.gui.Hideable; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/LayoutComponent.java b/src/mightypork/gamecore/gui/components/LayoutComponent.java index 79015a0..bd32e3e 100644 --- a/src/mightypork/gamecore/gui/components/LayoutComponent.java +++ b/src/mightypork/gamecore/gui/components/LayoutComponent.java @@ -9,10 +9,10 @@ import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppSubModule; import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.render.DisplaySystem; +import mightypork.util.constraints.rect.proxy.RectBound; import mightypork.util.control.Enableable; import mightypork.util.control.eventbus.EventBus; import mightypork.util.control.eventbus.clients.ClientHub; -import mightypork.util.math.constraints.rect.proxy.RectBound; public abstract class LayoutComponent extends VisualComponent implements Enableable, ClientHub, AppAccess { diff --git a/src/mightypork/gamecore/gui/components/PluggableRenderable.java b/src/mightypork/gamecore/gui/components/PluggableRenderable.java index bbbe0ad..bb6dfc2 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.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.proxy.PluggableRectBound; -import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.proxy.PluggableRectBound; +import mightypork.util.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/VisualComponent.java b/src/mightypork/gamecore/gui/components/VisualComponent.java index 6298ccc..bb943c9 100644 --- a/src/mightypork/gamecore/gui/components/VisualComponent.java +++ b/src/mightypork/gamecore/gui/components/VisualComponent.java @@ -3,10 +3,10 @@ package mightypork.gamecore.gui.components; import mightypork.gamecore.control.events.LayoutChangeEvent; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.caching.AbstractRectCache; -import mightypork.util.math.constraints.rect.proxy.RectBound; -import mightypork.util.math.constraints.rect.proxy.RectBoundAdapter; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.caching.AbstractRectCache; +import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.rect.proxy.RectBoundAdapter; /** diff --git a/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java b/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java index 9742581..6082ada 100644 --- a/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java +++ b/src/mightypork/gamecore/gui/components/layout/ColumnHolder.java @@ -4,8 +4,8 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; -import mightypork.util.math.constraints.rect.builders.TiledRect; -import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.rect.builders.TiledRect; +import mightypork.util.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java b/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java index 2e54a37..12aa24e 100644 --- a/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java @@ -4,7 +4,7 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; -import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/layout/HorizontalFixedFlowLayout.java b/src/mightypork/gamecore/gui/components/layout/HorizontalFixedFlowLayout.java index 9c88258..7346c79 100644 --- a/src/mightypork/gamecore/gui/components/layout/HorizontalFixedFlowLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/HorizontalFixedFlowLayout.java @@ -5,9 +5,9 @@ import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/layout/RowHolder.java b/src/mightypork/gamecore/gui/components/layout/RowHolder.java index a18ed81..24261ff 100644 --- a/src/mightypork/gamecore/gui/components/layout/RowHolder.java +++ b/src/mightypork/gamecore/gui/components/layout/RowHolder.java @@ -4,8 +4,8 @@ package mightypork.gamecore.gui.components.layout; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; -import mightypork.util.math.constraints.rect.builders.TiledRect; -import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.rect.builders.TiledRect; +import mightypork.util.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/layout/VerticalFixedFlowLayout.java b/src/mightypork/gamecore/gui/components/layout/VerticalFixedFlowLayout.java index 75c38cd..6d9704c 100644 --- a/src/mightypork/gamecore/gui/components/layout/VerticalFixedFlowLayout.java +++ b/src/mightypork/gamecore/gui/components/layout/VerticalFixedFlowLayout.java @@ -5,9 +5,9 @@ import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.gui.AlignY; import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.LayoutComponent; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.proxy.RectBound; /** diff --git a/src/mightypork/gamecore/gui/components/painters/TextPainter.java b/src/mightypork/gamecore/gui/components/painters/TextPainter.java index 39d8e50..d9ee7d0 100644 --- a/src/mightypork/gamecore/gui/components/painters/TextPainter.java +++ b/src/mightypork/gamecore/gui/components/painters/TextPainter.java @@ -5,9 +5,9 @@ import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.components.VisualComponent; import mightypork.gamecore.render.fonts.FontRenderer; import mightypork.gamecore.render.fonts.GLFont; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.vect.Vect; import mightypork.util.math.color.Color; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.vect.Vect; import mightypork.util.string.StringProvider; import mightypork.util.string.StringProvider.StringWrapper; diff --git a/src/mightypork/gamecore/gui/screens/LayeredScreen.java b/src/mightypork/gamecore/gui/screens/LayeredScreen.java index 0cbfcb6..54213a9 100644 --- a/src/mightypork/gamecore/gui/screens/LayeredScreen.java +++ b/src/mightypork/gamecore/gui/screens/LayeredScreen.java @@ -5,7 +5,7 @@ import java.util.Collection; import java.util.TreeSet; import mightypork.gamecore.control.AppAccess; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/gui/screens/Screen.java b/src/mightypork/gamecore/gui/screens/Screen.java index 5113a07..1cd8b90 100644 --- a/src/mightypork/gamecore/gui/screens/Screen.java +++ b/src/mightypork/gamecore/gui/screens/Screen.java @@ -11,9 +11,9 @@ import mightypork.gamecore.input.KeyBindingPool; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.render.Render; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.proxy.RectBound; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/gui/screens/ScreenLayer.java b/src/mightypork/gamecore/gui/screens/ScreenLayer.java index a233d60..ae2b60f 100644 --- a/src/mightypork/gamecore/gui/screens/ScreenLayer.java +++ b/src/mightypork/gamecore/gui/screens/ScreenLayer.java @@ -12,8 +12,8 @@ import mightypork.gamecore.input.KeyBinder; import mightypork.gamecore.input.KeyBindingPool; import mightypork.gamecore.input.KeyStroke; import mightypork.util.annotations.DefaultImpl; +import mightypork.util.constraints.vect.Vect; import mightypork.util.control.timing.Updateable; -import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/input/InputSystem.java b/src/mightypork/gamecore/input/InputSystem.java index 8ac3801..859d2a3 100644 --- a/src/mightypork/gamecore/input/InputSystem.java +++ b/src/mightypork/gamecore/input/InputSystem.java @@ -7,10 +7,10 @@ import mightypork.gamecore.control.events.MouseButtonEvent; import mightypork.gamecore.control.events.MouseMotionEvent; import mightypork.rogue.events.ActionRequest; import mightypork.rogue.events.ActionRequest.RequestType; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.mutable.VectVar; import mightypork.util.control.eventbus.clients.RootBusNode; import mightypork.util.control.timing.Updateable; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.mutable.VectVar; import org.lwjgl.LWJGLException; import org.lwjgl.input.Keyboard; diff --git a/src/mightypork/gamecore/render/DisplaySystem.java b/src/mightypork/gamecore/render/DisplaySystem.java index 2d1b276..5b5a945 100644 --- a/src/mightypork/gamecore/render/DisplaySystem.java +++ b/src/mightypork/gamecore/render/DisplaySystem.java @@ -8,11 +8,11 @@ import java.nio.ByteBuffer; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppModule; import mightypork.gamecore.control.events.ScreenChangeEvent; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.vect.Vect; import mightypork.util.control.timing.FpsMeter; import mightypork.util.logging.Log; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.proxy.RectBound; -import mightypork.util.math.constraints.vect.Vect; import org.lwjgl.BufferUtils; import org.lwjgl.LWJGLException; diff --git a/src/mightypork/gamecore/render/Render.java b/src/mightypork/gamecore/render/Render.java index 809bae7..30025e6 100644 --- a/src/mightypork/gamecore/render/Render.java +++ b/src/mightypork/gamecore/render/Render.java @@ -6,13 +6,13 @@ import static org.lwjgl.opengl.GL11.*; import java.io.IOException; import mightypork.gamecore.render.textures.TxQuad; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.caching.RectDigest; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.VectConst; import mightypork.util.files.FileUtils; import mightypork.util.logging.Log; import mightypork.util.math.color.Color; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.caching.RectDigest; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.VectConst; import org.lwjgl.opengl.GL11; import org.newdawn.slick.opengl.Texture; diff --git a/src/mightypork/gamecore/render/fonts/FontRenderer.java b/src/mightypork/gamecore/render/fonts/FontRenderer.java index 8cb6d43..2ea3e95 100644 --- a/src/mightypork/gamecore/render/fonts/FontRenderer.java +++ b/src/mightypork/gamecore/render/fonts/FontRenderer.java @@ -3,9 +3,9 @@ package mightypork.gamecore.render.fonts; import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.render.Render; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.vect.Vect; import mightypork.util.math.color.Color; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/render/fonts/GLFont.java b/src/mightypork/gamecore/render/fonts/GLFont.java index 3aa5b93..4266d46 100644 --- a/src/mightypork/gamecore/render/fonts/GLFont.java +++ b/src/mightypork/gamecore/render/fonts/GLFont.java @@ -1,8 +1,8 @@ package mightypork.gamecore.render.fonts; +import mightypork.util.constraints.vect.Vect; import mightypork.util.math.color.Color; -import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/render/fonts/impl/CachedFont.java b/src/mightypork/gamecore/render/fonts/impl/CachedFont.java index 07e2ffb..7c3abde 100644 --- a/src/mightypork/gamecore/render/fonts/impl/CachedFont.java +++ b/src/mightypork/gamecore/render/fonts/impl/CachedFont.java @@ -20,10 +20,10 @@ import java.util.Map; import mightypork.gamecore.render.fonts.GLFont; import mightypork.gamecore.render.textures.FilterMode; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.VectConst; import mightypork.util.logging.Log; import mightypork.util.math.color.Color; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.VectConst; import org.lwjgl.BufferUtils; import org.lwjgl.util.glu.GLU; diff --git a/src/mightypork/gamecore/render/fonts/impl/DeferredFont.java b/src/mightypork/gamecore/render/fonts/impl/DeferredFont.java index c844bc9..d74ed41 100644 --- a/src/mightypork/gamecore/render/fonts/impl/DeferredFont.java +++ b/src/mightypork/gamecore/render/fonts/impl/DeferredFont.java @@ -10,10 +10,10 @@ import mightypork.gamecore.loading.DeferredResource; import mightypork.gamecore.loading.MustLoadInMainThread; import mightypork.gamecore.render.fonts.GLFont; import mightypork.gamecore.render.textures.FilterMode; +import mightypork.util.constraints.vect.Vect; import mightypork.util.files.FileUtils; import mightypork.util.logging.LogAlias; import mightypork.util.math.color.Color; -import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/gamecore/render/textures/DeferredTexture.java b/src/mightypork/gamecore/render/textures/DeferredTexture.java index 3e55cad..bd8c9b1 100644 --- a/src/mightypork/gamecore/render/textures/DeferredTexture.java +++ b/src/mightypork/gamecore/render/textures/DeferredTexture.java @@ -4,8 +4,8 @@ package mightypork.gamecore.render.textures; import mightypork.gamecore.loading.DeferredResource; import mightypork.gamecore.loading.MustLoadInMainThread; import mightypork.gamecore.render.Render; +import mightypork.util.constraints.rect.Rect; import mightypork.util.logging.LogAlias; -import mightypork.util.math.constraints.rect.Rect; import org.lwjgl.opengl.GL11; import org.newdawn.slick.opengl.Texture; diff --git a/src/mightypork/gamecore/render/textures/TextureBank.java b/src/mightypork/gamecore/render/textures/TextureBank.java index dd08083..bd8d31b 100644 --- a/src/mightypork/gamecore/render/textures/TextureBank.java +++ b/src/mightypork/gamecore/render/textures/TextureBank.java @@ -6,7 +6,7 @@ import java.util.HashMap; import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppAdapter; import mightypork.gamecore.control.events.ResourceLoadRequest; -import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.constraints.rect.Rect; import org.newdawn.slick.opengl.Texture; diff --git a/src/mightypork/gamecore/render/textures/TxQuad.java b/src/mightypork/gamecore/render/textures/TxQuad.java index 68f2533..8611dbf 100644 --- a/src/mightypork/gamecore/render/textures/TxQuad.java +++ b/src/mightypork/gamecore/render/textures/TxQuad.java @@ -1,7 +1,7 @@ package mightypork.gamecore.render.textures; -import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.constraints.rect.Rect; import org.newdawn.slick.opengl.Texture; diff --git a/src/mightypork/rogue/screens/LayerFps.java b/src/mightypork/rogue/screens/LayerFps.java index d6bd575..a81ed32 100644 --- a/src/mightypork/rogue/screens/LayerFps.java +++ b/src/mightypork/rogue/screens/LayerFps.java @@ -9,10 +9,10 @@ import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.Keys; import mightypork.gamecore.render.fonts.GLFont; import mightypork.rogue.Res; +import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.vect.Vect; import mightypork.util.control.Action; import mightypork.util.math.color.Color; -import mightypork.util.math.constraints.rect.proxy.RectBound; -import mightypork.util.math.constraints.vect.Vect; import mightypork.util.string.StringProvider; diff --git a/src/mightypork/rogue/screens/main_menu/MenuLayer.java b/src/mightypork/rogue/screens/main_menu/MenuLayer.java index 350b02c..08006f0 100644 --- a/src/mightypork/rogue/screens/main_menu/MenuLayer.java +++ b/src/mightypork/rogue/screens/main_menu/MenuLayer.java @@ -6,14 +6,12 @@ import mightypork.gamecore.gui.AlignY; import mightypork.gamecore.gui.components.layout.VerticalFixedFlowLayout; import mightypork.gamecore.gui.screens.Screen; import mightypork.gamecore.gui.screens.ScreenLayer; -import mightypork.gamecore.render.fonts.GLFont; -import mightypork.rogue.Res; import mightypork.rogue.events.ActionRequest; import mightypork.rogue.events.ActionRequest.RequestType; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.rect.Rect; import mightypork.util.control.Action; import mightypork.util.math.color.Color; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.rect.Rect; class MenuLayer extends ScreenLayer { @@ -34,7 +32,6 @@ class MenuLayer extends ScreenLayer { VerticalFixedFlowLayout layout = new VerticalFixedFlowLayout(root, menuBox, lineHeight, AlignY.TOP); root.add(layout); - GLFont f = Res.getFont("press_start"); MenuButton b1, b2, b3, b4; layout.add(b1 = new MenuButton("Render test", Color.WHITE)); layout.add(b2 = new MenuButton("Bouncy Cubes", Color.CYAN)); diff --git a/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java b/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java index bc00302..35c72c9 100644 --- a/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java +++ b/src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java @@ -5,13 +5,13 @@ import java.util.Random; import mightypork.gamecore.gui.components.VisualComponent; import mightypork.gamecore.render.Render; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.num.mutable.NumAnimated; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.caching.RectCache; import mightypork.util.control.timing.Updateable; import mightypork.util.math.Easing; import mightypork.util.math.color.Color; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.num.mutable.NumAnimated; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.caching.RectCache; public class BouncyBox extends VisualComponent implements Updateable { diff --git a/src/mightypork/rogue/screens/test_bouncyboxes/LayerBouncyBoxes.java b/src/mightypork/rogue/screens/test_bouncyboxes/LayerBouncyBoxes.java index c91750e..940d617 100644 --- a/src/mightypork/rogue/screens/test_bouncyboxes/LayerBouncyBoxes.java +++ b/src/mightypork/rogue/screens/test_bouncyboxes/LayerBouncyBoxes.java @@ -12,9 +12,9 @@ import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.Keys; import mightypork.rogue.Res; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.vect.Vect; import mightypork.util.math.color.Color; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.vect.Vect; public class LayerBouncyBoxes extends ScreenLayer { diff --git a/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java b/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java index 019ec04..6cde594 100644 --- a/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java +++ b/src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java @@ -13,12 +13,12 @@ import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.Keys; import mightypork.rogue.Res; +import mightypork.util.constraints.num.mutable.NumAnimated; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.mutable.VectAnimated; import mightypork.util.math.Easing; import mightypork.util.math.color.Color; -import mightypork.util.math.constraints.num.mutable.NumAnimated; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.mutable.VectAnimated; public class LayerFlyingCat extends ScreenLayer implements MouseButtonEvent.Listener { diff --git a/src/mightypork/rogue/screens/test_render/LayerTestGradient.java b/src/mightypork/rogue/screens/test_render/LayerTestGradient.java index 97c089b..7673169 100644 --- a/src/mightypork/rogue/screens/test_render/LayerTestGradient.java +++ b/src/mightypork/rogue/screens/test_render/LayerTestGradient.java @@ -4,8 +4,8 @@ package mightypork.rogue.screens.test_render; import mightypork.gamecore.gui.screens.Screen; import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.gamecore.render.Render; +import mightypork.util.constraints.rect.proxy.RectBound; import mightypork.util.math.color.Color; -import mightypork.util.math.constraints.rect.proxy.RectBound; public class LayerTestGradient extends ScreenLayer { diff --git a/src/mightypork/test/TestConstCaching.java b/src/mightypork/test/TestConstCaching.java index e7ce2c1..2470877 100644 --- a/src/mightypork/test/TestConstCaching.java +++ b/src/mightypork/test/TestConstCaching.java @@ -1,9 +1,9 @@ package mightypork.test; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.caching.VectCache; -import mightypork.util.math.constraints.vect.mutable.VectVar; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.caching.VectCache; +import mightypork.util.constraints.vect.mutable.VectVar; public class TestConstCaching { diff --git a/src/mightypork/test/TestConstr.java b/src/mightypork/test/TestConstr.java index a613fa7..a4e830b 100644 --- a/src/mightypork/test/TestConstr.java +++ b/src/mightypork/test/TestConstr.java @@ -3,13 +3,13 @@ package mightypork.test; import java.util.Locale; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.num.mutable.NumVar; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.RectConst; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.VectConst; -import mightypork.util.math.constraints.vect.mutable.VectVar; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.num.mutable.NumVar; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.RectConst; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.VectConst; +import mightypork.util.constraints.vect.mutable.VectVar; public class TestConstr { diff --git a/src/mightypork/test/TestCoords.java b/src/mightypork/test/TestCoords.java index 5a49036..2a55a2c 100644 --- a/src/mightypork/test/TestCoords.java +++ b/src/mightypork/test/TestCoords.java @@ -1,10 +1,10 @@ package mightypork.test; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.num.mutable.NumVar; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.mutable.VectVar; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.num.mutable.NumVar; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.mutable.VectVar; public class TestCoords { diff --git a/src/mightypork/test/TestTiled.java b/src/mightypork/test/TestTiled.java index 1aa00ca..b264c3b 100644 --- a/src/mightypork/test/TestTiled.java +++ b/src/mightypork/test/TestTiled.java @@ -1,9 +1,9 @@ package mightypork.test; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.num.mutable.NumVar; -import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.num.mutable.NumVar; +import mightypork.util.constraints.rect.Rect; public class TestTiled { diff --git a/src/mightypork/test/TestVec.java b/src/mightypork/test/TestVec.java index cfda41e..6a60431 100644 --- a/src/mightypork/test/TestVec.java +++ b/src/mightypork/test/TestVec.java @@ -1,9 +1,9 @@ package mightypork.test; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.VectConst; -import mightypork.util.math.constraints.vect.mutable.VectVar; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.VectConst; +import mightypork.util.constraints.vect.mutable.VectVar; public class TestVec { diff --git a/src/mightypork/util/config/PropertyManager.java b/src/mightypork/util/config/PropertyManager.java index 1a9c7f6..ee74e8f 100644 --- a/src/mightypork/util/config/PropertyManager.java +++ b/src/mightypork/util/config/PropertyManager.java @@ -9,9 +9,9 @@ import java.util.ArrayList; import java.util.Map.Entry; import java.util.TreeMap; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.VectConst; import mightypork.util.math.Range; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.VectConst; import mightypork.util.objects.Convert; diff --git a/src/mightypork/util/math/constraints/ConstraintCache.java b/src/mightypork/util/constraints/ConstraintCache.java similarity index 93% rename from src/mightypork/util/math/constraints/ConstraintCache.java rename to src/mightypork/util/constraints/ConstraintCache.java index d690398..940a292 100644 --- a/src/mightypork/util/math/constraints/ConstraintCache.java +++ b/src/mightypork/util/constraints/ConstraintCache.java @@ -1,4 +1,4 @@ -package mightypork.util.math.constraints; +package mightypork.util.constraints; /** diff --git a/src/mightypork/util/math/constraints/DigestCache.java b/src/mightypork/util/constraints/DigestCache.java similarity index 95% rename from src/mightypork/util/math/constraints/DigestCache.java rename to src/mightypork/util/constraints/DigestCache.java index af88dc4..b61dcab 100644 --- a/src/mightypork/util/math/constraints/DigestCache.java +++ b/src/mightypork/util/constraints/DigestCache.java @@ -1,4 +1,4 @@ -package mightypork.util.math.constraints; +package mightypork.util.constraints; /** diff --git a/src/mightypork/util/math/constraints/Digestable.java b/src/mightypork/util/constraints/Digestable.java similarity index 97% rename from src/mightypork/util/math/constraints/Digestable.java rename to src/mightypork/util/constraints/Digestable.java index 7d85ad9..94e32d9 100644 --- a/src/mightypork/util/math/constraints/Digestable.java +++ b/src/mightypork/util/constraints/Digestable.java @@ -1,4 +1,4 @@ -package mightypork.util.math.constraints; +package mightypork.util.constraints; /** diff --git a/src/mightypork/util/math/constraints/Pollable.java b/src/mightypork/util/constraints/Pollable.java similarity index 78% rename from src/mightypork/util/math/constraints/Pollable.java rename to src/mightypork/util/constraints/Pollable.java index d838aae..8a2e5b4 100644 --- a/src/mightypork/util/math/constraints/Pollable.java +++ b/src/mightypork/util/constraints/Pollable.java @@ -1,4 +1,4 @@ -package mightypork.util.math.constraints; +package mightypork.util.constraints; /** diff --git a/src/mightypork/util/math/constraints/Poller.java b/src/mightypork/util/constraints/Poller.java similarity index 93% rename from src/mightypork/util/math/constraints/Poller.java rename to src/mightypork/util/constraints/Poller.java index c188e99..5ef48a2 100644 --- a/src/mightypork/util/math/constraints/Poller.java +++ b/src/mightypork/util/constraints/Poller.java @@ -1,4 +1,4 @@ -package mightypork.util.math.constraints; +package mightypork.util.constraints; import java.util.LinkedHashSet; diff --git a/src/mightypork/util/math/constraints/num/Num.java b/src/mightypork/util/constraints/num/Num.java similarity index 95% rename from src/mightypork/util/math/constraints/num/Num.java rename to src/mightypork/util/constraints/num/Num.java index 5e87608..131d940 100644 --- a/src/mightypork/util/math/constraints/num/Num.java +++ b/src/mightypork/util/constraints/num/Num.java @@ -1,15 +1,15 @@ -package mightypork.util.math.constraints.num; +package mightypork.util.constraints.num; import mightypork.util.annotations.FactoryMethod; +import mightypork.util.constraints.DigestCache; +import mightypork.util.constraints.Digestable; +import mightypork.util.constraints.num.caching.NumCache; +import mightypork.util.constraints.num.caching.NumDigest; +import mightypork.util.constraints.num.mutable.NumVar; +import mightypork.util.constraints.num.proxy.NumBound; +import mightypork.util.constraints.num.proxy.NumBoundAdapter; import mightypork.util.math.Calc; -import mightypork.util.math.constraints.DigestCache; -import mightypork.util.math.constraints.Digestable; -import mightypork.util.math.constraints.num.caching.NumCache; -import mightypork.util.math.constraints.num.caching.NumDigest; -import mightypork.util.math.constraints.num.mutable.NumVar; -import mightypork.util.math.constraints.num.proxy.NumBound; -import mightypork.util.math.constraints.num.proxy.NumBoundAdapter; public abstract class Num implements NumBound, Digestable { diff --git a/src/mightypork/util/math/constraints/num/NumConst.java b/src/mightypork/util/constraints/num/NumConst.java similarity index 96% rename from src/mightypork/util/math/constraints/num/NumConst.java rename to src/mightypork/util/constraints/num/NumConst.java index dd70f22..4209137 100644 --- a/src/mightypork/util/math/constraints/num/NumConst.java +++ b/src/mightypork/util/constraints/num/NumConst.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.num; +package mightypork.util.constraints.num; -import mightypork.util.math.constraints.num.caching.NumDigest; +import mightypork.util.constraints.num.caching.NumDigest; /** diff --git a/src/mightypork/util/math/constraints/num/caching/AbstractNumCache.java b/src/mightypork/util/constraints/num/caching/AbstractNumCache.java similarity index 81% rename from src/mightypork/util/math/constraints/num/caching/AbstractNumCache.java rename to src/mightypork/util/constraints/num/caching/AbstractNumCache.java index e7df0cf..933967e 100644 --- a/src/mightypork/util/math/constraints/num/caching/AbstractNumCache.java +++ b/src/mightypork/util/constraints/num/caching/AbstractNumCache.java @@ -1,10 +1,10 @@ -package mightypork.util.math.constraints.num.caching; +package mightypork.util.constraints.num.caching; -import mightypork.util.math.constraints.ConstraintCache; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.num.mutable.NumVar; -import mightypork.util.math.constraints.num.proxy.NumAdapter; +import mightypork.util.constraints.ConstraintCache; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.num.mutable.NumVar; +import mightypork.util.constraints.num.proxy.NumAdapter; /** diff --git a/src/mightypork/util/math/constraints/num/caching/NumCache.java b/src/mightypork/util/constraints/num/caching/NumCache.java similarity index 79% rename from src/mightypork/util/math/constraints/num/caching/NumCache.java rename to src/mightypork/util/constraints/num/caching/NumCache.java index 10eabe6..ec798fc 100644 --- a/src/mightypork/util/math/constraints/num/caching/NumCache.java +++ b/src/mightypork/util/constraints/num/caching/NumCache.java @@ -1,8 +1,8 @@ -package mightypork.util.math.constraints.num.caching; +package mightypork.util.constraints.num.caching; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.math.constraints.num.Num; +import mightypork.util.constraints.num.Num; /** diff --git a/src/mightypork/util/math/constraints/num/caching/NumDigest.java b/src/mightypork/util/constraints/num/caching/NumDigest.java similarity index 67% rename from src/mightypork/util/math/constraints/num/caching/NumDigest.java rename to src/mightypork/util/constraints/num/caching/NumDigest.java index a00287c..1b16ccd 100644 --- a/src/mightypork/util/math/constraints/num/caching/NumDigest.java +++ b/src/mightypork/util/constraints/num/caching/NumDigest.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.num.caching; +package mightypork.util.constraints.num.caching; -import mightypork.util.math.constraints.num.Num; +import mightypork.util.constraints.num.Num; public class NumDigest { diff --git a/src/mightypork/util/math/constraints/num/mutable/NumAnimated.java b/src/mightypork/util/constraints/num/mutable/NumAnimated.java similarity index 99% rename from src/mightypork/util/math/constraints/num/mutable/NumAnimated.java rename to src/mightypork/util/constraints/num/mutable/NumAnimated.java index 78604f2..d1afcb7 100644 --- a/src/mightypork/util/math/constraints/num/mutable/NumAnimated.java +++ b/src/mightypork/util/constraints/num/mutable/NumAnimated.java @@ -1,4 +1,4 @@ -package mightypork.util.math.constraints.num.mutable; +package mightypork.util.constraints.num.mutable; import mightypork.util.control.timing.Pauseable; diff --git a/src/mightypork/util/math/constraints/num/mutable/NumAnimatedDeg.java b/src/mightypork/util/constraints/num/mutable/NumAnimatedDeg.java similarity index 94% rename from src/mightypork/util/math/constraints/num/mutable/NumAnimatedDeg.java rename to src/mightypork/util/constraints/num/mutable/NumAnimatedDeg.java index 34ae1a8..89fbbee 100644 --- a/src/mightypork/util/math/constraints/num/mutable/NumAnimatedDeg.java +++ b/src/mightypork/util/constraints/num/mutable/NumAnimatedDeg.java @@ -1,4 +1,4 @@ -package mightypork.util.math.constraints.num.mutable; +package mightypork.util.constraints.num.mutable; import mightypork.util.math.Calc; diff --git a/src/mightypork/util/math/constraints/num/mutable/NumAnimatedRad.java b/src/mightypork/util/constraints/num/mutable/NumAnimatedRad.java similarity index 94% rename from src/mightypork/util/math/constraints/num/mutable/NumAnimatedRad.java rename to src/mightypork/util/constraints/num/mutable/NumAnimatedRad.java index 38eafb7..a21cff4 100644 --- a/src/mightypork/util/math/constraints/num/mutable/NumAnimatedRad.java +++ b/src/mightypork/util/constraints/num/mutable/NumAnimatedRad.java @@ -1,4 +1,4 @@ -package mightypork.util.math.constraints.num.mutable; +package mightypork.util.constraints.num.mutable; import mightypork.util.math.Calc; diff --git a/src/mightypork/util/math/constraints/num/mutable/NumMutable.java b/src/mightypork/util/constraints/num/mutable/NumMutable.java similarity index 80% rename from src/mightypork/util/math/constraints/num/mutable/NumMutable.java rename to src/mightypork/util/constraints/num/mutable/NumMutable.java index f99e945..f8a5c05 100644 --- a/src/mightypork/util/math/constraints/num/mutable/NumMutable.java +++ b/src/mightypork/util/constraints/num/mutable/NumMutable.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.num.mutable; +package mightypork.util.constraints.num.mutable; -import mightypork.util.math.constraints.num.Num; +import mightypork.util.constraints.num.Num; /** diff --git a/src/mightypork/util/math/constraints/num/mutable/NumVar.java b/src/mightypork/util/constraints/num/mutable/NumVar.java similarity index 79% rename from src/mightypork/util/math/constraints/num/mutable/NumVar.java rename to src/mightypork/util/constraints/num/mutable/NumVar.java index 8ed9161..0d551b2 100644 --- a/src/mightypork/util/math/constraints/num/mutable/NumVar.java +++ b/src/mightypork/util/constraints/num/mutable/NumVar.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.num.mutable; +package mightypork.util.constraints.num.mutable; -import mightypork.util.math.constraints.num.Num; +import mightypork.util.constraints.num.Num; /** diff --git a/src/mightypork/util/math/constraints/num/proxy/NumAdapter.java b/src/mightypork/util/constraints/num/proxy/NumAdapter.java similarity index 62% rename from src/mightypork/util/math/constraints/num/proxy/NumAdapter.java rename to src/mightypork/util/constraints/num/proxy/NumAdapter.java index af87682..4ea7a8e 100644 --- a/src/mightypork/util/math/constraints/num/proxy/NumAdapter.java +++ b/src/mightypork/util/constraints/num/proxy/NumAdapter.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.num.proxy; +package mightypork.util.constraints.num.proxy; -import mightypork.util.math.constraints.num.Num; +import mightypork.util.constraints.num.Num; public abstract class NumAdapter extends Num { diff --git a/src/mightypork/util/math/constraints/num/proxy/NumBound.java b/src/mightypork/util/constraints/num/proxy/NumBound.java similarity index 58% rename from src/mightypork/util/math/constraints/num/proxy/NumBound.java rename to src/mightypork/util/constraints/num/proxy/NumBound.java index 662ab50..988df28 100644 --- a/src/mightypork/util/math/constraints/num/proxy/NumBound.java +++ b/src/mightypork/util/constraints/num/proxy/NumBound.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.num.proxy; +package mightypork.util.constraints.num.proxy; -import mightypork.util.math.constraints.num.Num; +import mightypork.util.constraints.num.Num; /** diff --git a/src/mightypork/util/math/constraints/num/proxy/NumBoundAdapter.java b/src/mightypork/util/constraints/num/proxy/NumBoundAdapter.java similarity index 79% rename from src/mightypork/util/math/constraints/num/proxy/NumBoundAdapter.java rename to src/mightypork/util/constraints/num/proxy/NumBoundAdapter.java index 3a8bed4..29158dc 100644 --- a/src/mightypork/util/math/constraints/num/proxy/NumBoundAdapter.java +++ b/src/mightypork/util/constraints/num/proxy/NumBoundAdapter.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.num.proxy; +package mightypork.util.constraints.num.proxy; -import mightypork.util.math.constraints.num.Num; +import mightypork.util.constraints.num.Num; public class NumBoundAdapter extends NumAdapter implements PluggableNumBound { diff --git a/src/mightypork/util/math/constraints/num/proxy/NumProxy.java b/src/mightypork/util/constraints/num/proxy/NumProxy.java similarity index 67% rename from src/mightypork/util/math/constraints/num/proxy/NumProxy.java rename to src/mightypork/util/constraints/num/proxy/NumProxy.java index 971e49d..7624d5a 100644 --- a/src/mightypork/util/math/constraints/num/proxy/NumProxy.java +++ b/src/mightypork/util/constraints/num/proxy/NumProxy.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.num.proxy; +package mightypork.util.constraints.num.proxy; -import mightypork.util.math.constraints.num.Num; +import mightypork.util.constraints.num.Num; public class NumProxy extends NumAdapter { diff --git a/src/mightypork/util/math/constraints/num/proxy/PluggableNumBound.java b/src/mightypork/util/constraints/num/proxy/PluggableNumBound.java similarity index 79% rename from src/mightypork/util/math/constraints/num/proxy/PluggableNumBound.java rename to src/mightypork/util/constraints/num/proxy/PluggableNumBound.java index 9f2b3ae..6daee3b 100644 --- a/src/mightypork/util/math/constraints/num/proxy/PluggableNumBound.java +++ b/src/mightypork/util/constraints/num/proxy/PluggableNumBound.java @@ -1,4 +1,4 @@ -package mightypork.util.math.constraints.num.proxy; +package mightypork.util.constraints.num.proxy; /** diff --git a/src/mightypork/util/math/constraints/rect/Rect.java b/src/mightypork/util/constraints/rect/Rect.java similarity index 94% rename from src/mightypork/util/math/constraints/rect/Rect.java rename to src/mightypork/util/constraints/rect/Rect.java index 97db88a..510dc53 100644 --- a/src/mightypork/util/math/constraints/rect/Rect.java +++ b/src/mightypork/util/constraints/rect/Rect.java @@ -1,20 +1,20 @@ -package mightypork.util.math.constraints.rect; +package mightypork.util.constraints.rect; import mightypork.util.annotations.FactoryMethod; -import mightypork.util.math.constraints.DigestCache; -import mightypork.util.math.constraints.Digestable; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.num.NumConst; -import mightypork.util.math.constraints.rect.builders.TiledRect; -import mightypork.util.math.constraints.rect.caching.RectCache; -import mightypork.util.math.constraints.rect.caching.RectDigest; -import mightypork.util.math.constraints.rect.mutable.RectVar; -import mightypork.util.math.constraints.rect.proxy.RectBound; -import mightypork.util.math.constraints.rect.proxy.RectBoundAdapter; -import mightypork.util.math.constraints.rect.proxy.RectVectAdapter; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.VectConst; +import mightypork.util.constraints.DigestCache; +import mightypork.util.constraints.Digestable; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.num.NumConst; +import mightypork.util.constraints.rect.builders.TiledRect; +import mightypork.util.constraints.rect.caching.RectCache; +import mightypork.util.constraints.rect.caching.RectDigest; +import mightypork.util.constraints.rect.mutable.RectVar; +import mightypork.util.constraints.rect.proxy.RectBound; +import mightypork.util.constraints.rect.proxy.RectBoundAdapter; +import mightypork.util.constraints.rect.proxy.RectVectAdapter; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.VectConst; /** diff --git a/src/mightypork/util/math/constraints/rect/RectConst.java b/src/mightypork/util/constraints/rect/RectConst.java similarity index 96% rename from src/mightypork/util/math/constraints/rect/RectConst.java rename to src/mightypork/util/constraints/rect/RectConst.java index 4a088d2..d532c57 100644 --- a/src/mightypork/util/math/constraints/rect/RectConst.java +++ b/src/mightypork/util/constraints/rect/RectConst.java @@ -1,10 +1,10 @@ -package mightypork.util.math.constraints.rect; +package mightypork.util.constraints.rect; -import mightypork.util.math.constraints.num.NumConst; -import mightypork.util.math.constraints.rect.caching.RectDigest; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.VectConst; +import mightypork.util.constraints.num.NumConst; +import mightypork.util.constraints.rect.caching.RectDigest; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.VectConst; /** diff --git a/src/mightypork/util/math/constraints/rect/builders/TiledRect.java b/src/mightypork/util/constraints/rect/builders/TiledRect.java similarity index 93% rename from src/mightypork/util/math/constraints/rect/builders/TiledRect.java rename to src/mightypork/util/constraints/rect/builders/TiledRect.java index d03f782..008848c 100644 --- a/src/mightypork/util/math/constraints/rect/builders/TiledRect.java +++ b/src/mightypork/util/constraints/rect/builders/TiledRect.java @@ -1,9 +1,9 @@ -package mightypork.util.math.constraints.rect.builders; +package mightypork.util.constraints.rect.builders; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.proxy.RectProxy; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.proxy.RectProxy; /** diff --git a/src/mightypork/util/math/constraints/rect/caching/AbstractRectCache.java b/src/mightypork/util/constraints/rect/caching/AbstractRectCache.java similarity index 78% rename from src/mightypork/util/math/constraints/rect/caching/AbstractRectCache.java rename to src/mightypork/util/constraints/rect/caching/AbstractRectCache.java index ec2e693..ce68c69 100644 --- a/src/mightypork/util/math/constraints/rect/caching/AbstractRectCache.java +++ b/src/mightypork/util/constraints/rect/caching/AbstractRectCache.java @@ -1,10 +1,10 @@ -package mightypork.util.math.constraints.rect.caching; +package mightypork.util.constraints.rect.caching; -import mightypork.util.math.constraints.ConstraintCache; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.mutable.RectVar; -import mightypork.util.math.constraints.rect.proxy.RectAdapter; +import mightypork.util.constraints.ConstraintCache; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.mutable.RectVar; +import mightypork.util.constraints.rect.proxy.RectAdapter; /** diff --git a/src/mightypork/util/math/constraints/rect/caching/RectCache.java b/src/mightypork/util/constraints/rect/caching/RectCache.java similarity index 78% rename from src/mightypork/util/math/constraints/rect/caching/RectCache.java rename to src/mightypork/util/constraints/rect/caching/RectCache.java index 7ae54e3..2cf5430 100644 --- a/src/mightypork/util/math/constraints/rect/caching/RectCache.java +++ b/src/mightypork/util/constraints/rect/caching/RectCache.java @@ -1,8 +1,8 @@ -package mightypork.util.math.constraints.rect.caching; +package mightypork.util.constraints.rect.caching; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.constraints.rect.Rect; /** diff --git a/src/mightypork/util/math/constraints/rect/caching/RectDigest.java b/src/mightypork/util/constraints/rect/caching/RectDigest.java similarity index 83% rename from src/mightypork/util/math/constraints/rect/caching/RectDigest.java rename to src/mightypork/util/constraints/rect/caching/RectDigest.java index 3530387..19fc0ff 100644 --- a/src/mightypork/util/math/constraints/rect/caching/RectDigest.java +++ b/src/mightypork/util/constraints/rect/caching/RectDigest.java @@ -1,8 +1,8 @@ -package mightypork.util.math.constraints.rect.caching; +package mightypork.util.constraints.rect.caching; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.rect.RectConst; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.rect.RectConst; public class RectDigest { diff --git a/src/mightypork/util/math/constraints/rect/mutable/RectMutable.java b/src/mightypork/util/constraints/rect/mutable/RectMutable.java similarity index 89% rename from src/mightypork/util/math/constraints/rect/mutable/RectMutable.java rename to src/mightypork/util/constraints/rect/mutable/RectMutable.java index 9a319d9..13d332c 100644 --- a/src/mightypork/util/math/constraints/rect/mutable/RectMutable.java +++ b/src/mightypork/util/constraints/rect/mutable/RectMutable.java @@ -1,8 +1,8 @@ -package mightypork.util.math.constraints.rect.mutable; +package mightypork.util.constraints.rect.mutable; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.vect.Vect; /** diff --git a/src/mightypork/util/math/constraints/rect/mutable/RectVar.java b/src/mightypork/util/constraints/rect/mutable/RectVar.java similarity index 79% rename from src/mightypork/util/math/constraints/rect/mutable/RectVar.java rename to src/mightypork/util/constraints/rect/mutable/RectVar.java index cf5a1ae..407147d 100644 --- a/src/mightypork/util/math/constraints/rect/mutable/RectVar.java +++ b/src/mightypork/util/constraints/rect/mutable/RectVar.java @@ -1,8 +1,8 @@ -package mightypork.util.math.constraints.rect.mutable; +package mightypork.util.constraints.rect.mutable; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.mutable.VectVar; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.mutable.VectVar; public class RectVar extends RectMutable { diff --git a/src/mightypork/util/math/constraints/rect/proxy/PluggableRectBound.java b/src/mightypork/util/constraints/rect/proxy/PluggableRectBound.java similarity index 79% rename from src/mightypork/util/math/constraints/rect/proxy/PluggableRectBound.java rename to src/mightypork/util/constraints/rect/proxy/PluggableRectBound.java index 14ef1c4..9f802bb 100644 --- a/src/mightypork/util/math/constraints/rect/proxy/PluggableRectBound.java +++ b/src/mightypork/util/constraints/rect/proxy/PluggableRectBound.java @@ -1,4 +1,4 @@ -package mightypork.util.math.constraints.rect.proxy; +package mightypork.util.constraints.rect.proxy; /** diff --git a/src/mightypork/util/math/constraints/rect/proxy/RectAdapter.java b/src/mightypork/util/constraints/rect/proxy/RectAdapter.java similarity index 79% rename from src/mightypork/util/math/constraints/rect/proxy/RectAdapter.java rename to src/mightypork/util/constraints/rect/proxy/RectAdapter.java index d4f3ef7..09b15ab 100644 --- a/src/mightypork/util/math/constraints/rect/proxy/RectAdapter.java +++ b/src/mightypork/util/constraints/rect/proxy/RectAdapter.java @@ -1,9 +1,9 @@ -package mightypork.util.math.constraints.rect.proxy; +package mightypork.util.constraints.rect.proxy; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.proxy.VectAdapter; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.proxy.VectAdapter; /** diff --git a/src/mightypork/util/math/constraints/rect/proxy/RectBound.java b/src/mightypork/util/constraints/rect/proxy/RectBound.java similarity index 59% rename from src/mightypork/util/math/constraints/rect/proxy/RectBound.java rename to src/mightypork/util/constraints/rect/proxy/RectBound.java index 197204a..ff629fa 100644 --- a/src/mightypork/util/math/constraints/rect/proxy/RectBound.java +++ b/src/mightypork/util/constraints/rect/proxy/RectBound.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.rect.proxy; +package mightypork.util.constraints.rect.proxy; -import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.constraints.rect.Rect; /** diff --git a/src/mightypork/util/math/constraints/rect/proxy/RectBoundAdapter.java b/src/mightypork/util/constraints/rect/proxy/RectBoundAdapter.java similarity index 81% rename from src/mightypork/util/math/constraints/rect/proxy/RectBoundAdapter.java rename to src/mightypork/util/constraints/rect/proxy/RectBoundAdapter.java index c108b4d..716bf4e 100644 --- a/src/mightypork/util/math/constraints/rect/proxy/RectBoundAdapter.java +++ b/src/mightypork/util/constraints/rect/proxy/RectBoundAdapter.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.rect.proxy; +package mightypork.util.constraints.rect.proxy; -import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.constraints.rect.Rect; /** diff --git a/src/mightypork/util/math/constraints/rect/proxy/RectProxy.java b/src/mightypork/util/constraints/rect/proxy/RectProxy.java similarity index 67% rename from src/mightypork/util/math/constraints/rect/proxy/RectProxy.java rename to src/mightypork/util/constraints/rect/proxy/RectProxy.java index 956c632..fdd92dd 100644 --- a/src/mightypork/util/math/constraints/rect/proxy/RectProxy.java +++ b/src/mightypork/util/constraints/rect/proxy/RectProxy.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.rect.proxy; +package mightypork.util.constraints.rect.proxy; -import mightypork.util.math.constraints.rect.Rect; +import mightypork.util.constraints.rect.Rect; public class RectProxy extends RectAdapter { diff --git a/src/mightypork/util/math/constraints/rect/proxy/RectVectAdapter.java b/src/mightypork/util/constraints/rect/proxy/RectVectAdapter.java similarity index 71% rename from src/mightypork/util/math/constraints/rect/proxy/RectVectAdapter.java rename to src/mightypork/util/constraints/rect/proxy/RectVectAdapter.java index e2085c6..5ad183e 100644 --- a/src/mightypork/util/math/constraints/rect/proxy/RectVectAdapter.java +++ b/src/mightypork/util/constraints/rect/proxy/RectVectAdapter.java @@ -1,8 +1,8 @@ -package mightypork.util.math.constraints.rect.proxy; +package mightypork.util.constraints.rect.proxy; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.vect.Vect; /** diff --git a/src/mightypork/util/math/constraints/vect/Vect.java b/src/mightypork/util/constraints/vect/Vect.java similarity index 95% rename from src/mightypork/util/math/constraints/vect/Vect.java rename to src/mightypork/util/constraints/vect/Vect.java index 981217a..55f3395 100644 --- a/src/mightypork/util/math/constraints/vect/Vect.java +++ b/src/mightypork/util/constraints/vect/Vect.java @@ -1,19 +1,19 @@ -package mightypork.util.math.constraints.vect; +package mightypork.util.constraints.vect; import mightypork.util.annotations.DefaultImpl; import mightypork.util.annotations.FactoryMethod; -import mightypork.util.math.constraints.DigestCache; -import mightypork.util.math.constraints.Digestable; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.num.NumConst; -import mightypork.util.math.constraints.rect.Rect; -import mightypork.util.math.constraints.vect.caching.VectCache; -import mightypork.util.math.constraints.vect.caching.VectDigest; -import mightypork.util.math.constraints.vect.mutable.VectVar; -import mightypork.util.math.constraints.vect.proxy.VectBound; -import mightypork.util.math.constraints.vect.proxy.VectBoundAdapter; -import mightypork.util.math.constraints.vect.proxy.VectNumAdapter; +import mightypork.util.constraints.DigestCache; +import mightypork.util.constraints.Digestable; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.num.NumConst; +import mightypork.util.constraints.rect.Rect; +import mightypork.util.constraints.vect.caching.VectCache; +import mightypork.util.constraints.vect.caching.VectDigest; +import mightypork.util.constraints.vect.mutable.VectVar; +import mightypork.util.constraints.vect.proxy.VectBound; +import mightypork.util.constraints.vect.proxy.VectBoundAdapter; +import mightypork.util.constraints.vect.proxy.VectNumAdapter; /** diff --git a/src/mightypork/util/math/constraints/vect/VectConst.java b/src/mightypork/util/constraints/vect/VectConst.java similarity index 95% rename from src/mightypork/util/math/constraints/vect/VectConst.java rename to src/mightypork/util/constraints/vect/VectConst.java index c5470de..58927dc 100644 --- a/src/mightypork/util/math/constraints/vect/VectConst.java +++ b/src/mightypork/util/constraints/vect/VectConst.java @@ -1,10 +1,10 @@ -package mightypork.util.math.constraints.vect; +package mightypork.util.constraints.vect; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.num.NumConst; -import mightypork.util.math.constraints.rect.RectConst; -import mightypork.util.math.constraints.vect.caching.VectDigest; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.num.NumConst; +import mightypork.util.constraints.rect.RectConst; +import mightypork.util.constraints.vect.caching.VectDigest; /** diff --git a/src/mightypork/util/math/constraints/vect/VectProxy.java b/src/mightypork/util/constraints/vect/VectProxy.java similarity index 65% rename from src/mightypork/util/math/constraints/vect/VectProxy.java rename to src/mightypork/util/constraints/vect/VectProxy.java index f920368..4b3a529 100644 --- a/src/mightypork/util/math/constraints/vect/VectProxy.java +++ b/src/mightypork/util/constraints/vect/VectProxy.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.vect; +package mightypork.util.constraints.vect; -import mightypork.util.math.constraints.vect.proxy.VectAdapter; +import mightypork.util.constraints.vect.proxy.VectAdapter; public class VectProxy extends VectAdapter { diff --git a/src/mightypork/util/math/constraints/vect/caching/AbstractVectCache.java b/src/mightypork/util/constraints/vect/caching/AbstractVectCache.java similarity index 79% rename from src/mightypork/util/math/constraints/vect/caching/AbstractVectCache.java rename to src/mightypork/util/constraints/vect/caching/AbstractVectCache.java index dfd21bc..3db6432 100644 --- a/src/mightypork/util/math/constraints/vect/caching/AbstractVectCache.java +++ b/src/mightypork/util/constraints/vect/caching/AbstractVectCache.java @@ -1,10 +1,10 @@ -package mightypork.util.math.constraints.vect.caching; +package mightypork.util.constraints.vect.caching; -import mightypork.util.math.constraints.ConstraintCache; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.mutable.VectVar; -import mightypork.util.math.constraints.vect.proxy.VectAdapter; +import mightypork.util.constraints.ConstraintCache; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.mutable.VectVar; +import mightypork.util.constraints.vect.proxy.VectAdapter; /** diff --git a/src/mightypork/util/math/constraints/vect/caching/VectCache.java b/src/mightypork/util/constraints/vect/caching/VectCache.java similarity index 79% rename from src/mightypork/util/math/constraints/vect/caching/VectCache.java rename to src/mightypork/util/constraints/vect/caching/VectCache.java index 4ae9c4c..27d0c9d 100644 --- a/src/mightypork/util/math/constraints/vect/caching/VectCache.java +++ b/src/mightypork/util/constraints/vect/caching/VectCache.java @@ -1,8 +1,8 @@ -package mightypork.util.math.constraints.vect.caching; +package mightypork.util.constraints.vect.caching; import mightypork.util.annotations.DefaultImpl; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.vect.Vect; /** diff --git a/src/mightypork/util/math/constraints/vect/caching/VectDigest.java b/src/mightypork/util/constraints/vect/caching/VectDigest.java similarity index 74% rename from src/mightypork/util/math/constraints/vect/caching/VectDigest.java rename to src/mightypork/util/constraints/vect/caching/VectDigest.java index 38afa73..e56af0d 100644 --- a/src/mightypork/util/math/constraints/vect/caching/VectDigest.java +++ b/src/mightypork/util/constraints/vect/caching/VectDigest.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.vect.caching; +package mightypork.util.constraints.vect.caching; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.vect.Vect; public class VectDigest { diff --git a/src/mightypork/util/math/constraints/vect/mutable/VectAnimated.java b/src/mightypork/util/constraints/vect/mutable/VectAnimated.java similarity index 96% rename from src/mightypork/util/math/constraints/vect/mutable/VectAnimated.java rename to src/mightypork/util/constraints/vect/mutable/VectAnimated.java index babed01..f05e7e1 100644 --- a/src/mightypork/util/math/constraints/vect/mutable/VectAnimated.java +++ b/src/mightypork/util/constraints/vect/mutable/VectAnimated.java @@ -1,12 +1,12 @@ -package mightypork.util.math.constraints.vect.mutable; +package mightypork.util.constraints.vect.mutable; import mightypork.util.annotations.FactoryMethod; +import mightypork.util.constraints.num.mutable.NumAnimated; +import mightypork.util.constraints.vect.Vect; import mightypork.util.control.timing.Pauseable; import mightypork.util.control.timing.Updateable; import mightypork.util.math.Easing; -import mightypork.util.math.constraints.num.mutable.NumAnimated; -import mightypork.util.math.constraints.vect.Vect; /** diff --git a/src/mightypork/util/math/constraints/vect/mutable/VectMutable.java b/src/mightypork/util/constraints/vect/mutable/VectMutable.java similarity index 90% rename from src/mightypork/util/math/constraints/vect/mutable/VectMutable.java rename to src/mightypork/util/constraints/vect/mutable/VectMutable.java index f69e615..e80c975 100644 --- a/src/mightypork/util/math/constraints/vect/mutable/VectMutable.java +++ b/src/mightypork/util/constraints/vect/mutable/VectMutable.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.vect.mutable; +package mightypork.util.constraints.vect.mutable; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.vect.Vect; /** diff --git a/src/mightypork/util/math/constraints/vect/mutable/VectVar.java b/src/mightypork/util/constraints/vect/mutable/VectVar.java similarity index 94% rename from src/mightypork/util/math/constraints/vect/mutable/VectVar.java rename to src/mightypork/util/constraints/vect/mutable/VectVar.java index 039e0d6..ded546c 100644 --- a/src/mightypork/util/math/constraints/vect/mutable/VectVar.java +++ b/src/mightypork/util/constraints/vect/mutable/VectVar.java @@ -1,4 +1,4 @@ -package mightypork.util.math.constraints.vect.mutable; +package mightypork.util.constraints.vect.mutable; /** diff --git a/src/mightypork/util/math/constraints/vect/proxy/PluggableVectBound.java b/src/mightypork/util/constraints/vect/proxy/PluggableVectBound.java similarity index 79% rename from src/mightypork/util/math/constraints/vect/proxy/PluggableVectBound.java rename to src/mightypork/util/constraints/vect/proxy/PluggableVectBound.java index 0bb5985..a0536cb 100644 --- a/src/mightypork/util/math/constraints/vect/proxy/PluggableVectBound.java +++ b/src/mightypork/util/constraints/vect/proxy/PluggableVectBound.java @@ -1,4 +1,4 @@ -package mightypork.util.math.constraints.vect.proxy; +package mightypork.util.constraints.vect.proxy; /** diff --git a/src/mightypork/util/math/constraints/vect/proxy/VectAdapter.java b/src/mightypork/util/constraints/vect/proxy/VectAdapter.java similarity index 81% rename from src/mightypork/util/math/constraints/vect/proxy/VectAdapter.java rename to src/mightypork/util/constraints/vect/proxy/VectAdapter.java index 07a805e..04e7ed5 100644 --- a/src/mightypork/util/math/constraints/vect/proxy/VectAdapter.java +++ b/src/mightypork/util/constraints/vect/proxy/VectAdapter.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.vect.proxy; +package mightypork.util.constraints.vect.proxy; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.vect.Vect; /** diff --git a/src/mightypork/util/math/constraints/vect/proxy/VectBound.java b/src/mightypork/util/constraints/vect/proxy/VectBound.java similarity index 65% rename from src/mightypork/util/math/constraints/vect/proxy/VectBound.java rename to src/mightypork/util/constraints/vect/proxy/VectBound.java index cc7ef8e..4bb40ce 100644 --- a/src/mightypork/util/math/constraints/vect/proxy/VectBound.java +++ b/src/mightypork/util/constraints/vect/proxy/VectBound.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.vect.proxy; +package mightypork.util.constraints.vect.proxy; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.vect.Vect; /** diff --git a/src/mightypork/util/math/constraints/vect/proxy/VectBoundAdapter.java b/src/mightypork/util/constraints/vect/proxy/VectBoundAdapter.java similarity index 78% rename from src/mightypork/util/math/constraints/vect/proxy/VectBoundAdapter.java rename to src/mightypork/util/constraints/vect/proxy/VectBoundAdapter.java index 37c6a9a..9cf8d4e 100644 --- a/src/mightypork/util/math/constraints/vect/proxy/VectBoundAdapter.java +++ b/src/mightypork/util/constraints/vect/proxy/VectBoundAdapter.java @@ -1,7 +1,7 @@ -package mightypork.util.math.constraints.vect.proxy; +package mightypork.util.constraints.vect.proxy; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.vect.Vect; public class VectBoundAdapter extends VectAdapter implements PluggableVectBound { diff --git a/src/mightypork/util/math/constraints/vect/proxy/VectNumAdapter.java b/src/mightypork/util/constraints/vect/proxy/VectNumAdapter.java similarity index 75% rename from src/mightypork/util/math/constraints/vect/proxy/VectNumAdapter.java rename to src/mightypork/util/constraints/vect/proxy/VectNumAdapter.java index de03afa..35b9269 100644 --- a/src/mightypork/util/math/constraints/vect/proxy/VectNumAdapter.java +++ b/src/mightypork/util/constraints/vect/proxy/VectNumAdapter.java @@ -1,9 +1,9 @@ -package mightypork.util.math.constraints.vect.proxy; +package mightypork.util.constraints.vect.proxy; -import mightypork.util.math.constraints.num.Num; -import mightypork.util.math.constraints.num.proxy.NumBound; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.num.Num; +import mightypork.util.constraints.num.proxy.NumBound; +import mightypork.util.constraints.vect.Vect; /** diff --git a/src/mightypork/util/math/Calc.java b/src/mightypork/util/math/Calc.java index 41d03be..fcc5cd5 100644 --- a/src/mightypork/util/math/Calc.java +++ b/src/mightypork/util/math/Calc.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.vect.Vect; import org.lwjgl.BufferUtils; diff --git a/src/mightypork/util/math/Polar.java b/src/mightypork/util/math/Polar.java index 1d40249..6913caa 100644 --- a/src/mightypork/util/math/Polar.java +++ b/src/mightypork/util/math/Polar.java @@ -1,7 +1,7 @@ package mightypork.util.math; -import mightypork.util.math.constraints.vect.Vect; +import mightypork.util.constraints.vect.Vect; /** diff --git a/src/mightypork/util/math/color/Color.java b/src/mightypork/util/math/color/Color.java index ab46bfb..732ae31 100644 --- a/src/mightypork/util/math/color/Color.java +++ b/src/mightypork/util/math/color/Color.java @@ -4,8 +4,8 @@ package mightypork.util.math.color; import java.util.Stack; import mightypork.util.annotations.FactoryMethod; +import mightypork.util.constraints.num.Num; import mightypork.util.math.Calc; -import mightypork.util.math.constraints.num.Num; /** @@ -36,7 +36,8 @@ public abstract class Color { public static final Color ORANGE = rgb(1, 0.78, 0); public static final Color PINK = rgb(1, 0.68, 0.68); - private static final Stack globalAlphaStack = new Stack<>(); + private static final Stack alphaStack = new Stack<>(); + private static volatile boolean alphaStackEnabled = true; @FactoryMethod @@ -160,8 +161,11 @@ public abstract class Color { { double alpha = rawAlpha(); - for (Num n : globalAlphaStack) { - alpha *= clamp(n.value()); + if (alphaStackEnabled) { + + for (Num n : alphaStack) { + alpha *= clamp(n.value()); + } } return clamp(alpha); @@ -190,7 +194,11 @@ public abstract class Color { */ public static void pushAlpha(Num alpha) { - globalAlphaStack.push(alpha); + if (!alphaStackEnabled) { + return; + } + + alphaStack.push(alpha); } @@ -198,15 +206,39 @@ public abstract class Color { * Remove a pushed alpha multiplier from the stack. If there's no remaining * multiplier on the stack, an exception is raised. * - * @return the popped multiplier * @throws IllegalStateException if the stack is empty */ - public static Num popAlpha() + public static void popAlpha() { - if (globalAlphaStack.isEmpty()) { + if (!alphaStackEnabled) { + return; + } + + if (alphaStack.isEmpty()) { throw new IllegalStateException("Global alpha stack underflow."); } - return globalAlphaStack.pop(); + alphaStack.pop(); + } + + + /** + * Enable alpha stack. When disabled, pushAlpha() and popAlpha() have no + * effect. + * + * @param yes + */ + public static void enableAlphaStack(boolean yes) + { + alphaStackEnabled = yes; + } + + + /** + * @return true if alpha stack is enabled. + */ + public static boolean isAlphaStackEnabled() + { + return alphaStackEnabled; } } diff --git a/src/mightypork/util/math/color/ColorHsb.java b/src/mightypork/util/math/color/ColorHsb.java index 028f6b8..5130642 100644 --- a/src/mightypork/util/math/color/ColorHsb.java +++ b/src/mightypork/util/math/color/ColorHsb.java @@ -1,7 +1,7 @@ package mightypork.util.math.color; -import mightypork.util.math.constraints.num.Num; +import mightypork.util.constraints.num.Num; public class ColorHsb extends Color { diff --git a/src/mightypork/util/math/color/ColorRgb.java b/src/mightypork/util/math/color/ColorRgb.java index 76fa7dd..5586620 100644 --- a/src/mightypork/util/math/color/ColorRgb.java +++ b/src/mightypork/util/math/color/ColorRgb.java @@ -1,7 +1,7 @@ package mightypork.util.math.color; -import mightypork.util.math.constraints.num.Num; +import mightypork.util.constraints.num.Num; public class ColorRgb extends Color { diff --git a/src/mightypork/util/objects/Convert.java b/src/mightypork/util/objects/Convert.java index cf8e9cb..39cf6dd 100644 --- a/src/mightypork/util/objects/Convert.java +++ b/src/mightypork/util/objects/Convert.java @@ -1,11 +1,11 @@ package mightypork.util.objects; +import mightypork.util.constraints.vect.Vect; +import mightypork.util.constraints.vect.VectConst; import mightypork.util.logging.Log; import mightypork.util.math.Calc; import mightypork.util.math.Range; -import mightypork.util.math.constraints.vect.Vect; -import mightypork.util.math.constraints.vect.VectConst; /**