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

kickoff slidermovers

Browse Source
This commit is contained in:
yugecin 2016-11-12 15:41:20 +01:00
parent 93a4af30d2
commit 25d16ddfae
7 changed files with 185 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -626,6 +626,29 @@ public class Options {
}
},
DANCE_SLIDER_MOVER_TYPE ("Slider mover", "SliderMover", "How to move in sliders") {
@Override
public String getValueString() {
return Dancer.sliderMoverController.toString();
}
@Override
public Object[] getListItems() {
return Dancer.sliderMovers;
}
@Override
public void clickListItem(int index) {
Dancer.sliderMoverController = Dancer.sliderMovers[index];
}
@Override
public void read(String s) {
super.read(s);
Dancer.sliderMoverController = Dancer.sliderMovers[val];
}
},
DANCE_SPINNER ("Spinner", "Spinner", "Spinner style") {
@Override
public Object[] getListItems() {

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

@ -111,6 +111,7 @@ public class OptionsMenu extends BasicGameState {
DANCE ("Dance", new GameOption[] {
GameOption.DANCE_MOVER,
GameOption.DANCE_MOVER_DIRECTION,
GameOption.DANCE_SLIDER_MOVER_TYPE,
GameOption.DANCE_SPINNER,
GameOption.DANCE_SPINNER_DELAY,
GameOption.DANCE_LAZY_SLIDERS,

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

@ -29,6 +29,10 @@ import itdelatrisu.opsu.objects.Slider;
import itdelatrisu.opsu.objects.curves.Vec2f;
import yugecin.opsudance.movers.Mover;
import yugecin.opsudance.movers.factories.*;
import yugecin.opsudance.movers.slidermovers.DefaultSliderMoverController;
import yugecin.opsudance.movers.slidermovers.InheritedSliderMoverController;
import yugecin.opsudance.movers.slidermovers.OveriddenSliderMoverController;
import yugecin.opsudance.movers.slidermovers.SliderMoverController;
import yugecin.opsudance.spinners.*;
public class Dancer {
@ -61,6 +65,12 @@ public class Dancer {
new SpiralSpinner(),
};
public static SliderMoverController[] sliderMovers = new SliderMoverController[] {
new DefaultSliderMoverController(),
new InheritedSliderMoverController(),
new OveriddenSliderMoverController()
};
public static Dancer instance = new Dancer();
public static boolean mirror = false; // this should really get its own place somewhere...
@ -86,6 +96,7 @@ public class Dancer {
private MoverFactory moverFactory;
private Mover mover;
private Spinner spinner;
public static SliderMoverController sliderMoverController;
private int moverFactoryIndex;
private int spinnerIndex;
@ -100,6 +111,7 @@ public class Dancer {
public Dancer() {
moverFactory = moverFactories[0];
spinner = spinners[0];
sliderMoverController = sliderMovers[0];
}
public void reset() {
@ -144,6 +156,7 @@ public class Dancer {
c.start.set((float) spinnerStartPoint[0], (float) spinnerStartPoint[1]);
}
}
c = sliderMoverController.process(c);
isCurrentLazySlider = false;
// detect lazy sliders, should work pretty good
if (c.isSlider() && LAZY_SLIDERS && Utils.distance(c.start.x, c.start.y, c.end.x, c.end.y) <= Circle.diameter * 0.8f) {
@ -164,6 +177,12 @@ public class Dancer {
mover = moverFactory.create(p, c, dir);
}
GameObject next = sliderMoverController.processNext(time);
if (next != null) {
update(time, c, next);
return;
}
if (time < c.getTime()) {
if (!p.isSpinner() || !c.isSpinner()) {
double[] point = mover.getPointAt(time);

38
src/yugecin/opsudance/movers/slidermovers/DefaultSliderMoverController.java Normal file
View File

@ -0,0 +1,38 @@
/*
* 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.slidermovers;
import itdelatrisu.opsu.objects.GameObject;
public class DefaultSliderMoverController implements SliderMoverController {
@Override
public GameObject process(GameObject obj) {
return obj;
}
@Override
public GameObject processNext(int time) {
return null;
}
@Override
public String toString() {
return "Nothing special, just follow it";
}
}

39
src/yugecin/opsudance/movers/slidermovers/InheritedSliderMoverController.java Normal file
View File

@ -0,0 +1,39 @@
/*
* 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.slidermovers;
import itdelatrisu.opsu.objects.GameObject;
public class InheritedSliderMoverController implements SliderMoverController {
@Override
public GameObject process(GameObject obj) {
return obj;
}
@Override
public GameObject processNext(int time) {
return null;
}
@Override
public String toString() {
return "Inherited from normal mover";
}
}

38
src/yugecin/opsudance/movers/slidermovers/OveriddenSliderMoverController.java Normal file
View File

@ -0,0 +1,38 @@
/*
* 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.slidermovers;
import itdelatrisu.opsu.objects.GameObject;
public class OveriddenSliderMoverController implements SliderMoverController {
@Override
public GameObject process(GameObject obj) {
return obj;
}
@Override
public GameObject processNext(int time) {
return null;
}
@Override
public String toString() {
return "Use own algorithm";
}
}

27
src/yugecin/opsudance/movers/slidermovers/SliderMoverController.java Normal file
View File

@ -0,0 +1,27 @@
/*
* 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.slidermovers;
import itdelatrisu.opsu.objects.GameObject;
public interface SliderMoverController {
GameObject process(GameObject obj);
GameObject processNext(int time);
}