Spinner Test 3

Clean up
This commit is contained in:
fd
2015-06-21 19:45:38 -04:00
parent 038a5d5779
commit 3675a25c44
8 changed files with 97 additions and 63 deletions

View File

@@ -122,7 +122,6 @@ public class Slider implements GameObject {
int diameterInt = (int)diameter;
followRadius = diameter / 2 * 3f;
//TODO conflict
/*
int diameter = (int) (104 - (circleSize * 8));
diameter = (int) (diameter * HitObject.getXMultiplier()); // convert from Osupixels (640x480)
@@ -345,7 +344,7 @@ public class Slider implements GameObject {
result = GameData.HIT_50;
else
result = GameData.HIT_MISS;
float cx, cy;
HitObjectType type;
if (currentRepeats % 2 == 0) { // last circle
@@ -433,7 +432,7 @@ public class Slider implements GameObject {
if (keyPressed || GameMod.RELAX.isActive()) {
float[] c = curve.pointAt(getT(trackPosition, false));
double distance = Math.hypot(c[0] - mouseX, c[1] - mouseY);
if (distance < followRadius) //TODO IDK Magic numbers
if (distance < followRadius)
sliderClickedFinal = true;
}