Updates and fixes from fluddokt/opsu@76778f8 and fluddokt/opsu@cf321e9.
- Rotate slider ball image along the curve. - Show download speed and time remaining when hovering over the download info button. - Maintain aspect ratio of beatmap background image during gameplay. - Clear beatmap background image cache after reaching OsuFile.MAX_CACHE_SIZE. - Multiply hit circle size by OsuHitObject.getXMultiplier(). - Scale MENU_BUTTON_BG based on SongMenu.MAX_SONG_BUTTONS. - Fixed download search TextField retaining focus even after leaving the downloads menu. - Include Unicode title/artist strings in searches. - Parse x,y beatmap coordinates as floats (instead of integers), and only read Kiai time if present. - Added 1600x1200 resolution. Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
@@ -56,7 +56,7 @@ public class Circle implements HitObject {
|
||||
*/
|
||||
public static void init(GameContainer container, float circleSize) {
|
||||
int diameter = (int) (96 - (circleSize * 8));
|
||||
diameter = diameter * container.getWidth() / 640; // convert from Osupixels (640x480)
|
||||
diameter = (int) (diameter * OsuHitObject.getXMultiplier()); // convert from Osupixels (640x480)
|
||||
GameImage.HITCIRCLE.setImage(GameImage.HITCIRCLE.getImage().getScaledCopy(diameter, diameter));
|
||||
GameImage.HITCIRCLE_OVERLAY.setImage(GameImage.HITCIRCLE_OVERLAY.getImage().getScaledCopy(diameter, diameter));
|
||||
GameImage.APPROACHCIRCLE.setImage(GameImage.APPROACHCIRCLE.getImage().getScaledCopy(diameter, diameter));
|
||||
|
||||
@@ -99,7 +99,7 @@ public class Slider implements HitObject {
|
||||
*/
|
||||
public static void init(GameContainer container, float circleSize, OsuFile osu) {
|
||||
int diameter = (int) (96 - (circleSize * 8));
|
||||
diameter = diameter * container.getWidth() / 640; // convert from Osupixels (640x480)
|
||||
diameter = (int) (diameter * OsuHitObject.getXMultiplier()); // convert from Osupixels (640x480)
|
||||
|
||||
// slider ball
|
||||
Image[] sliderBallImages;
|
||||
@@ -211,9 +211,13 @@ public class Slider implements HitObject {
|
||||
Utils.drawCentered(GameImage.APPROACHCIRCLE.getImage().getScaledCopy(approachScale), x, y, color);
|
||||
} else {
|
||||
float[] c = curve.pointAt(getT(trackPosition, false));
|
||||
float[] c2 = curve.pointAt(getT(trackPosition, false) + 0.01f);
|
||||
|
||||
// slider ball
|
||||
Utils.drawCentered(sliderBall, c[0], c[1]);
|
||||
Image sliderBallFrame = sliderBall.getCurrentFrame();
|
||||
float angle = (float) (Math.atan2(c2[1] - c[1], c2[0] - c[0]) * 180 / Math.PI);
|
||||
sliderBallFrame.setRotation(angle);
|
||||
sliderBallFrame.drawCentered(c[0], c[1]);
|
||||
|
||||
// follow circle
|
||||
if (followCircleActive)
|
||||
|
||||
Reference in New Issue
Block a user