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

Minor Fixes for beziers angles

Browse Source
This commit is contained in:
fd 2015-01-29 01:08:23 -05:00
parent 07f6ef9479
commit 0e9fd24754
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -521,7 +521,9 @@ public class Slider implements HitObject {
for(int i=0; i<npoints; i++){ for(int i=0; i<npoints; i++){
Vec2f tpoi = new Vec2f(getX(i), getY(i)); Vec2f tpoi = new Vec2f(getX(i), getY(i));
if(lastPoi!=null && tpoi.equals(lastPoi)){ if(lastPoi!=null && tpoi.equals(lastPoi)){
if(points.size()>=2){
beziers.add(new Bezier2(points.toArray(new Vec2f[0]))); beziers.add(new Bezier2(points.toArray(new Vec2f[0])));
}
points.clear(); points.clear();
} }
points.add(tpoi); points.add(tpoi);
@ -588,10 +590,18 @@ public class Slider implements HitObject {
} }
//if (hitObject.getRepeatCount() > 1) { //if (hitObject.getRepeatCount() > 1) {
Vec2f c1 = curve[0]; Vec2f c1 = curve[0];
Vec2f c2 = curve[1]; int cnt = 1;
Vec2f c2 = curve[cnt++];
while(c2.cpy().sub(c1).len()<1){
c2 = curve[cnt++];
}
startAngle = (float) (Math.atan2(c2.y - c1.y, c2.x - c1.x) * 180 / Math.PI); startAngle = (float) (Math.atan2(c2.y - c1.y, c2.x - c1.x) * 180 / Math.PI);
c1 = curve[ncurve-1]; c1 = curve[ncurve-1];
c2 = curve[ncurve-2]; cnt= ncurve-2;
c2 = curve[cnt];
while(c2.cpy().sub(c1).len()<1){
c2 = curve[cnt--];
}
endAngle = (float) (Math.atan2(c2.y - c1.y, c2.x - c1.x) * 180 / Math.PI); endAngle = (float) (Math.atan2(c2.y - c1.y, c2.x - c1.x) * 180 / Math.PI);
//} //}
//System.out.println("Total Distance: "+totalDistance+" "+distanceAt+" "+beziers.size()+" "+hitObject.getPixelLength()+" "+hitObject.xMultiplier); //System.out.println("Total Distance: "+totalDistance+" "+distanceAt+" "+beziers.size()+" "+hitObject.getPixelLength()+" "+hitObject.xMultiplier);