add quadratic bezier mover
This commit is contained in:
parent
fd39b69cbf
commit
f95d1c4669
|
@ -33,6 +33,7 @@ import itdelatrisu.opsu.objects.Slider;
|
||||||
import itdelatrisu.opsu.objects.curves.Vec2f;
|
import itdelatrisu.opsu.objects.curves.Vec2f;
|
||||||
import yugecin.opsudance.movers.LinearMover;
|
import yugecin.opsudance.movers.LinearMover;
|
||||||
import yugecin.opsudance.movers.Mover;
|
import yugecin.opsudance.movers.Mover;
|
||||||
|
import yugecin.opsudance.movers.QuadraticBezierMover;
|
||||||
import yugecin.opsudance.movers.factories.*;
|
import yugecin.opsudance.movers.factories.*;
|
||||||
import yugecin.opsudance.movers.slidermovers.DefaultSliderMoverController;
|
import yugecin.opsudance.movers.slidermovers.DefaultSliderMoverController;
|
||||||
import yugecin.opsudance.movers.slidermovers.InheritedSliderMoverController;
|
import yugecin.opsudance.movers.slidermovers.InheritedSliderMoverController;
|
||||||
|
@ -55,6 +56,7 @@ public class Dancer {
|
||||||
new CenterSpiralMoverFactory(),
|
new CenterSpiralMoverFactory(),
|
||||||
//new LinearFactory(),
|
//new LinearFactory(),
|
||||||
new ArcFactory(),
|
new ArcFactory(),
|
||||||
|
new QuadraticBezierMoverFactory(),
|
||||||
};
|
};
|
||||||
|
|
||||||
public static Spinner[] spinners = new Spinner[] {
|
public static Spinner[] spinners = new Spinner[] {
|
||||||
|
@ -131,6 +133,7 @@ public class Dancer {
|
||||||
for (Spinner s : spinners) {
|
for (Spinner s : spinners) {
|
||||||
s.init();
|
s.init();
|
||||||
}
|
}
|
||||||
|
QuadraticBezierMover.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getSpinnerIndex() {
|
public int getSpinnerIndex() {
|
||||||
|
|
71
src/yugecin/opsudance/movers/QuadraticBezierMover.java
Normal file
71
src/yugecin/opsudance/movers/QuadraticBezierMover.java
Normal file
|
@ -0,0 +1,71 @@
|
||||||
|
/*
|
||||||
|
* opsu!dance - fork of opsu! with cursordance auto
|
||||||
|
* Copyright (C) 2016 yugecin
|
||||||
|
*
|
||||||
|
* opsu!dance is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* opsu!dance is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with opsu!dance. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package yugecin.opsudance.movers;
|
||||||
|
|
||||||
|
import itdelatrisu.opsu.Utils;
|
||||||
|
import itdelatrisu.opsu.objects.GameObject;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
|
||||||
|
public class QuadraticBezierMover extends Mover {
|
||||||
|
|
||||||
|
private static Point p;
|
||||||
|
private static double prevspeed;
|
||||||
|
|
||||||
|
public static void reset() {
|
||||||
|
p = new Point(0, 0);
|
||||||
|
prevspeed = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private int startTime;
|
||||||
|
private int totalTime;
|
||||||
|
|
||||||
|
public QuadraticBezierMover(GameObject start, GameObject end, int dir) {
|
||||||
|
super(start, end, dir);
|
||||||
|
this.startTime = start.getEndTime();
|
||||||
|
this.totalTime = end.getTime() - startTime;
|
||||||
|
|
||||||
|
double startAngle = Math.atan2(startY - p.y, startX - p.x);
|
||||||
|
double angDiff = Math.atan2(startY - endY, startX - endX) - startAngle;
|
||||||
|
while (angDiff < 0) angDiff += Math.PI;
|
||||||
|
while (angDiff > Math.PI) angDiff -= Math.PI;
|
||||||
|
angDiff -= Math.PI / 2;
|
||||||
|
if (angDiff < 0) angDiff = -angDiff;
|
||||||
|
double dist = Utils.distance(startX, startY, endX, endY);
|
||||||
|
//double speed = dist / 10 + dist * (Math.PI - angDiff) / Math.PI;
|
||||||
|
p.x = (int) (startX + Math.cos(startAngle) * prevspeed);
|
||||||
|
p.y = (int) (startY + Math.sin(startAngle) * prevspeed);
|
||||||
|
prevspeed = (dist / totalTime) * 50;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public double[] getPointAt(int time) {
|
||||||
|
double t = (double) (time - startTime) / totalTime;
|
||||||
|
double ct = (1 - t);
|
||||||
|
return new double[] {
|
||||||
|
ct * ct * startX + ct * 2 * t * p.x + t * t * endX,
|
||||||
|
ct * ct * startY + ct * 2 * t * p.y + t * t * endY,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getName() {
|
||||||
|
return "Quadratic Bezier";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,36 @@
|
||||||
|
/*
|
||||||
|
* opsu!dance - fork of opsu! with cursordance auto
|
||||||
|
* Copyright (C) 2016 yugecin
|
||||||
|
*
|
||||||
|
* opsu!dance is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* opsu!dance is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with opsu!dance. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package yugecin.opsudance.movers.factories;
|
||||||
|
|
||||||
|
import itdelatrisu.opsu.objects.GameObject;
|
||||||
|
import yugecin.opsudance.movers.Mover;
|
||||||
|
import yugecin.opsudance.movers.QuadraticBezierMover;
|
||||||
|
|
||||||
|
public class QuadraticBezierMoverFactory implements MoverFactory {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Mover create(GameObject start, GameObject end, int dir) {
|
||||||
|
return new QuadraticBezierMover(start, end, dir);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "Quadratic bezier";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user