From 3c15aeb9bdaaa0ffaaf130d5fd3e380fe3b5b601 Mon Sep 17 00:00:00 2001 From: yugecin Date: Sun, 4 Dec 2016 13:37:00 +0100 Subject: [PATCH] add aggressiveness in optionmenu --- src/itdelatrisu/opsu/Options.java | 9 +++++++++ src/yugecin/opsudance/movers/QuadraticBezierMover.java | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/itdelatrisu/opsu/Options.java b/src/itdelatrisu/opsu/Options.java index eefa7ada..4004d89f 100644 --- a/src/itdelatrisu/opsu/Options.java +++ b/src/itdelatrisu/opsu/Options.java @@ -56,6 +56,7 @@ 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.spinners.Spinner; import yugecin.opsudance.ui.SBOverlay; @@ -623,6 +624,14 @@ public class Options { } }, + DANCE_QUAD_BEZ_AGRESSIVE ("Quadratic Bezier aggressiveness", "QuadBezAgr", "AKA initial D factor", 500, 0, 2000) { + @Override + public void read(String s) { + super.read(s); + QuadraticBezierMover.aggressiveness = val / 10; + } + }, + DANCE_MOVER_DIRECTION ("Mover direction", "MoverDirection", "The direction the mover goes" ) { @Override public String getValueString() { diff --git a/src/yugecin/opsudance/movers/QuadraticBezierMover.java b/src/yugecin/opsudance/movers/QuadraticBezierMover.java index 94c75dbc..bedfd953 100644 --- a/src/yugecin/opsudance/movers/QuadraticBezierMover.java +++ b/src/yugecin/opsudance/movers/QuadraticBezierMover.java @@ -24,6 +24,7 @@ import java.awt.*; public class QuadraticBezierMover extends Mover { + public static int aggressiveness = 50; private static Point p; private static double prevspeed; @@ -50,7 +51,7 @@ public class QuadraticBezierMover extends Mover { //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; + prevspeed = (dist / totalTime) * aggressiveness; } @Override