Some package shifting. Alpha stack now toggleable.

v5stable
ondra 10 years ago
parent 6843e746bc
commit 043dd69c4a
  1. 2
      src/mightypork/gamecore/audio/DeferredAudio.java
  2. 4
      src/mightypork/gamecore/audio/SoundSystem.java
  3. 2
      src/mightypork/gamecore/audio/players/EffectPlayer.java
  4. 2
      src/mightypork/gamecore/audio/players/LoopPlayer.java
  5. 4
      src/mightypork/gamecore/control/events/MouseButtonEvent.java
  6. 4
      src/mightypork/gamecore/control/events/MouseMotionEvent.java
  7. 2
      src/mightypork/gamecore/control/events/ScreenChangeEvent.java
  8. 4
      src/mightypork/gamecore/gui/components/Component.java
  9. 2
      src/mightypork/gamecore/gui/components/LayoutComponent.java
  10. 6
      src/mightypork/gamecore/gui/components/PluggableRenderable.java
  11. 8
      src/mightypork/gamecore/gui/components/VisualComponent.java
  12. 4
      src/mightypork/gamecore/gui/components/layout/ColumnHolder.java
  13. 2
      src/mightypork/gamecore/gui/components/layout/ConstraintLayout.java
  14. 6
      src/mightypork/gamecore/gui/components/layout/HorizontalFixedFlowLayout.java
  15. 4
      src/mightypork/gamecore/gui/components/layout/RowHolder.java
  16. 6
      src/mightypork/gamecore/gui/components/layout/VerticalFixedFlowLayout.java
  17. 4
      src/mightypork/gamecore/gui/components/painters/TextPainter.java
  18. 2
      src/mightypork/gamecore/gui/screens/LayeredScreen.java
  19. 6
      src/mightypork/gamecore/gui/screens/Screen.java
  20. 2
      src/mightypork/gamecore/gui/screens/ScreenLayer.java
  21. 4
      src/mightypork/gamecore/input/InputSystem.java
  22. 6
      src/mightypork/gamecore/render/DisplaySystem.java
  23. 8
      src/mightypork/gamecore/render/Render.java
  24. 4
      src/mightypork/gamecore/render/fonts/FontRenderer.java
  25. 2
      src/mightypork/gamecore/render/fonts/GLFont.java
  26. 4
      src/mightypork/gamecore/render/fonts/impl/CachedFont.java
  27. 2
      src/mightypork/gamecore/render/fonts/impl/DeferredFont.java
  28. 2
      src/mightypork/gamecore/render/textures/DeferredTexture.java
  29. 2
      src/mightypork/gamecore/render/textures/TextureBank.java
  30. 2
      src/mightypork/gamecore/render/textures/TxQuad.java
  31. 4
      src/mightypork/rogue/screens/LayerFps.java
  32. 7
      src/mightypork/rogue/screens/main_menu/MenuLayer.java
  33. 8
      src/mightypork/rogue/screens/test_bouncyboxes/BouncyBox.java
  34. 4
      src/mightypork/rogue/screens/test_bouncyboxes/LayerBouncyBoxes.java
  35. 8
      src/mightypork/rogue/screens/test_cat_sound/LayerFlyingCat.java
  36. 2
      src/mightypork/rogue/screens/test_render/LayerTestGradient.java
  37. 6
      src/mightypork/test/TestConstCaching.java
  38. 14
      src/mightypork/test/TestConstr.java
  39. 8
      src/mightypork/test/TestCoords.java
  40. 6
      src/mightypork/test/TestTiled.java
  41. 6
      src/mightypork/test/TestVec.java
  42. 4
      src/mightypork/util/config/PropertyManager.java
  43. 2
      src/mightypork/util/constraints/ConstraintCache.java
  44. 2
      src/mightypork/util/constraints/DigestCache.java
  45. 2
      src/mightypork/util/constraints/Digestable.java
  46. 2
      src/mightypork/util/constraints/Pollable.java
  47. 2
      src/mightypork/util/constraints/Poller.java
  48. 16
      src/mightypork/util/constraints/num/Num.java
  49. 4
      src/mightypork/util/constraints/num/NumConst.java
  50. 10
      src/mightypork/util/constraints/num/caching/AbstractNumCache.java
  51. 4
      src/mightypork/util/constraints/num/caching/NumCache.java
  52. 4
      src/mightypork/util/constraints/num/caching/NumDigest.java
  53. 2
      src/mightypork/util/constraints/num/mutable/NumAnimated.java
  54. 2
      src/mightypork/util/constraints/num/mutable/NumAnimatedDeg.java
  55. 2
      src/mightypork/util/constraints/num/mutable/NumAnimatedRad.java
  56. 4
      src/mightypork/util/constraints/num/mutable/NumMutable.java
  57. 4
      src/mightypork/util/constraints/num/mutable/NumVar.java
  58. 4
      src/mightypork/util/constraints/num/proxy/NumAdapter.java
  59. 4
      src/mightypork/util/constraints/num/proxy/NumBound.java
  60. 4
      src/mightypork/util/constraints/num/proxy/NumBoundAdapter.java
  61. 4
      src/mightypork/util/constraints/num/proxy/NumProxy.java
  62. 2
      src/mightypork/util/constraints/num/proxy/PluggableNumBound.java
  63. 28
      src/mightypork/util/constraints/rect/Rect.java
  64. 10
      src/mightypork/util/constraints/rect/RectConst.java
  65. 8
      src/mightypork/util/constraints/rect/builders/TiledRect.java
  66. 10
      src/mightypork/util/constraints/rect/caching/AbstractRectCache.java
  67. 4
      src/mightypork/util/constraints/rect/caching/RectCache.java
  68. 6
      src/mightypork/util/constraints/rect/caching/RectDigest.java
  69. 6
      src/mightypork/util/constraints/rect/mutable/RectMutable.java
  70. 6
      src/mightypork/util/constraints/rect/mutable/RectVar.java
  71. 2
      src/mightypork/util/constraints/rect/proxy/PluggableRectBound.java
  72. 8
      src/mightypork/util/constraints/rect/proxy/RectAdapter.java
  73. 4
      src/mightypork/util/constraints/rect/proxy/RectBound.java
  74. 4
      src/mightypork/util/constraints/rect/proxy/RectBoundAdapter.java
  75. 4
      src/mightypork/util/constraints/rect/proxy/RectProxy.java
  76. 6
      src/mightypork/util/constraints/rect/proxy/RectVectAdapter.java
  77. 24
      src/mightypork/util/constraints/vect/Vect.java
  78. 10
      src/mightypork/util/constraints/vect/VectConst.java
  79. 4
      src/mightypork/util/constraints/vect/VectProxy.java
  80. 10
      src/mightypork/util/constraints/vect/caching/AbstractVectCache.java
  81. 4
      src/mightypork/util/constraints/vect/caching/VectCache.java
  82. 4
      src/mightypork/util/constraints/vect/caching/VectDigest.java
  83. 6
      src/mightypork/util/constraints/vect/mutable/VectAnimated.java
  84. 4
      src/mightypork/util/constraints/vect/mutable/VectMutable.java
  85. 2
      src/mightypork/util/constraints/vect/mutable/VectVar.java
  86. 2
      src/mightypork/util/constraints/vect/proxy/PluggableVectBound.java
  87. 4
      src/mightypork/util/constraints/vect/proxy/VectAdapter.java
  88. 4
      src/mightypork/util/constraints/vect/proxy/VectBound.java
  89. 4
      src/mightypork/util/constraints/vect/proxy/VectBoundAdapter.java
  90. 8
      src/mightypork/util/constraints/vect/proxy/VectNumAdapter.java
  91. 2
      src/mightypork/util/math/Calc.java
  92. 2
      src/mightypork/util/math/Polar.java
  93. 50
      src/mightypork/util/math/color/Color.java
  94. 2
      src/mightypork/util/math/color/ColorHsb.java
  95. 2
      src/mightypork/util/math/color/ColorRgb.java
  96. 4
      src/mightypork/util/objects/Convert.java

