cleanup, util packages reorganized, removed some sysouts
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
package mightypork.util.control.eventbus;
|
||||
|
||||
|
||||
import mightypork.util.control.eventbus.events.flags.DelayedEvent;
|
||||
import mightypork.util.control.eventbus.events.flags.ImmediateEvent;
|
||||
import mightypork.util.control.eventbus.events.flags.NonConsumableEvent;
|
||||
import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent;
|
||||
import mightypork.util.control.eventbus.events.flags.UnloggedEvent;
|
||||
import mightypork.util.control.eventbus.event_flags.DelayedEvent;
|
||||
import mightypork.util.control.eventbus.event_flags.ImmediateEvent;
|
||||
import mightypork.util.control.eventbus.event_flags.NonConsumableEvent;
|
||||
import mightypork.util.control.eventbus.event_flags.SingleReceiverEvent;
|
||||
import mightypork.util.control.eventbus.event_flags.UnloggedEvent;
|
||||
|
||||
|
||||
/**
|
||||
@@ -52,7 +52,6 @@ public abstract class BusEvent<HANDLER> {
|
||||
*/
|
||||
public final void consume()
|
||||
{
|
||||
System.out.println("consume "+getClass());
|
||||
if (consumed) throw new IllegalStateException("Already consumed.");
|
||||
|
||||
if (getClass().isAnnotationPresent(NonConsumableEvent.class)) {
|
||||
|
||||
@@ -10,10 +10,9 @@ import java.util.concurrent.TimeUnit;
|
||||
|
||||
import mightypork.util.control.Destroyable;
|
||||
import mightypork.util.control.eventbus.clients.DelegatingClient;
|
||||
import mightypork.util.control.eventbus.events.flags.DelayedEvent;
|
||||
import mightypork.util.control.eventbus.events.flags.ImmediateEvent;
|
||||
import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent;
|
||||
import mightypork.util.control.eventbus.events.flags.UnloggedEvent;
|
||||
import mightypork.util.control.eventbus.event_flags.DelayedEvent;
|
||||
import mightypork.util.control.eventbus.event_flags.ImmediateEvent;
|
||||
import mightypork.util.control.eventbus.event_flags.UnloggedEvent;
|
||||
import mightypork.util.logging.Log;
|
||||
|
||||
|
||||
@@ -107,7 +106,7 @@ final public class EventBus implements Destroyable {
|
||||
// BEHOLD, MAGIC!
|
||||
|
||||
final Type evtc = event.getClass().getGenericSuperclass();
|
||||
|
||||
|
||||
if (evtc instanceof ParameterizedType) {
|
||||
if (((ParameterizedType) evtc).getRawType() == BusEvent.class) {
|
||||
final Type[] types = ((ParameterizedType) evtc).getActualTypeArguments();
|
||||
|
||||
@@ -6,7 +6,6 @@ import java.util.HashSet;
|
||||
|
||||
import mightypork.util.control.eventbus.clients.DelegatingClient;
|
||||
import mightypork.util.control.eventbus.clients.ToggleableClient;
|
||||
import mightypork.util.control.eventbus.events.flags.SingleReceiverEvent;
|
||||
import mightypork.util.logging.Log;
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.control.eventbus.events.flags;
|
||||
package mightypork.util.control.eventbus.event_flags;
|
||||
|
||||
|
||||
import java.lang.annotation.*;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.control.eventbus.events.flags;
|
||||
package mightypork.util.control.eventbus.event_flags;
|
||||
|
||||
|
||||
import java.lang.annotation.*;
|
||||
+2
-1
@@ -1,4 +1,5 @@
|
||||
package mightypork.util.control.eventbus.events.flags;
|
||||
package mightypork.util.control.eventbus.event_flags;
|
||||
|
||||
|
||||
import java.lang.annotation.Documented;
|
||||
import java.lang.annotation.ElementType;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.control.eventbus.events.flags;
|
||||
package mightypork.util.control.eventbus.event_flags;
|
||||
|
||||
|
||||
import java.lang.annotation.*;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.control.eventbus.events.flags;
|
||||
package mightypork.util.control.eventbus.event_flags;
|
||||
|
||||
|
||||
import java.lang.annotation.*;
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.config;
|
||||
package mightypork.util.files.config;
|
||||
|
||||
|
||||
import java.io.File;
|
||||
@@ -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;
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.config;
|
||||
package mightypork.util.files.config;
|
||||
|
||||
|
||||
import java.io.File;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.config;
|
||||
package mightypork.util.files.config;
|
||||
|
||||
|
||||
import java.io.*;
|
||||
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.ion;
|
||||
package mightypork.util.files.ion;
|
||||
|
||||
|
||||
import java.io.*;
|
||||
@@ -212,7 +212,7 @@ public class Ion {
|
||||
*/
|
||||
public static <T extends IonBundled> T fromStream(InputStream in, Class<? extends T> objClass) throws IOException
|
||||
{
|
||||
return unwrap((IonBundle)new IonInput(in).readObject(), objClass);
|
||||
return unwrap((IonBundle) new IonInput(in).readObject(), objClass);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.ion;
|
||||
package mightypork.util.files.ion;
|
||||
|
||||
|
||||
import java.io.IOException;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.ion;
|
||||
package mightypork.util.files.ion;
|
||||
|
||||
|
||||
import java.io.IOException;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.ion;
|
||||
package mightypork.util.files.ion;
|
||||
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.ion;
|
||||
package mightypork.util.files.ion;
|
||||
|
||||
|
||||
import java.io.DataInput;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.ion;
|
||||
package mightypork.util.files.ion;
|
||||
|
||||
|
||||
import java.io.IOException;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.ion;
|
||||
package mightypork.util.files.ion;
|
||||
|
||||
|
||||
import java.io.DataOutput;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.ion;
|
||||
package mightypork.util.files.ion;
|
||||
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -6,7 +6,7 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
|
||||
import org.lwjgl.BufferUtils;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.math;
|
||||
|
||||
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -5,8 +5,8 @@ import java.util.EmptyStackException;
|
||||
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;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.math.color;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
|
||||
|
||||
public class ColorAlphaAdjuster extends Color {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.math.color;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
|
||||
|
||||
public class ColorHsb extends Color {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.math.color;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
|
||||
|
||||
public class ColorRgb extends Color {
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.constraints;
|
||||
package mightypork.util.math.constraints;
|
||||
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.constraints;
|
||||
package mightypork.util.math.constraints;
|
||||
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.constraints;
|
||||
package mightypork.util.math.constraints;
|
||||
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.constraints;
|
||||
package mightypork.util.math.constraints;
|
||||
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.constraints;
|
||||
package mightypork.util.math.constraints;
|
||||
|
||||
|
||||
import java.util.LinkedHashSet;
|
||||
+9
-9
@@ -1,16 +1,16 @@
|
||||
package mightypork.util.constraints.num;
|
||||
package mightypork.util.math.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.constraints.vect.Vect;
|
||||
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;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
|
||||
|
||||
public abstract class Num implements NumBound, Digestable<NumDigest> {
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.num;
|
||||
package mightypork.util.math.constraints.num;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.caching.NumDigest;
|
||||
import mightypork.util.math.constraints.num.caching.NumDigest;
|
||||
|
||||
|
||||
/**
|
||||
+5
-5
@@ -1,10 +1,10 @@
|
||||
package mightypork.util.constraints.num.caching;
|
||||
package mightypork.util.math.constraints.num.caching;
|
||||
|
||||
|
||||
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;
|
||||
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;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package mightypork.util.constraints.num.caching;
|
||||
package mightypork.util.math.constraints.num.caching;
|
||||
|
||||
|
||||
import mightypork.util.annotations.DefaultImpl;
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.num.caching;
|
||||
package mightypork.util.math.constraints.num.caching;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
|
||||
|
||||
public class NumDigest {
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
package mightypork.util.constraints.num.mutable;
|
||||
package mightypork.util.math.constraints.num.mutable;
|
||||
|
||||
|
||||
import mightypork.util.control.timing.Pauseable;
|
||||
import mightypork.util.control.timing.Updateable;
|
||||
import mightypork.util.math.Calc;
|
||||
import mightypork.util.math.Easing;
|
||||
import mightypork.util.timing.Pauseable;
|
||||
import mightypork.util.timing.Updateable;
|
||||
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.constraints.num.mutable;
|
||||
package mightypork.util.math.constraints.num.mutable;
|
||||
|
||||
|
||||
import mightypork.util.math.Calc;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.constraints.num.mutable;
|
||||
package mightypork.util.math.constraints.num.mutable;
|
||||
|
||||
|
||||
import mightypork.util.math.Calc;
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.num.mutable;
|
||||
package mightypork.util.math.constraints.num.mutable;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.num.mutable;
|
||||
package mightypork.util.math.constraints.num.mutable;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.num.proxy;
|
||||
package mightypork.util.math.constraints.num.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
|
||||
|
||||
public abstract class NumAdapter extends Num {
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.num.proxy;
|
||||
package mightypork.util.math.constraints.num.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.num.proxy;
|
||||
package mightypork.util.math.constraints.num.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
|
||||
|
||||
public class NumBoundAdapter extends NumAdapter implements PluggableNumBound {
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.num.proxy;
|
||||
package mightypork.util.math.constraints.num.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
|
||||
|
||||
public class NumProxy extends NumAdapter {
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.constraints.num.proxy;
|
||||
package mightypork.util.math.constraints.num.proxy;
|
||||
|
||||
|
||||
/**
|
||||
+14
-14
@@ -1,20 +1,20 @@
|
||||
package mightypork.util.constraints.rect;
|
||||
package mightypork.util.math.constraints.rect;
|
||||
|
||||
|
||||
import mightypork.util.annotations.FactoryMethod;
|
||||
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;
|
||||
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;
|
||||
|
||||
|
||||
/**
|
||||
+5
-5
@@ -1,10 +1,10 @@
|
||||
package mightypork.util.constraints.rect;
|
||||
package mightypork.util.math.constraints.rect;
|
||||
|
||||
|
||||
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;
|
||||
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;
|
||||
|
||||
|
||||
/**
|
||||
+5
-5
@@ -1,11 +1,11 @@
|
||||
package mightypork.util.constraints.rect.builders;
|
||||
package mightypork.util.math.constraints.rect.builders;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.constraints.rect.Rect;
|
||||
import mightypork.util.constraints.rect.proxy.RectProxy;
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.logging.Log;
|
||||
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.math.constraints.vect.Vect;
|
||||
|
||||
|
||||
/**
|
||||
+5
-5
@@ -1,10 +1,10 @@
|
||||
package mightypork.util.constraints.rect.caching;
|
||||
package mightypork.util.math.constraints.rect.caching;
|
||||
|
||||
|
||||
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;
|
||||
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;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package mightypork.util.constraints.rect.caching;
|
||||
package mightypork.util.math.constraints.rect.caching;
|
||||
|
||||
|
||||
import mightypork.util.annotations.DefaultImpl;
|
||||
import mightypork.util.constraints.rect.Rect;
|
||||
import mightypork.util.math.constraints.rect.Rect;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.rect.caching;
|
||||
package mightypork.util.math.constraints.rect.caching;
|
||||
|
||||
|
||||
import mightypork.util.constraints.rect.Rect;
|
||||
import mightypork.util.math.constraints.rect.Rect;
|
||||
|
||||
|
||||
public class RectDigest {
|
||||
+11
-7
@@ -1,8 +1,8 @@
|
||||
package mightypork.util.constraints.rect.mutable;
|
||||
package mightypork.util.math.constraints.rect.mutable;
|
||||
|
||||
|
||||
import mightypork.util.constraints.rect.Rect;
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.rect.Rect;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
|
||||
|
||||
/**
|
||||
@@ -71,17 +71,21 @@ public abstract class RectMutable extends Rect {
|
||||
setTo(Vect.ZERO, Vect.ZERO);
|
||||
}
|
||||
|
||||
|
||||
public abstract void setOrigin(double x, double y);
|
||||
|
||||
public void setOrigin(Vect origin) {
|
||||
setOrigin(origin.x(), origin.y());
|
||||
|
||||
public void setOrigin(Vect origin)
|
||||
{
|
||||
setOrigin(origin.x(), origin.y());
|
||||
}
|
||||
|
||||
|
||||
public void setSize(Vect size) {
|
||||
public void setSize(Vect size)
|
||||
{
|
||||
setSize(size.x(), size.y());
|
||||
}
|
||||
|
||||
|
||||
|
||||
public abstract void setSize(double x, double y);
|
||||
}
|
||||
+5
-5
@@ -1,8 +1,8 @@
|
||||
package mightypork.util.constraints.rect.mutable;
|
||||
package mightypork.util.math.constraints.rect.mutable;
|
||||
|
||||
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.constraints.vect.mutable.VectVar;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.vect.mutable.VectVar;
|
||||
|
||||
|
||||
public class RectVar extends RectMutable {
|
||||
@@ -43,13 +43,13 @@ public class RectVar extends RectMutable {
|
||||
@Override
|
||||
public void setOrigin(double x, double y)
|
||||
{
|
||||
this.pos.setTo(x,y);
|
||||
this.pos.setTo(x, y);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void setSize(double x, double y)
|
||||
{
|
||||
this.size.setTo(x,y);
|
||||
this.size.setTo(x, y);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.constraints.rect.proxy;
|
||||
package mightypork.util.math.constraints.rect.proxy;
|
||||
|
||||
|
||||
/**
|
||||
+4
-4
@@ -1,9 +1,9 @@
|
||||
package mightypork.util.constraints.rect.proxy;
|
||||
package mightypork.util.math.constraints.rect.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.rect.Rect;
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.constraints.vect.proxy.VectAdapter;
|
||||
import mightypork.util.math.constraints.rect.Rect;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.vect.proxy.VectAdapter;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.rect.proxy;
|
||||
package mightypork.util.math.constraints.rect.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.rect.Rect;
|
||||
import mightypork.util.math.constraints.rect.Rect;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.rect.proxy;
|
||||
package mightypork.util.math.constraints.rect.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.rect.Rect;
|
||||
import mightypork.util.math.constraints.rect.Rect;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.rect.proxy;
|
||||
package mightypork.util.math.constraints.rect.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.rect.Rect;
|
||||
import mightypork.util.math.constraints.rect.Rect;
|
||||
|
||||
|
||||
public class RectProxy extends RectAdapter {
|
||||
+3
-3
@@ -1,8 +1,8 @@
|
||||
package mightypork.util.constraints.rect.proxy;
|
||||
package mightypork.util.math.constraints.rect.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.rect.Rect;
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.rect.Rect;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
|
||||
|
||||
/**
|
||||
+12
-12
@@ -1,19 +1,19 @@
|
||||
package mightypork.util.constraints.vect;
|
||||
package mightypork.util.math.constraints.vect;
|
||||
|
||||
|
||||
import mightypork.util.annotations.DefaultImpl;
|
||||
import mightypork.util.annotations.FactoryMethod;
|
||||
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;
|
||||
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;
|
||||
|
||||
|
||||
/**
|
||||
+5
-5
@@ -1,10 +1,10 @@
|
||||
package mightypork.util.constraints.vect;
|
||||
package mightypork.util.math.constraints.vect;
|
||||
|
||||
|
||||
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;
|
||||
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;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.vect;
|
||||
package mightypork.util.math.constraints.vect;
|
||||
|
||||
|
||||
import mightypork.util.constraints.vect.proxy.VectAdapter;
|
||||
import mightypork.util.math.constraints.vect.proxy.VectAdapter;
|
||||
|
||||
|
||||
public class VectProxy extends VectAdapter {
|
||||
+5
-5
@@ -1,10 +1,10 @@
|
||||
package mightypork.util.constraints.vect.caching;
|
||||
package mightypork.util.math.constraints.vect.caching;
|
||||
|
||||
|
||||
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;
|
||||
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;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package mightypork.util.constraints.vect.caching;
|
||||
package mightypork.util.math.constraints.vect.caching;
|
||||
|
||||
|
||||
import mightypork.util.annotations.DefaultImpl;
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.vect.caching;
|
||||
package mightypork.util.math.constraints.vect.caching;
|
||||
|
||||
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
|
||||
|
||||
public class VectDigest {
|
||||
+5
-5
@@ -1,12 +1,12 @@
|
||||
package mightypork.util.constraints.vect.mutable;
|
||||
package mightypork.util.math.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;
|
||||
import mightypork.util.timing.Pauseable;
|
||||
import mightypork.util.timing.Updateable;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.vect.mutable;
|
||||
package mightypork.util.math.constraints.vect.mutable;
|
||||
|
||||
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.constraints.vect.mutable;
|
||||
package mightypork.util.math.constraints.vect.mutable;
|
||||
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.constraints.vect.proxy;
|
||||
package mightypork.util.math.constraints.vect.proxy;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.vect.proxy;
|
||||
package mightypork.util.math.constraints.vect.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.vect.proxy;
|
||||
package mightypork.util.math.constraints.vect.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.constraints.vect.proxy;
|
||||
package mightypork.util.math.constraints.vect.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
|
||||
|
||||
public class VectBoundAdapter extends VectAdapter implements PluggableVectBound {
|
||||
+4
-4
@@ -1,9 +1,9 @@
|
||||
package mightypork.util.constraints.vect.proxy;
|
||||
package mightypork.util.math.constraints.vect.proxy;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.constraints.num.proxy.NumBound;
|
||||
import mightypork.util.constraints.vect.Vect;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.proxy.NumBound;
|
||||
import mightypork.util.math.constraints.vect.Vect;
|
||||
|
||||
|
||||
/**
|
||||
@@ -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;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
package mightypork.util.control.timing;
|
||||
package mightypork.util.timing;
|
||||
|
||||
|
||||
import mightypork.util.annotations.DefaultImpl;
|
||||
import mightypork.util.constraints.num.Num;
|
||||
import mightypork.util.constraints.num.mutable.NumAnimated;
|
||||
import mightypork.util.math.Easing;
|
||||
import mightypork.util.math.constraints.num.Num;
|
||||
import mightypork.util.math.constraints.num.mutable.NumAnimated;
|
||||
|
||||
|
||||
public abstract class Animator extends Num implements Updateable, Pauseable {
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package mightypork.util.control.timing;
|
||||
package mightypork.util.timing;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.mutable.NumAnimated;
|
||||
import mightypork.util.math.Easing;
|
||||
import mightypork.util.math.constraints.num.mutable.NumAnimated;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package mightypork.util.control.timing;
|
||||
package mightypork.util.timing;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.mutable.NumAnimated;
|
||||
import mightypork.util.math.Easing;
|
||||
import mightypork.util.math.constraints.num.mutable.NumAnimated;
|
||||
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.control.timing;
|
||||
package mightypork.util.timing;
|
||||
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.control.timing;
|
||||
package mightypork.util.timing;
|
||||
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package mightypork.util.control.timing;
|
||||
package mightypork.util.timing;
|
||||
|
||||
|
||||
import mightypork.util.constraints.num.mutable.NumAnimated;
|
||||
import mightypork.util.math.constraints.num.mutable.NumAnimated;
|
||||
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.control.timing;
|
||||
package mightypork.util.timing;
|
||||
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.control.timing;
|
||||
package mightypork.util.timing;
|
||||
|
||||
|
||||
/**
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package mightypork.util.control.timing;
|
||||
package mightypork.util.timing;
|
||||
|
||||
|
||||
/**
|
||||
Reference in New Issue
Block a user