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

Changed spinner calculations again

Browse Source 
Sets the RPM to the average of the last 50 velocities read by the
cursor.
This commit is contained in:
PizzaLovers007 2015-02-13 21:46:17 -06:00
parent 8e6ecd2326
commit c891cbeafa
1 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/itdelatrisu/opsu/objects/Spinner.java
View File

@ -38,12 +38,6 @@ import org.newdawn.slick.Image;
*/ */
public class Spinner implements HitObject { public class Spinner implements HitObject {
/** The rate at which the spinner slows down in rotations/second^2. */
private static final float ANGULAR_DRAG = 12f;
/** The maximum rate at which the spinner can speed up in rotations/second^2. */
private static final float MAX_ANGULAR_INCREASE = 26f;
/** Container dimensions. */ /** Container dimensions. */
private static int width, height; private static int width, height;
@ -61,12 +55,18 @@ public class Spinner implements HitObject {
/** The total number of rotations needed to clear the spinner. */ /** The total number of rotations needed to clear the spinner. */
private float rotationsNeeded; private float rotationsNeeded;
/** The current angular velocity of the spinner in rotations/second. */ /** The sum of all the velocities in storedVelocities. */
private float angularVelocity; private float sumVelocity = 0f;
/** Array of the last 50 rotation velocities. */
private float[] storedVelocities = new float[50];
/** True if the mouse cursor is pressed. */ /** True if the mouse cursor is pressed. */
private boolean isSpinning; private boolean isSpinning;
/** Current index of the stored velocities in rotations/second. */
private int velocityIndex = 0;
/** /**
* Initializes the Spinner data type with images and dimensions. * Initializes the Spinner data type with images and dimensions.
@ -132,6 +132,9 @@ public class Spinner implements HitObject {
if (extraRotations > 0) if (extraRotations > 0)
data.drawSymbolNumber(extraRotations * 1000, width / 2, height * 2 / 3, 1.0f); data.drawSymbolNumber(extraRotations * 1000, width / 2, height * 2 / 3, 1.0f);
} }
g.setColor(Color.white);
g.drawString(String.format("RPM: %d", Math.abs(Math.round(sumVelocity/storedVelocities.length*60))), 100, 100);
} }
/** /**
@ -212,31 +215,15 @@ public class Spinner implements HitObject {
// spin caused by the cursor // spin caused by the cursor
float cursorVelocity = 0; float cursorVelocity = 0;
if (isSpinning) if (isSpinning)
cursorVelocity = (float)(angleDiff / (Math.PI*2) / delta * 1000); cursorVelocity = Math.min((float)(angleDiff / (Math.PI*2) / delta * 1000), 8f);
// spin from the momentum of the spinner
float momentumVelocity = (angularVelocity > 0) ? sumVelocity -= storedVelocities[velocityIndex];
Math.max(0, angularVelocity - ANGULAR_DRAG * delta / 1000) : sumVelocity += cursorVelocity;
Math.min(0, angularVelocity + ANGULAR_DRAG * delta / 1000); storedVelocities[velocityIndex++] = cursorVelocity;
velocityIndex %= storedVelocities.length;
//sets the new angular velocity of the spinner
if (momentumVelocity > 0 && cursorVelocity < 0 ||
momentumVelocity < 0 && cursorVelocity > 0) {
angularVelocity = momentumVelocity + cursorVelocity;
} else if (Math.abs(cursorVelocity) > Math.abs(momentumVelocity)) {
// limit the increase in angular velocity
if (momentumVelocity > 0) {
angularVelocity = Math.min(cursorVelocity,
angularVelocity + MAX_ANGULAR_INCREASE * delta / 1000);
} else {
angularVelocity = Math.max(cursorVelocity,
angularVelocity - MAX_ANGULAR_INCREASE * delta / 1000);
}
} else {
angularVelocity = momentumVelocity;
}
data.changeHealth(delta * GameData.HP_DRAIN_MULTIPLIER); data.changeHealth(delta * GameData.HP_DRAIN_MULTIPLIER);
rotate(angularVelocity * (float)Math.PI*2 * delta / 1000); rotate(sumVelocity / storedVelocities.length * (float)Math.PI*2 * delta / 1000);
lastAngle = angle; lastAngle = angle;
return false; return false;