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

Remove unnecessary methods.

Browse Source
This commit is contained in:
Pavel Kolchev 2015-03-28 21:48:29 +03:00
parent fbe87559c9
commit 2aaf5e73be
6 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/itdelatrisu/opsu/objects/Circle.java
View File

@ -184,9 +184,6 @@ public class Circle implements HitObject {
@Override @Override
public int getEndTime() { return hitObject.getTime(); } public int getEndTime() { return hitObject.getTime(); }
@Override
public OsuHitObject getHitObject() { return hitObject; }
@Override @Override
public void updatePosition() { public void updatePosition() {
this.x = hitObject.getScaledX(); this.x = hitObject.getScaledX();

3
src/itdelatrisu/opsu/objects/DummyObject.java
View File

@ -53,9 +53,6 @@ public class DummyObject implements HitObject {
@Override @Override
public boolean mousePressed(int x, int y, int trackPosition) { return false; } public boolean mousePressed(int x, int y, int trackPosition) { return false; }
@Override
public OsuHitObject getHitObject() { return hitObject; }
@Override @Override
public void updatePosition() { public void updatePosition() {
this.x = hitObject.getScaledX(); this.x = hitObject.getScaledX();

6
src/itdelatrisu/opsu/objects/HitObject.java
View File

@ -66,12 +66,6 @@ public interface HitObject {
*/ */
public int getEndTime(); public int getEndTime();
/**
* Return associated OsuHitObject.
* @return hit object as OsuHitObject
*/
public OsuHitObject getHitObject();
/** /**
* Updates position of hit object. * Updates position of hit object.
*/ */

3
src/itdelatrisu/opsu/objects/Slider.java
View File

@ -451,9 +451,6 @@ public class Slider implements HitObject {
return false; return false;
} }
@Override
public OsuHitObject getHitObject() { return hitObject; }
@Override @Override
public void updatePosition() { public void updatePosition() {
this.x = hitObject.getScaledX(); this.x = hitObject.getScaledX();

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

@ -263,9 +263,6 @@ public class Spinner implements HitObject {
return false; return false;
} }
@Override
public OsuHitObject getHitObject() { return hitObject; }
@Override @Override
public void updatePosition() {} public void updatePosition() {}

6
src/itdelatrisu/opsu/states/Game.java
View File

@ -1066,7 +1066,7 @@ public class Game extends BasicGameState {
// stack calculation // stack calculation
for (int i = hitObjects.length - 1; i > 0; i--) { for (int i = hitObjects.length - 1; i > 0; i--) {
OsuHitObject hitObjectI = hitObjects[i].getHitObject(); OsuHitObject hitObjectI = osu.objects[i];
// already calculated // already calculated
if (hitObjectI.getStack() != 0 || hitObjectI.isSpinner()) if (hitObjectI.getStack() != 0 || hitObjectI.isSpinner())
@ -1074,7 +1074,7 @@ public class Game extends BasicGameState {
// search for hit objects in stack // search for hit objects in stack
for (int n = i -1; n >= 0; n--) { for (int n = i -1; n >= 0; n--) {
OsuHitObject hitObjectN = hitObjects[n].getHitObject(); OsuHitObject hitObjectN = osu.objects[n];
if (hitObjectN.isSpinner()) if (hitObjectN.isSpinner())
continue; continue;
@ -1098,7 +1098,7 @@ public class Game extends BasicGameState {
if (distance < STACK_LENIENCE * OsuHitObject.getXMultiplier()) { if (distance < STACK_LENIENCE * OsuHitObject.getXMultiplier()) {
int offset = hitObjectI.getStack() - hitObjectN.getStack() + 1; int offset = hitObjectI.getStack() - hitObjectN.getStack() + 1;
for (int j = n + 1; j <= i; j++) { for (int j = n + 1; j <= i; j++) {
OsuHitObject hitObjectJ = hitObjects[j].getHitObject(); OsuHitObject hitObjectJ = osu.objects[j];
x1 = hitObjects[j].getPointAt(hitObjectJ.getTime())[0]; x1 = hitObjects[j].getPointAt(hitObjectJ.getTime())[0];
y1 = hitObjects[j].getPointAt(hitObjectJ.getTime())[1]; y1 = hitObjects[j].getPointAt(hitObjectJ.getTime())[1];
distance = Utils.distance(x1, y1, x2, y2); distance = Utils.distance(x1, y1, x2, y2);