@ -4,9 +4,9 @@ package mightypork.gamecore.audio;
import java.io.IOException; import java.io.IOException;
import mightypork.gamecore.loading.DeferredResource; import mightypork.gamecore.loading.DeferredResource;
import mightypork.util.constraints.vect.Vect;
import mightypork.util.files.FileUtils; import mightypork.util.files.FileUtils;
import mightypork.util.logging.LogAlias; import mightypork.util.logging.LogAlias;
import mightypork.util.math.constraints.vect.Vect;
import org.newdawn.slick.openal.Audio; import org.newdawn.slick.openal.Audio;
import org.newdawn.slick.openal.SoundStore; import org.newdawn.slick.openal.SoundStore;

@ -9,11 +9,11 @@ import mightypork.gamecore.audio.players.EffectPlayer;
import mightypork.gamecore.audio.players.LoopPlayer; import mightypork.gamecore.audio.players.LoopPlayer;
import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppAccess;
import mightypork.gamecore.control.events.ResourceLoadRequest; 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.eventbus.clients.RootBusNode;
import mightypork.util.control.timing.Updateable; import mightypork.util.control.timing.Updateable;
import mightypork.util.math.Calc.Buffers; 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.AL;
import org.lwjgl.openal.AL10; import org.lwjgl.openal.AL10;

