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

get tick points from slider

Browse Source
This commit is contained in:
yugecin
2016-11-12 18:25:44 +01:00
parent 9860175196
commit 3dc0ad8c68
4 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,6 +91,11 @@ public class Circle extends GameObject {
mirrorColor = Dancer.colorMirrorOverride.getColor(comboColorIndex);
}
public Circle(float x, float y, int time) {
hitObject = new HitObject(x, y, time);
super.updateStartEndPositions(time);
}
@Override
public void draw(Graphics g, int trackPosition, boolean mirror) {
Color orig = color;
@@ -229,6 +234,7 @@ public class Circle extends GameObject {
public void updatePosition() {
this.x = hitObject.getScaledX();
this.y = hitObject.getScaledY();
super.updateStartEndPositions(hitObject.getTime());
}
@Override

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

@@ -32,7 +32,6 @@ import itdelatrisu.opsu.states.Game;
import itdelatrisu.opsu.ui.Colors;
import itdelatrisu.opsu.ui.animations.AnimationEquation;
import org.lwjgl.opengl.GL11;
import org.newdawn.slick.Color;
import org.newdawn.slick.GameContainer;
import org.newdawn.slick.Graphics;
@@ -688,4 +687,27 @@ public class Slider extends GameObject {
return mirrorColor;
}
public Circle[] getTickPositionCircles() {
float tickLengthDiv = 100f * sliderMultiplier / sliderTickRate / (game.getBeatLength() / game.getBeatLengthBase());
int tickCount = (int) Math.ceil(pixelLength / tickLengthDiv) - 1;
Circle[] ticks = new Circle[1 + ( tickCount + 1 ) * repeats];
Vec2f pos;
pos = getPointAt( getTime() );
pos.set( HitObject.unscaleX( pos.x ), HitObject.unscaleY( pos.y ) );
ticks[0] = new Circle(pos.x, pos.y, getTime() );
float tickTOffset = 1f / (tickCount + 1) / repeats;
float t = tickTOffset;
for( int i = 0; i < (tickCount + 1) * repeats; i++, t += tickTOffset ) {
pos = getPointAt( getTime() + (int) (t * sliderTimeTotal ) );
pos.set( HitObject.unscaleX( pos.x ), HitObject.unscaleY( pos.y ) );
ticks[1 + i] = new Circle(pos.x, pos.y, getTime() + (int) (t * sliderTimeTotal));
}
for(Circle c : ticks) {
c.updatePosition();
}
return ticks;
}
}