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

Follow-up to ab1a377: now using Graphics.setClip().

Browse Source 
Partial revert of changes made in that commit; also made song menu header/footer partially transparent again.  Thanks to @fluddokt.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-02-19 23:45:48 -05:00
parent 80c66a98c3
commit dfeb93d696
2 changed files with 30 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/itdelatrisu/opsu/OsuGroupNode.java
View File

@ -54,17 +54,11 @@ public class OsuGroupNode {
* Draws the button.
* @param x the x coordinate
* @param y the y coordinate
* @param headerY the header end y coordinate (for cropping)
* @param footerY the footer start y coordinate (for cropping)
* @param grade the highest grade, if any
* @param focus true if this is the focused node
*/
public void draw(float x, float y, float headerY, float footerY, Grade grade, boolean focus) {
// don't draw if out of bounds
public void draw(float x, float y, Grade grade, boolean focus) {
Image bg = GameImage.MENU_BUTTON_BG.getImage();
if (y + bg.getHeight() < headerY || y > footerY)
return;
boolean expanded = (osuFileIndex > -1);
OsuFile osu;
bg.setAlpha(0.9f);
@ -72,7 +66,7 @@ public class OsuGroupNode {
Color textColor = Color.lightGray;
// get drawing parameters
if (expanded) { // expanded
if (expanded) {
x -= bg.getWidth() / 10f;
if (focus) {
bgColor = Color.white;
@ -84,18 +78,7 @@ public class OsuGroupNode {
bgColor = Utils.COLOR_ORANGE_BUTTON;
osu = osuFiles.get(0);
}
// crop image if necessary
if (y < headerY) {
int cropHeight = (int) (headerY - y);
Image bgCropped = bg.getSubImage(0, cropHeight, bg.getWidth(), bg.getHeight() - cropHeight);
bgCropped.draw(x, headerY, bgColor);
} else if (y + bg.getHeight() > footerY) {
int cropHeight = (int) (footerY - y);
Image bgCropped = bg.getSubImage(0, 0, bg.getWidth(), cropHeight);
bgCropped.draw(x, y, bgColor);
} else
bg.draw(x, y, bgColor);
bg.draw(x, y, bgColor);
float cx = x + (bg.getWidth() * 0.05f);
float cy = y + (bg.getHeight() * 0.2f) - 3;
@ -107,17 +90,11 @@ public class OsuGroupNode {
cx += gradeImg.getWidth();
}
// draw text (TODO: crop text)
float textY = cy;
if (textY + Utils.FONT_MEDIUM.getLineHeight() >= headerY && textY <= footerY)
Utils.FONT_MEDIUM.drawString(cx, cy, osu.getTitle(), textColor);
textY += Utils.FONT_MEDIUM.getLineHeight() - 4;
if (textY + Utils.FONT_MEDIUM.getLineHeight() >= headerY && textY <= footerY)
Utils.FONT_DEFAULT.drawString(cx, cy + Utils.FONT_MEDIUM.getLineHeight() - 4,
String.format("%s // %s", osu.getArtist(), osu.creator), textColor);
textY += Utils.FONT_MEDIUM.getLineHeight() - 4;
if ((textY + Utils.FONT_BOLD.getLeading() >= headerY && textY <= footerY) &&
(expanded || osuFiles.size() == 1))
// draw text
Utils.FONT_MEDIUM.drawString(cx, cy, osu.getTitle(), textColor);
Utils.FONT_DEFAULT.drawString(cx, cy + Utils.FONT_MEDIUM.getLineHeight() - 4,
String.format("%s // %s", osu.getArtist(), osu.creator), textColor);
if (expanded || osuFiles.size() == 1)
Utils.FONT_BOLD.drawString(cx, cy + Utils.FONT_MEDIUM.getLineHeight() + Utils.FONT_DEFAULT.getLineHeight() - 8,
osu.version, textColor);
}

46
src/itdelatrisu/opsu/states/SongMenu.java
View File

@ -292,14 +292,34 @@ public class SongMenu extends BasicGameState {
GameImage.PLAYFIELD.getImage().draw();
}
// song buttons
OsuGroupNode node = startNode;
int songButtonIndex = 0;
if (node != null && node.prev != null) {
node = node.prev;
songButtonIndex = -1;
}
g.setClip(0, (int) (headerY + DIVIDER_LINE_WIDTH / 2), width, (int) (footerY - headerY));
for (int i = songButtonIndex; i <= MAX_SONG_BUTTONS && node != null; i++, node = node.next) {
// draw the node
float offset = (i == hoverIndex) ? hoverOffset : 0f;
ScoreData[] scores = getScoreDataForNode(node, false);
node.draw(buttonX - offset, buttonY + (i*buttonOffset) + DIVIDER_LINE_WIDTH / 2,
(scores == null) ? Grade.NULL : scores[0].getGrade(), (node == focusNode));
// load glyphs
Utils.loadGlyphs(node.osuFiles.get(0));
}
g.clearClip();
// top/bottom bars
g.setColor(Color.black);
g.setColor(Utils.COLOR_BLACK_ALPHA);
g.fillRect(0, 0, width, headerY);
g.fillRect(0, footerY, width, height - footerY);
g.setColor(Utils.COLOR_BLUE_DIVIDER);
g.setLineWidth(DIVIDER_LINE_WIDTH);
g.drawLine(0, headerY, width, headerY);
g.drawLine(0, footerY - DIVIDER_LINE_WIDTH / 2, width, footerY - DIVIDER_LINE_WIDTH / 2);
g.drawLine(0, footerY, width, footerY);
g.resetLineWidth();
// header
@ -327,28 +347,6 @@ public class SongMenu extends BasicGameState {
Utils.FONT_SMALL.drawString(marginX, headerTextY, songInfo[4], Color.white);
}
// song buttons
OsuGroupNode node = startNode;
int songButtonIndex = 0;
if (node != null && node.prev != null) {
node = node.prev;
songButtonIndex = -1;
}
for (int i = songButtonIndex; i <= MAX_SONG_BUTTONS && node != null; i++, node = node.next) {
// draw the node
float offset = (i == hoverIndex) ? hoverOffset : 0f;
ScoreData[] scores = getScoreDataForNode(node, false);
node.draw(
buttonX - offset, buttonY + (i*buttonOffset) + DIVIDER_LINE_WIDTH / 2,
headerY + DIVIDER_LINE_WIDTH / 2, footerY - DIVIDER_LINE_WIDTH,
(scores == null) ? Grade.NULL : scores[0].getGrade(),
(node == focusNode)
);
// load glyphs
Utils.loadGlyphs(node.osuFiles.get(0));
}
// score buttons
if (focusScores != null) {
for (int i = 0; i < MAX_SCORE_BUTTONS; i++) {