@ -3,7 +3,7 @@ package mightypork.gamecore.audio.players;
import mightypork.gamecore.audio.DeferredAudio; import mightypork.gamecore.audio.DeferredAudio;
import mightypork.gamecore.audio.Volume; import mightypork.gamecore.audio.Volume;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
/** /**

@ -3,9 +3,9 @@ package mightypork.gamecore.audio.players;
import mightypork.gamecore.audio.DeferredAudio; import mightypork.gamecore.audio.DeferredAudio;
import mightypork.gamecore.audio.Volume; import mightypork.gamecore.audio.Volume;
import mightypork.util.constraints.num.mutable.NumAnimated;
import mightypork.util.control.timing.Pauseable; import mightypork.util.control.timing.Pauseable;
import mightypork.util.control.timing.Updateable; import mightypork.util.control.timing.Updateable;
import mightypork.util.math.constraints.num.mutable.NumAnimated;
import org.lwjgl.openal.AL10; import org.lwjgl.openal.AL10;

@ -1,9 +1,9 @@
package mightypork.gamecore.control.events; 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.control.eventbus.events.Event;
import mightypork.util.math.constraints.rect.proxy.RectBound;
import mightypork.util.math.constraints.vect.Vect;
/** /**

@ -1,10 +1,10 @@
package mightypork.gamecore.control.events; 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.Event;
import mightypork.util.control.eventbus.events.flags.UnloggedEvent; import mightypork.util.control.eventbus.events.flags.UnloggedEvent;
import mightypork.util.math.constraints.vect.Vect;
import mightypork.util.math.constraints.vect.VectConst;
/** /**

@ -1,8 +1,8 @@
package mightypork.gamecore.control.events; package mightypork.gamecore.control.events;
import mightypork.util.constraints.vect.Vect;
import mightypork.util.control.eventbus.events.Event; import mightypork.util.control.eventbus.events.Event;
import mightypork.util.math.constraints.vect.Vect;
/** /**

@ -2,8 +2,8 @@ package mightypork.gamecore.gui.components;
import mightypork.gamecore.gui.Hideable; import mightypork.gamecore.gui.Hideable;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
import mightypork.util.math.constraints.rect.proxy.RectBound; import mightypork.util.constraints.rect.proxy.RectBound;
/** /**

@ -9,10 +9,10 @@ import mightypork.gamecore.control.AppAccess;
import mightypork.gamecore.control.AppSubModule; import mightypork.gamecore.control.AppSubModule;
import mightypork.gamecore.input.InputSystem; import mightypork.gamecore.input.InputSystem;
import mightypork.gamecore.render.DisplaySystem; import mightypork.gamecore.render.DisplaySystem;
import mightypork.util.constraints.rect.proxy.RectBound;
import mightypork.util.control.Enableable; import mightypork.util.control.Enableable;
import mightypork.util.control.eventbus.EventBus; import mightypork.util.control.eventbus.EventBus;
import mightypork.util.control.eventbus.clients.ClientHub; 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 { public abstract class LayoutComponent extends VisualComponent implements Enableable, ClientHub, AppAccess {

@ -1,9 +1,9 @@
package mightypork.gamecore.gui.components; package mightypork.gamecore.gui.components;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
import mightypork.util.math.constraints.rect.proxy.PluggableRectBound; import mightypork.util.constraints.rect.proxy.PluggableRectBound;
import mightypork.util.math.constraints.rect.proxy.RectBound; import mightypork.util.constraints.rect.proxy.RectBound;
/** /**

@ -3,10 +3,10 @@ package mightypork.gamecore.gui.components;
import mightypork.gamecore.control.events.LayoutChangeEvent; import mightypork.gamecore.control.events.LayoutChangeEvent;
import mightypork.util.annotations.DefaultImpl; import mightypork.util.annotations.DefaultImpl;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
import mightypork.util.math.constraints.rect.caching.AbstractRectCache; import mightypork.util.constraints.rect.caching.AbstractRectCache;
import mightypork.util.math.constraints.rect.proxy.RectBound; import mightypork.util.constraints.rect.proxy.RectBound;
import mightypork.util.math.constraints.rect.proxy.RectBoundAdapter; import mightypork.util.constraints.rect.proxy.RectBoundAdapter;
/** /**

@ -4,8 +4,8 @@ package mightypork.gamecore.gui.components.layout;
import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppAccess;
import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.Component;
import mightypork.gamecore.gui.components.LayoutComponent; import mightypork.gamecore.gui.components.LayoutComponent;
import mightypork.util.math.constraints.rect.builders.TiledRect; import mightypork.util.constraints.rect.builders.TiledRect;
import mightypork.util.math.constraints.rect.proxy.RectBound; import mightypork.util.constraints.rect.proxy.RectBound;
/** /**

@ -4,7 +4,7 @@ package mightypork.gamecore.gui.components.layout;
import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppAccess;
import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.Component;
import mightypork.gamecore.gui.components.LayoutComponent; import mightypork.gamecore.gui.components.LayoutComponent;
import mightypork.util.math.constraints.rect.proxy.RectBound; import mightypork.util.constraints.rect.proxy.RectBound;
/** /**

@ -5,9 +5,9 @@ import mightypork.gamecore.control.AppAccess;
import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.AlignX;
import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.Component;
import mightypork.gamecore.gui.components.LayoutComponent; import mightypork.gamecore.gui.components.LayoutComponent;
import mightypork.util.math.constraints.num.Num; import mightypork.util.constraints.num.Num;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
import mightypork.util.math.constraints.rect.proxy.RectBound; import mightypork.util.constraints.rect.proxy.RectBound;
/** /**

@ -4,8 +4,8 @@ package mightypork.gamecore.gui.components.layout;
import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppAccess;
import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.Component;
import mightypork.gamecore.gui.components.LayoutComponent; import mightypork.gamecore.gui.components.LayoutComponent;
import mightypork.util.math.constraints.rect.builders.TiledRect; import mightypork.util.constraints.rect.builders.TiledRect;
import mightypork.util.math.constraints.rect.proxy.RectBound; import mightypork.util.constraints.rect.proxy.RectBound;
/** /**

@ -5,9 +5,9 @@ import mightypork.gamecore.control.AppAccess;
import mightypork.gamecore.gui.AlignY; import mightypork.gamecore.gui.AlignY;
import mightypork.gamecore.gui.components.Component; import mightypork.gamecore.gui.components.Component;
import mightypork.gamecore.gui.components.LayoutComponent; import mightypork.gamecore.gui.components.LayoutComponent;
import mightypork.util.math.constraints.num.Num; import mightypork.util.constraints.num.Num;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
import mightypork.util.math.constraints.rect.proxy.RectBound; import mightypork.util.constraints.rect.proxy.RectBound;
/** /**

@ -5,9 +5,9 @@ import mightypork.gamecore.gui.AlignX;
import mightypork.gamecore.gui.components.VisualComponent; import mightypork.gamecore.gui.components.VisualComponent;
import mightypork.gamecore.render.fonts.FontRenderer; import mightypork.gamecore.render.fonts.FontRenderer;
import mightypork.gamecore.render.fonts.GLFont; 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.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;
import mightypork.util.string.StringProvider.StringWrapper; import mightypork.util.string.StringProvider.StringWrapper;

@ -5,7 +5,7 @@ import java.util.Collection;
import java.util.TreeSet; import java.util.TreeSet;
import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppAccess;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
/** /**

@ -11,9 +11,9 @@ import mightypork.gamecore.input.KeyBindingPool;
import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.KeyStroke;
import mightypork.gamecore.render.Render; import mightypork.gamecore.render.Render;
import mightypork.util.annotations.DefaultImpl; import mightypork.util.annotations.DefaultImpl;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
import mightypork.util.math.constraints.rect.proxy.RectBound; import mightypork.util.constraints.rect.proxy.RectBound;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
/** /**

@ -12,8 +12,8 @@ import mightypork.gamecore.input.KeyBinder;
import mightypork.gamecore.input.KeyBindingPool; import mightypork.gamecore.input.KeyBindingPool;
import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.KeyStroke;
import mightypork.util.annotations.DefaultImpl; import mightypork.util.annotations.DefaultImpl;
import mightypork.util.constraints.vect.Vect;
import mightypork.util.control.timing.Updateable; import mightypork.util.control.timing.Updateable;
import mightypork.util.math.constraints.vect.Vect;
/** /**

@ -7,10 +7,10 @@ import mightypork.gamecore.control.events.MouseButtonEvent;
import mightypork.gamecore.control.events.MouseMotionEvent; import mightypork.gamecore.control.events.MouseMotionEvent;
import mightypork.rogue.events.ActionRequest; import mightypork.rogue.events.ActionRequest;
import mightypork.rogue.events.ActionRequest.RequestType; 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.eventbus.clients.RootBusNode;
import mightypork.util.control.timing.Updateable; 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.LWJGLException;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;

@ -8,11 +8,11 @@ import java.nio.ByteBuffer;
import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppAccess;
import mightypork.gamecore.control.AppModule; import mightypork.gamecore.control.AppModule;
import mightypork.gamecore.control.events.ScreenChangeEvent; 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.control.timing.FpsMeter;
import mightypork.util.logging.Log; 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.BufferUtils;
import org.lwjgl.LWJGLException; import org.lwjgl.LWJGLException;

@ -6,13 +6,13 @@ import static org.lwjgl.opengl.GL11.*;
import java.io.IOException; import java.io.IOException;
import mightypork.gamecore.render.textures.TxQuad; 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.files.FileUtils;
import mightypork.util.logging.Log; import mightypork.util.logging.Log;
import mightypork.util.math.color.Color; 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.lwjgl.opengl.GL11;
import org.newdawn.slick.opengl.Texture; import org.newdawn.slick.opengl.Texture;

@ -3,9 +3,9 @@ package mightypork.gamecore.render.fonts;
import mightypork.gamecore.gui.AlignX; import mightypork.gamecore.gui.AlignX;
import mightypork.gamecore.render.Render; 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.color.Color;
import mightypork.util.math.constraints.rect.Rect;
import mightypork.util.math.constraints.vect.Vect;
/** /**

@ -1,8 +1,8 @@
package mightypork.gamecore.render.fonts; package mightypork.gamecore.render.fonts;
import mightypork.util.constraints.vect.Vect;
import mightypork.util.math.color.Color; import mightypork.util.math.color.Color;
import mightypork.util.math.constraints.vect.Vect;
/** /**

@ -20,10 +20,10 @@ import java.util.Map;
import mightypork.gamecore.render.fonts.GLFont; import mightypork.gamecore.render.fonts.GLFont;
import mightypork.gamecore.render.textures.FilterMode; 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.logging.Log;
import mightypork.util.math.color.Color; 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.BufferUtils;
import org.lwjgl.util.glu.GLU; import org.lwjgl.util.glu.GLU;

@ -10,10 +10,10 @@ import mightypork.gamecore.loading.DeferredResource;
import mightypork.gamecore.loading.MustLoadInMainThread; import mightypork.gamecore.loading.MustLoadInMainThread;
import mightypork.gamecore.render.fonts.GLFont; import mightypork.gamecore.render.fonts.GLFont;
import mightypork.gamecore.render.textures.FilterMode; import mightypork.gamecore.render.textures.FilterMode;
import mightypork.util.constraints.vect.Vect;
import mightypork.util.files.FileUtils; import mightypork.util.files.FileUtils;
import mightypork.util.logging.LogAlias; import mightypork.util.logging.LogAlias;
import mightypork.util.math.color.Color; import mightypork.util.math.color.Color;
import mightypork.util.math.constraints.vect.Vect;
/** /**

@ -4,8 +4,8 @@ package mightypork.gamecore.render.textures;
import mightypork.gamecore.loading.DeferredResource; import mightypork.gamecore.loading.DeferredResource;
import mightypork.gamecore.loading.MustLoadInMainThread; import mightypork.gamecore.loading.MustLoadInMainThread;
import mightypork.gamecore.render.Render; import mightypork.gamecore.render.Render;
import mightypork.util.constraints.rect.Rect;
import mightypork.util.logging.LogAlias; import mightypork.util.logging.LogAlias;
import mightypork.util.math.constraints.rect.Rect;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.newdawn.slick.opengl.Texture; import org.newdawn.slick.opengl.Texture;

@ -6,7 +6,7 @@ import java.util.HashMap;
import mightypork.gamecore.control.AppAccess; import mightypork.gamecore.control.AppAccess;
import mightypork.gamecore.control.AppAdapter; import mightypork.gamecore.control.AppAdapter;
import mightypork.gamecore.control.events.ResourceLoadRequest; 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; import org.newdawn.slick.opengl.Texture;

@ -1,7 +1,7 @@
package mightypork.gamecore.render.textures; package mightypork.gamecore.render.textures;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
import org.newdawn.slick.opengl.Texture; import org.newdawn.slick.opengl.Texture;

@ -9,10 +9,10 @@ import mightypork.gamecore.input.KeyStroke;
import mightypork.gamecore.input.Keys; import mightypork.gamecore.input.Keys;
import mightypork.gamecore.render.fonts.GLFont; import mightypork.gamecore.render.fonts.GLFont;
import mightypork.rogue.Res; 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.control.Action;
import mightypork.util.math.color.Color; 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; import mightypork.util.string.StringProvider;

@ -6,14 +6,12 @@ import mightypork.gamecore.gui.AlignY;
import mightypork.gamecore.gui.components.layout.VerticalFixedFlowLayout; import mightypork.gamecore.gui.components.layout.VerticalFixedFlowLayout;
import mightypork.gamecore.gui.screens.Screen; import mightypork.gamecore.gui.screens.Screen;
import mightypork.gamecore.gui.screens.ScreenLayer; 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;
import mightypork.rogue.events.ActionRequest.RequestType; 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.control.Action;
import mightypork.util.math.color.Color; import mightypork.util.math.color.Color;
import mightypork.util.math.constraints.num.Num;
import mightypork.util.math.constraints.rect.Rect;
class MenuLayer extends ScreenLayer { class MenuLayer extends ScreenLayer {
@ -34,7 +32,6 @@ class MenuLayer extends ScreenLayer {
VerticalFixedFlowLayout layout = new VerticalFixedFlowLayout(root, menuBox, lineHeight, AlignY.TOP); VerticalFixedFlowLayout layout = new VerticalFixedFlowLayout(root, menuBox, lineHeight, AlignY.TOP);
root.add(layout); root.add(layout);
GLFont f = Res.getFont("press_start");
MenuButton b1, b2, b3, b4; MenuButton b1, b2, b3, b4;
layout.add(b1 = new MenuButton("Render test", Color.WHITE)); layout.add(b1 = new MenuButton("Render test", Color.WHITE));
layout.add(b2 = new MenuButton("Bouncy Cubes", Color.CYAN)); layout.add(b2 = new MenuButton("Bouncy Cubes", Color.CYAN));

@ -5,13 +5,13 @@ import java.util.Random;
import mightypork.gamecore.gui.components.VisualComponent; import mightypork.gamecore.gui.components.VisualComponent;
import mightypork.gamecore.render.Render; 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.control.timing.Updateable;
import mightypork.util.math.Easing; import mightypork.util.math.Easing;
import mightypork.util.math.color.Color; 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 { public class BouncyBox extends VisualComponent implements Updateable {

@ -12,9 +12,9 @@ import mightypork.gamecore.gui.screens.ScreenLayer;
import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.KeyStroke;
import mightypork.gamecore.input.Keys; import mightypork.gamecore.input.Keys;
import mightypork.rogue.Res; 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.color.Color;
import mightypork.util.math.constraints.num.Num;
import mightypork.util.math.constraints.vect.Vect;
public class LayerBouncyBoxes extends ScreenLayer { public class LayerBouncyBoxes extends ScreenLayer {

@ -13,12 +13,12 @@ import mightypork.gamecore.gui.screens.ScreenLayer;
import mightypork.gamecore.input.KeyStroke; import mightypork.gamecore.input.KeyStroke;
import mightypork.gamecore.input.Keys; import mightypork.gamecore.input.Keys;
import mightypork.rogue.Res; 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.Easing;
import mightypork.util.math.color.Color; 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 { public class LayerFlyingCat extends ScreenLayer implements MouseButtonEvent.Listener {

@ -4,8 +4,8 @@ package mightypork.rogue.screens.test_render;
import mightypork.gamecore.gui.screens.Screen; import mightypork.gamecore.gui.screens.Screen;
import mightypork.gamecore.gui.screens.ScreenLayer; import mightypork.gamecore.gui.screens.ScreenLayer;
import mightypork.gamecore.render.Render; import mightypork.gamecore.render.Render;
import mightypork.util.constraints.rect.proxy.RectBound;
import mightypork.util.math.color.Color; import mightypork.util.math.color.Color;
import mightypork.util.math.constraints.rect.proxy.RectBound;
public class LayerTestGradient extends ScreenLayer { public class LayerTestGradient extends ScreenLayer {

@ -1,9 +1,9 @@
package mightypork.test; package mightypork.test;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
import mightypork.util.math.constraints.vect.caching.VectCache; import mightypork.util.constraints.vect.caching.VectCache;
import mightypork.util.math.constraints.vect.mutable.VectVar; import mightypork.util.constraints.vect.mutable.VectVar;
public class TestConstCaching { public class TestConstCaching {

@ -3,13 +3,13 @@ package mightypork.test;
import java.util.Locale; import java.util.Locale;
import mightypork.util.math.constraints.num.Num; import mightypork.util.constraints.num.Num;
import mightypork.util.math.constraints.num.mutable.NumVar; import mightypork.util.constraints.num.mutable.NumVar;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
import mightypork.util.math.constraints.rect.RectConst; import mightypork.util.constraints.rect.RectConst;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
import mightypork.util.math.constraints.vect.VectConst; import mightypork.util.constraints.vect.VectConst;
import mightypork.util.math.constraints.vect.mutable.VectVar; import mightypork.util.constraints.vect.mutable.VectVar;
public class TestConstr { public class TestConstr {

@ -1,10 +1,10 @@
package mightypork.test; package mightypork.test;
import mightypork.util.math.constraints.num.Num; import mightypork.util.constraints.num.Num;
import mightypork.util.math.constraints.num.mutable.NumVar; import mightypork.util.constraints.num.mutable.NumVar;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
import mightypork.util.math.constraints.vect.mutable.VectVar; import mightypork.util.constraints.vect.mutable.VectVar;
public class TestCoords { public class TestCoords {

@ -1,9 +1,9 @@
package mightypork.test; package mightypork.test;
import mightypork.util.math.constraints.num.Num; import mightypork.util.constraints.num.Num;
import mightypork.util.math.constraints.num.mutable.NumVar; import mightypork.util.constraints.num.mutable.NumVar;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
public class TestTiled { public class TestTiled {

@ -1,9 +1,9 @@
package mightypork.test; package mightypork.test;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
import mightypork.util.math.constraints.vect.VectConst; import mightypork.util.constraints.vect.VectConst;
import mightypork.util.math.constraints.vect.mutable.VectVar; import mightypork.util.constraints.vect.mutable.VectVar;
public class TestVec { public class TestVec {

@ -9,9 +9,9 @@ import java.util.ArrayList;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.TreeMap; 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.Range;
import mightypork.util.math.constraints.vect.Vect;
import mightypork.util.math.constraints.vect.VectConst;
import mightypork.util.objects.Convert; import mightypork.util.objects.Convert;

@ -1,4 +1,4 @@
package mightypork.util.math.constraints; package mightypork.util.constraints;
/** /**

@ -1,4 +1,4 @@
package mightypork.util.math.constraints; package mightypork.util.constraints;
/** /**

@ -1,4 +1,4 @@
package mightypork.util.math.constraints; package mightypork.util.constraints;
/** /**

@ -1,4 +1,4 @@
package mightypork.util.math.constraints; package mightypork.util.constraints;
/** /**

@ -1,4 +1,4 @@
package mightypork.util.math.constraints; package mightypork.util.constraints;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;

@ -1,15 +1,15 @@
package mightypork.util.math.constraints.num; package mightypork.util.constraints.num;
import mightypork.util.annotations.FactoryMethod; 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.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<NumDigest> { public abstract class Num implements NumBound, Digestable<NumDigest> {

@ -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;
/** /**

@ -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.constraints.ConstraintCache;
import mightypork.util.math.constraints.num.Num; import mightypork.util.constraints.num.Num;
import mightypork.util.math.constraints.num.mutable.NumVar; import mightypork.util.constraints.num.mutable.NumVar;
import mightypork.util.math.constraints.num.proxy.NumAdapter; import mightypork.util.constraints.num.proxy.NumAdapter;
/** /**

@ -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.annotations.DefaultImpl;
import mightypork.util.math.constraints.num.Num; import mightypork.util.constraints.num.Num;
/** /**

@ -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 { public class NumDigest {

@ -1,4 +1,4 @@
package mightypork.util.math.constraints.num.mutable; package mightypork.util.constraints.num.mutable;
import mightypork.util.control.timing.Pauseable; import mightypork.util.control.timing.Pauseable;

@ -1,4 +1,4 @@
package mightypork.util.math.constraints.num.mutable; package mightypork.util.constraints.num.mutable;
import mightypork.util.math.Calc; import mightypork.util.math.Calc;

@ -1,4 +1,4 @@
package mightypork.util.math.constraints.num.mutable; package mightypork.util.constraints.num.mutable;
import mightypork.util.math.Calc; import mightypork.util.math.Calc;

@ -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;
/** /**

@ -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;
/** /**

@ -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 { public abstract class NumAdapter extends Num {

@ -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;
/** /**

@ -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 { public class NumBoundAdapter extends NumAdapter implements PluggableNumBound {

@ -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 { public class NumProxy extends NumAdapter {

@ -1,4 +1,4 @@
package mightypork.util.math.constraints.num.proxy; package mightypork.util.constraints.num.proxy;
/** /**

@ -1,20 +1,20 @@
package mightypork.util.math.constraints.rect; package mightypork.util.constraints.rect;
import mightypork.util.annotations.FactoryMethod; import mightypork.util.annotations.FactoryMethod;
import mightypork.util.math.constraints.DigestCache; import mightypork.util.constraints.DigestCache;
import mightypork.util.math.constraints.Digestable; import mightypork.util.constraints.Digestable;
import mightypork.util.math.constraints.num.Num; import mightypork.util.constraints.num.Num;
import mightypork.util.math.constraints.num.NumConst; import mightypork.util.constraints.num.NumConst;
import mightypork.util.math.constraints.rect.builders.TiledRect; import mightypork.util.constraints.rect.builders.TiledRect;
import mightypork.util.math.constraints.rect.caching.RectCache; import mightypork.util.constraints.rect.caching.RectCache;
import mightypork.util.math.constraints.rect.caching.RectDigest; import mightypork.util.constraints.rect.caching.RectDigest;
import mightypork.util.math.constraints.rect.mutable.RectVar; import mightypork.util.constraints.rect.mutable.RectVar;
import mightypork.util.math.constraints.rect.proxy.RectBound; import mightypork.util.constraints.rect.proxy.RectBound;
import mightypork.util.math.constraints.rect.proxy.RectBoundAdapter; import mightypork.util.constraints.rect.proxy.RectBoundAdapter;
import mightypork.util.math.constraints.rect.proxy.RectVectAdapter; import mightypork.util.constraints.rect.proxy.RectVectAdapter;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
import mightypork.util.math.constraints.vect.VectConst; import mightypork.util.constraints.vect.VectConst;
/** /**

@ -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.constraints.num.NumConst;
import mightypork.util.math.constraints.rect.caching.RectDigest; import mightypork.util.constraints.rect.caching.RectDigest;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
import mightypork.util.math.constraints.vect.VectConst; import mightypork.util.constraints.vect.VectConst;
/** /**

@ -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.constraints.num.Num;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
import mightypork.util.math.constraints.rect.proxy.RectProxy; import mightypork.util.constraints.rect.proxy.RectProxy;
/** /**

@ -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.constraints.ConstraintCache;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
import mightypork.util.math.constraints.rect.mutable.RectVar; import mightypork.util.constraints.rect.mutable.RectVar;
import mightypork.util.math.constraints.rect.proxy.RectAdapter; import mightypork.util.constraints.rect.proxy.RectAdapter;
/** /**

@ -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.annotations.DefaultImpl;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
/** /**

@ -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.constraints.rect.Rect;
import mightypork.util.math.constraints.rect.RectConst; import mightypork.util.constraints.rect.RectConst;
public class RectDigest { public class RectDigest {

@ -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.constraints.rect.Rect;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
/** /**

@ -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.constraints.vect.Vect;
import mightypork.util.math.constraints.vect.mutable.VectVar; import mightypork.util.constraints.vect.mutable.VectVar;
public class RectVar extends RectMutable { public class RectVar extends RectMutable {

@ -1,4 +1,4 @@
package mightypork.util.math.constraints.rect.proxy; package mightypork.util.constraints.rect.proxy;
/** /**

@ -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.constraints.rect.Rect;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
import mightypork.util.math.constraints.vect.proxy.VectAdapter; import mightypork.util.constraints.vect.proxy.VectAdapter;
/** /**

@ -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;
/** /**

@ -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;
/** /**

@ -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 { public class RectProxy extends RectAdapter {

@ -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.constraints.rect.Rect;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
/** /**

@ -1,19 +1,19 @@
package mightypork.util.math.constraints.vect; package mightypork.util.constraints.vect;
import mightypork.util.annotations.DefaultImpl; import mightypork.util.annotations.DefaultImpl;
import mightypork.util.annotations.FactoryMethod; import mightypork.util.annotations.FactoryMethod;
import mightypork.util.math.constraints.DigestCache; import mightypork.util.constraints.DigestCache;
import mightypork.util.math.constraints.Digestable; import mightypork.util.constraints.Digestable;
import mightypork.util.math.constraints.num.Num; import mightypork.util.constraints.num.Num;
import mightypork.util.math.constraints.num.NumConst; import mightypork.util.constraints.num.NumConst;
import mightypork.util.math.constraints.rect.Rect; import mightypork.util.constraints.rect.Rect;
import mightypork.util.math.constraints.vect.caching.VectCache; import mightypork.util.constraints.vect.caching.VectCache;
import mightypork.util.math.constraints.vect.caching.VectDigest; import mightypork.util.constraints.vect.caching.VectDigest;
import mightypork.util.math.constraints.vect.mutable.VectVar; import mightypork.util.constraints.vect.mutable.VectVar;
import mightypork.util.math.constraints.vect.proxy.VectBound; import mightypork.util.constraints.vect.proxy.VectBound;
import mightypork.util.math.constraints.vect.proxy.VectBoundAdapter; import mightypork.util.constraints.vect.proxy.VectBoundAdapter;
import mightypork.util.math.constraints.vect.proxy.VectNumAdapter; import mightypork.util.constraints.vect.proxy.VectNumAdapter;
/** /**

@ -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.constraints.num.Num;
import mightypork.util.math.constraints.num.NumConst; import mightypork.util.constraints.num.NumConst;
import mightypork.util.math.constraints.rect.RectConst; import mightypork.util.constraints.rect.RectConst;
import mightypork.util.math.constraints.vect.caching.VectDigest; import mightypork.util.constraints.vect.caching.VectDigest;
/** /**

@ -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 { public class VectProxy extends VectAdapter {

@ -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.constraints.ConstraintCache;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
import mightypork.util.math.constraints.vect.mutable.VectVar; import mightypork.util.constraints.vect.mutable.VectVar;
import mightypork.util.math.constraints.vect.proxy.VectAdapter; import mightypork.util.constraints.vect.proxy.VectAdapter;
/** /**

@ -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.annotations.DefaultImpl;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
/** /**

@ -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 { public class VectDigest {

@ -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.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.Pauseable;
import mightypork.util.control.timing.Updateable; import mightypork.util.control.timing.Updateable;
import mightypork.util.math.Easing; import mightypork.util.math.Easing;
import mightypork.util.math.constraints.num.mutable.NumAnimated;
import mightypork.util.math.constraints.vect.Vect;
/** /**

@ -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;
/** /**

@ -1,4 +1,4 @@
package mightypork.util.math.constraints.vect.mutable; package mightypork.util.constraints.vect.mutable;
/** /**

@ -1,4 +1,4 @@
package mightypork.util.math.constraints.vect.proxy; package mightypork.util.constraints.vect.proxy;
/** /**

@ -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;
/** /**

@ -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;
/** /**

@ -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 { public class VectBoundAdapter extends VectAdapter implements PluggableVectBound {

@ -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.constraints.num.Num;
import mightypork.util.math.constraints.num.proxy.NumBound; import mightypork.util.constraints.num.proxy.NumBound;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
/** /**

@ -6,7 +6,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;

@ -1,7 +1,7 @@
package mightypork.util.math; package mightypork.util.math;
import mightypork.util.math.constraints.vect.Vect; import mightypork.util.constraints.vect.Vect;
/** /**

@ -4,8 +4,8 @@ package mightypork.util.math.color;
import java.util.Stack; import java.util.Stack;
import mightypork.util.annotations.FactoryMethod; import mightypork.util.annotations.FactoryMethod;
import mightypork.util.constraints.num.Num;
import mightypork.util.math.Calc; 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 ORANGE = rgb(1, 0.78, 0);
public static final Color PINK = rgb(1, 0.68, 0.68); public static final Color PINK = rgb(1, 0.68, 0.68);
private static final Stack<Num> globalAlphaStack = new Stack<>(); private static final Stack<Num> alphaStack = new Stack<>();
private static volatile boolean alphaStackEnabled = true;
@FactoryMethod @FactoryMethod
@ -160,8 +161,11 @@ public abstract class Color {
{ {
double alpha = rawAlpha(); double alpha = rawAlpha();
for (Num n : globalAlphaStack) { if (alphaStackEnabled) {
alpha *= clamp(n.value());
for (Num n : alphaStack) {
alpha *= clamp(n.value());
}
} }
return clamp(alpha); return clamp(alpha);
@ -190,7 +194,11 @@ public abstract class Color {
*/ */
public static void pushAlpha(Num alpha) 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 * Remove a pushed alpha multiplier from the stack. If there's no remaining
* multiplier on the stack, an exception is raised. * multiplier on the stack, an exception is raised.
* *
* @return the popped multiplier
* @throws IllegalStateException if the stack is empty * @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."); 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;
} }
} }

@ -1,7 +1,7 @@
package mightypork.util.math.color; package mightypork.util.math.color;
import mightypork.util.math.constraints.num.Num; import mightypork.util.constraints.num.Num;
public class ColorHsb extends Color { public class ColorHsb extends Color {

@ -1,7 +1,7 @@
package mightypork.util.math.color; package mightypork.util.math.color;
import mightypork.util.math.constraints.num.Num; import mightypork.util.constraints.num.Num;
public class ColorRgb extends Color { public class ColorRgb extends Color {

@ -1,11 +1,11 @@
package mightypork.util.objects; package mightypork.util.objects;
import mightypork.util.constraints.vect.Vect;
import mightypork.util.constraints.vect.VectConst;
import mightypork.util.logging.Log; import mightypork.util.logging.Log;
import mightypork.util.math.Calc; import mightypork.util.math.Calc;
import mightypork.util.math.Range; import mightypork.util.math.Range;
import mightypork.util.math.constraints.vect.Vect;
import mightypork.util.math.constraints.vect.VectConst;
/** /**

Loading…
Cancel
Save