something
This commit is contained in:
parent
3bd16a8593
commit
a671f9dba2
|
@ -70,8 +70,6 @@ public class ArcMover extends PolyMover {
|
|||
percent = ((double) time - middle.getTime()) / (p2.getTime() - middle.getTime());
|
||||
angle = beta + (gamma - beta) * percent;
|
||||
}
|
||||
if (angle > PI)
|
||||
angle -= PI;
|
||||
return new double[]{
|
||||
xm + r * cos(angle),
|
||||
ym + r * sin(angle)
|
||||
|
|
|
@ -18,7 +18,8 @@ public class ArcFactory implements PolyMoverFactory {
|
|||
public double[] getPointAt(int time) {
|
||||
if (previous == null) {
|
||||
return current.getPointAt(time);
|
||||
} else if (current == null) {
|
||||
}
|
||||
if (current == null) {
|
||||
return previous.getPointAt(time);
|
||||
}
|
||||
|
||||
|
@ -45,7 +46,9 @@ public class ArcFactory implements PolyMoverFactory {
|
|||
startIndex++;
|
||||
}
|
||||
GameObject middle = objects[startIndex + 1];
|
||||
if (middle.isSlider() || middle.isSpinner() || !ArcMover.canCricleExistBetweenItems(objects[startIndex], middle, objects[startIndex + 2]))
|
||||
if (middle.isSlider() || middle.isSpinner())
|
||||
return;
|
||||
if (!ArcMover.canCricleExistBetweenItems(objects[startIndex], middle, objects[startIndex + 2]))
|
||||
current = new LineMover(objects, startIndex, 3);
|
||||
else
|
||||
current = new ArcMover(objects[startIndex], middle, objects[startIndex + 2]);
|
||||
|
@ -57,7 +60,6 @@ public class ArcFactory implements PolyMoverFactory {
|
|||
|
||||
public void update(GameObject p) {
|
||||
GameObject[] items = current.getItems();
|
||||
System.out.println(items.length);
|
||||
GameObject last = items[items.length - 1];
|
||||
if (last != p) {
|
||||
previous = current;
|
||||
|
|
|
@ -594,7 +594,7 @@ public class Options {
|
|||
DISABLE_UPDATER ("Disable Automatic Updates", "DisableUpdater", "Disable automatic checking for updates upon starting opsu!.", false),
|
||||
ENABLE_WATCH_SERVICE ("Enable Watch Service", "WatchService", "Watch the beatmap directory for changes. Requires a restart.", false),
|
||||
|
||||
DANCE_MOVER_TYPE("Mover Type", "Mover type", "More Points", Dancer.multipoint) {
|
||||
DANCE_MOVER_TYPE("Mover Type", "Mover type", "More than 2 Points", Dancer.multipoint) {
|
||||
@Override
|
||||
public void click(GameContainer container) {
|
||||
bool = !bool;
|
||||
|
|
|
@ -266,16 +266,17 @@ public class Dancer {
|
|||
double[] spinnerStartPoint = spinner.getPoint();
|
||||
c.start = new Vec2f((float) spinnerStartPoint[0], (float) spinnerStartPoint[1]);
|
||||
}
|
||||
if (polyMoverFactory.isInitialized() && polyMoverFactory.getLatestIndex() < objectIndex + polyMoverFactory.getPrefferedBufferSize() - 1) {
|
||||
polyMoverFactory.update(gameObjects[ objectIndex + polyMoverFactory.getPrefferedBufferSize() - 1]);
|
||||
|
||||
if (polyMoverFactory.isInitialized() && polyMoverFactory.getLatestIndex() < objectIndex + polyMoverFactory.getPrefferedBufferSize()) {
|
||||
polyMoverFactory.update(gameObjects[polyMoverFactory.getLatestIndex()]);
|
||||
}
|
||||
else {
|
||||
polyMoverFactory.init(gameObjects, objectIndex);
|
||||
polyMoverFactory.init(gameObjects, objectIndex - 1);
|
||||
}
|
||||
}
|
||||
|
||||
if (time < c.getTime()) {
|
||||
if (!p.isSpinner() || !c.isSpinner()) {
|
||||
if (!p.isSpinner() || !c.isSpinner() && polyMoverFactory.isInitialized()) {
|
||||
double[] point = polyMoverFactory.getPointAt(time);
|
||||
x = (float) point[0];
|
||||
y = (float) point[1];
|
||||
|
|
Loading…
Reference in New Issue
Block a user