better inbounds check
This commit is contained in:
parent
6788cd84d8
commit
1f68136639
|
@ -29,6 +29,7 @@ public class AutoMoverFactory implements MoverFactory {
|
||||||
|
|
||||||
public static boolean ONLY_CIRCLE_STACKS = false;
|
public static boolean ONLY_CIRCLE_STACKS = false;
|
||||||
public static int CIRCLE_STREAM = 58;
|
public static int CIRCLE_STREAM = 58;
|
||||||
|
private int starttime;
|
||||||
private int endtime;
|
private int endtime;
|
||||||
protected Mover m;
|
protected Mover m;
|
||||||
|
|
||||||
|
@ -52,6 +53,7 @@ public class AutoMoverFactory implements MoverFactory {
|
||||||
return new LinearMover(start, end, dir);
|
return new LinearMover(start, end, dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
starttime = start.getEndTime();
|
||||||
endtime = end.getTime();
|
endtime = end.getTime();
|
||||||
|
|
||||||
double velocity = distance / dt;
|
double velocity = distance / dt;
|
||||||
|
@ -92,10 +94,13 @@ public class AutoMoverFactory implements MoverFactory {
|
||||||
return last;
|
return last;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected boolean inbounds( Mover m )
|
@SuppressWarnings("SimplifiableIfStatement")
|
||||||
|
protected boolean inbounds(Mover m )
|
||||||
{
|
{
|
||||||
this.m = m;
|
this.m = m;
|
||||||
return checkBounds(m.getPointAt(endtime));
|
if (!checkBounds(m.getPointAt((int) (starttime + (endtime - starttime) * 0.3)))) return false;
|
||||||
|
if (!checkBounds(m.getPointAt((int) (starttime + (endtime - starttime) * 0.7)))) return false;
|
||||||
|
return checkBounds(m.getPointAt((int) (starttime + (endtime - starttime) * 0.5)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean checkBounds( double[] pos )
|
private boolean checkBounds( double[] pos )
|
||||||
|
|
Loading…
Reference in New Issue
Block a user