Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'quadrbez'

Browse Source
This commit is contained in:
yugecin 2016-12-04 14:31:55 +01:00
commit 3e1d45e8ea
6 changed files with 172 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/itdelatrisu/opsu/Options.java
View File

@ -56,7 +56,9 @@ import com.sun.jna.platform.win32.Advapi32Util;
import com.sun.jna.platform.win32.Win32Exception;
import com.sun.jna.platform.win32.WinReg;
import yugecin.opsudance.*;
import yugecin.opsudance.movers.QuadraticBezierMover;
import yugecin.opsudance.movers.factories.AutoMoverFactory;
import yugecin.opsudance.movers.factories.QuadraticBezierMoverFactory;
import yugecin.opsudance.spinners.Spinner;
import yugecin.opsudance.ui.SBOverlay;
@ -623,6 +625,30 @@ public class Options {
}
},
DANCE_QUAD_BEZ_AGGRESSIVENESS ("Quadratic Bezier aggressiveness", "QuadBezAgr", "AKA initial D factor", 50, 0, 200) {
@Override
public String getValueString() {
return val + "";
}
@Override
public void drag(GameContainer container, int d) {
super.drag(container, d);
QuadraticBezierMover.aggressiveness = val;
}
@Override
public boolean showCondition() {
return Dancer.moverFactories[Dancer.instance.getMoverFactoryIndex()] instanceof QuadraticBezierMoverFactory;
}
@Override
public void read(String s) {
super.read(s);
QuadraticBezierMover.aggressiveness = val;
}
},
DANCE_MOVER_DIRECTION ("Mover direction", "MoverDirection", "The direction the mover goes" ) {
@Override
public String getValueString() {
@ -1252,6 +1278,13 @@ public class Options {
this.type = OptionType.NUMERIC;
}
/**
* should the option be shown
* @return true if the option should be shown
*/
public boolean showCondition() {
return true;
}
/**
* Returns the option name.
* @return the name string

16
src/itdelatrisu/opsu/states/OptionsMenu.java
View File

@ -113,6 +113,7 @@ public class OptionsMenu extends BasicGameState {
}),
DANCE ("Dance", new GameOption[] {
GameOption.DANCE_MOVER,
GameOption.DANCE_QUAD_BEZ_AGGRESSIVENESS,
GameOption.DANCE_MOVER_DIRECTION,
GameOption.DANCE_SLIDER_MOVER_TYPE,
GameOption.DANCE_SPINNER,
@ -277,9 +278,12 @@ public class OptionsMenu extends BasicGameState {
if (selectedOption != null) {
hoverOption = selectedOption;
}
for (int i = 0; i < currentTab.options.length; i++) {
for (int i = 0, j = 0; i < currentTab.options.length; i++) {
GameOption option = currentTab.options[i];
drawOption(option, i, hoverOption == option);
if (!option.showCondition()) {
continue;
}
drawOption(option, j++, hoverOption == option);
}
// option tabs
@ -602,6 +606,14 @@ public class OptionsMenu extends BasicGameState {
if (index >= currentTab.options.length)
return null;
int i = index;
while (i >= 0) {
if (!currentTab.options[i--].showCondition()) {
if (++index >= currentTab.options.length) {
return null;
}
}
}
return currentTab.options[index];
}
}

3
src/yugecin/opsudance/Dancer.java
View File

@ -33,6 +33,7 @@ import itdelatrisu.opsu.objects.Slider;
import itdelatrisu.opsu.objects.curves.Vec2f;
import yugecin.opsudance.movers.LinearMover;
import yugecin.opsudance.movers.Mover;
import yugecin.opsudance.movers.QuadraticBezierMover;
import yugecin.opsudance.movers.factories.*;
import yugecin.opsudance.movers.slidermovers.DefaultSliderMoverController;
import yugecin.opsudance.movers.slidermovers.InheritedSliderMoverController;
@ -55,6 +56,7 @@ public class Dancer {
new CenterSpiralMoverFactory(),
//new LinearFactory(),
new ArcFactory(),
new QuadraticBezierMoverFactory(),
};
public static Spinner[] spinners = new Spinner[] {
@ -131,6 +133,7 @@ public class Dancer {
for (Spinner s : spinners) {
s.init();
}
QuadraticBezierMover.reset();
}
public int getSpinnerIndex() {

72
src/yugecin/opsudance/movers/QuadraticBezierMover.java Normal file
View File

@ -0,0 +1,72 @@
/*
* 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 {
public static int aggressiveness = 50;
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) * aggressiveness;
}
@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";
}
}

36
src/yugecin/opsudance/movers/factories/QuadraticBezierMoverFactory.java Normal file
View File

@ -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";
}
}

16
src/yugecin/opsudance/ui/OptionsOverlay.java
View File

@ -36,6 +36,7 @@ public class OptionsOverlay {
private static Options.GameOption[] options = new Options.GameOption[] {
Options.GameOption.DANCE_MOVER,
Options.GameOption.DANCE_QUAD_BEZ_AGGRESSIVENESS,
Options.GameOption.DANCE_MOVER_DIRECTION,
Options.GameOption.DANCE_SLIDER_MOVER_TYPE,
Options.GameOption.DANCE_SPINNER,
@ -99,8 +100,11 @@ public class OptionsOverlay {
g.setColor(Color.black);
g.fillRect(0, 0, width, height);
Color.black.a = a;
for (int i = 0; i < options.length; i++) {
drawOption(g, options[i], i, selectedOption == null ? hoverIdx == i : selectedOption == options[i]);
for (int i = 0, j = 0; i < options.length; i++) {
if (!options[i].showCondition()) {
continue;
}
drawOption(g, options[i], j++, selectedOption == null ? hoverIdx == i : selectedOption == options[i]);
}
if (list.isVisible()) {
list.render(container, game, g);
@ -123,6 +127,14 @@ public class OptionsOverlay {
if (index >= options.length) {
return -1;
}
int i = index;
while (i >= 0) {
if (!options[i--].showCondition()) {
if (++index >= options.length) {
return -1;
}
}
}
return index;
}