Rap notes will use the rap notes graphics
This commit is contained in:
1 parent
34f641727a
commit
daec506445
5 files changed
+54
-15
No files matched your search
@@ -328,6 +328,15 @@
|
|||||||
<NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
|
<NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
|
||||||
<NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
|
<NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
|
||||||
<NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
|
<NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
|
||||||
|
<RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
|
||||||
|
<RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
|
||||||
|
<RapNoteRight>RapNotesRight.png</RapNoteRight>
|
||||||
|
<RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
|
||||||
|
<RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
|
||||||
|
<RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
|
||||||
|
<RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
|
||||||
|
<RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
|
||||||
|
<RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
|
||||||
<PointsBar>PointsBar.png</PointsBar>
|
<PointsBar>PointsBar.png</PointsBar>
|
||||||
<PointsBarBG>PointsBarBG.png</PointsBarBG>
|
<PointsBarBG>PointsBarBG.png</PointsBarBG>
|
||||||
<LyricHelper>LyricHelper.png</LyricHelper>
|
<LyricHelper>LyricHelper.png</LyricHelper>
|
||||||
|
|||||||
@@ -328,6 +328,15 @@
|
|||||||
<NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
|
<NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
|
||||||
<NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
|
<NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
|
||||||
<NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
|
<NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
|
||||||
|
<RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
|
||||||
|
<RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
|
||||||
|
<RapNoteRight>RapNotesRight.png</RapNoteRight>
|
||||||
|
<RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
|
||||||
|
<RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
|
||||||
|
<RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
|
||||||
|
<RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
|
||||||
|
<RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
|
||||||
|
<RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
|
||||||
<PointsBar>PointsBar.png</PointsBar>
|
<PointsBar>PointsBar.png</PointsBar>
|
||||||
<PointsBarBG>PointsBarBG.png</PointsBarBG>
|
<PointsBarBG>PointsBarBG.png</PointsBarBG>
|
||||||
<LyricHelper>LyricHelper.png</LyricHelper>
|
<LyricHelper>LyricHelper.png</LyricHelper>
|
||||||
|
|||||||
@@ -328,6 +328,15 @@
|
|||||||
<NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
|
<NoteBackgroundLeft>NotesBGLeft.png</NoteBackgroundLeft>
|
||||||
<NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
|
<NoteBackgroundMiddle>NotesBGMid.png</NoteBackgroundMiddle>
|
||||||
<NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
|
<NoteBackgroundRight>NotesBGRight.png</NoteBackgroundRight>
|
||||||
|
<RapNoteLeft>RapNotesLeft.png</RapNoteLeft>
|
||||||
|
<RapNoteMiddle>RapNotesMid.png</RapNoteMiddle>
|
||||||
|
<RapNoteRight>RapNotesRight.png</RapNoteRight>
|
||||||
|
<RapNoteFillLeft>RapNotesFillLeft.png</RapNoteFillLeft>
|
||||||
|
<RapNoteFillMiddle>RapNotesFillMid.png</RapNoteFillMiddle>
|
||||||
|
<RapNoteFillRight>RapNotesFillRight.png</RapNoteFillRight>
|
||||||
|
<RapNoteBackgroundLeft>RapNotesBGLeft.png</RapNoteBackgroundLeft>
|
||||||
|
<RapNoteBackgroundMiddle>RapNotesBGMid.png</RapNoteBackgroundMiddle>
|
||||||
|
<RapNoteBackgroundRight>RapNotesBGRight.png</RapNoteBackgroundRight>
|
||||||
<PointsBar>PointsBar.png</PointsBar>
|
<PointsBar>PointsBar.png</PointsBar>
|
||||||
<PointsBarBG>PointsBarBG.png</PointsBarBG>
|
<PointsBarBG>PointsBarBG.png</PointsBarBG>
|
||||||
<LyricHelper>LyricHelper.png</LyricHelper>
|
<LyricHelper>LyricHelper.png</LyricHelper>
|
||||||
|
|||||||
@@ -109,8 +109,8 @@ namespace VocaluxeLib.Menu.SingNotes
|
|||||||
{
|
{
|
||||||
SRectF rect = _GetNoteRect(note);
|
SRectF rect = _GetNoteRect(note);
|
||||||
|
|
||||||
_DrawNoteBG(rect, color);
|
_DrawNoteBG(rect, color, note.IsRapNote);
|
||||||
_DrawNoteBase(rect, new SColorF(_NoteBaseColor, _NoteBaseColor.A * Alpha), 1f);
|
_DrawNoteBase(rect, new SColorF(_NoteBaseColor, _NoteBaseColor.A * Alpha), 1f, note.IsRapNote);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -128,7 +128,7 @@ namespace VocaluxeLib.Menu.SingNotes
|
|||||||
|
|
||||||
float factor = (note.Hit) ? 1f : 0.6f;
|
float factor = (note.Hit) ? 1f : 0.6f;
|
||||||
|
|
||||||
_DrawNoteFill(rect, color, factor);
|
_DrawNoteFill(rect, color, factor, note.IsRapNote);
|
||||||
|
|
||||||
if (note.EndBeat >= CBase.Game.GetRecordedBeat() && note.Hit && note.IsGoldenNote)
|
if (note.EndBeat >= CBase.Game.GetRecordedBeat() && note.Hit && note.IsGoldenNote)
|
||||||
{
|
{
|
||||||
@@ -275,26 +275,26 @@ namespace VocaluxeLib.Menu.SingNotes
|
|||||||
CBase.Drawing.DrawTexture(noteEnd, new SRectF(noteRect.X + noteRect.W - endsW, noteRect.Y, endsW, noteRect.H, noteRect.Z), color, false);
|
CBase.Drawing.DrawTexture(noteEnd, new SRectF(noteRect.X + noteRect.W - endsW, noteRect.Y, endsW, noteRect.H, noteRect.Z), color, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _DrawNoteBase(SRectF rect, SColorF color, float factor)
|
private void _DrawNoteBase(SRectF rect, SColorF color, float factor, bool isRapNote = false)
|
||||||
{
|
{
|
||||||
CTextureRef noteBegin = CBase.Themes.GetSkinTexture(_Theme.SkinLeft, _PartyModeID);
|
CTextureRef noteBegin = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapLeft : _Theme.SkinLeft, _PartyModeID);
|
||||||
CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(_Theme.SkinMiddle, _PartyModeID);
|
CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapMiddle : _Theme.SkinMiddle, _PartyModeID);
|
||||||
CTextureRef noteEnd = CBase.Themes.GetSkinTexture(_Theme.SkinRight, _PartyModeID);
|
CTextureRef noteEnd = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapRight : _Theme.SkinRight, _PartyModeID);
|
||||||
|
|
||||||
_DrawNote(rect, color, noteBegin, noteMiddle, noteEnd, factor);
|
_DrawNote(rect, color, noteBegin, noteMiddle, noteEnd, factor);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _DrawNoteFill(SRectF rect, SColorF color, float factor)
|
private void _DrawNoteFill(SRectF rect, SColorF color, float factor, bool isRapNote = false)
|
||||||
{
|
{
|
||||||
|
|
||||||
CTextureRef noteBegin = CBase.Themes.GetSkinTexture(_Theme.SkinFillLeft, _PartyModeID);
|
CTextureRef noteBegin = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapFillLeft : _Theme.SkinFillLeft, _PartyModeID);
|
||||||
CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(_Theme.SkinFillMiddle, _PartyModeID);
|
CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapFillMiddle : _Theme.SkinFillMiddle, _PartyModeID);
|
||||||
CTextureRef noteEnd = CBase.Themes.GetSkinTexture(_Theme.SkinFillRight, _PartyModeID);
|
CTextureRef noteEnd = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapFillRight : _Theme.SkinFillRight, _PartyModeID);
|
||||||
|
|
||||||
_DrawNote(rect, color, noteBegin, noteMiddle, noteEnd, factor);
|
_DrawNote(rect, color, noteBegin, noteMiddle, noteEnd, factor);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _DrawNoteBG(SRectF rect, SColorF color)
|
private void _DrawNoteBG(SRectF rect, SColorF color, bool isRapNote = false)
|
||||||
{
|
{
|
||||||
const float period = 1500; //[ms]
|
const float period = 1500; //[ms]
|
||||||
|
|
||||||
@@ -308,9 +308,9 @@ namespace VocaluxeLib.Menu.SingNotes
|
|||||||
|
|
||||||
var col = new SColorF(color, color.A * alpha);
|
var col = new SColorF(color, color.A * alpha);
|
||||||
|
|
||||||
CTextureRef noteBegin = CBase.Themes.GetSkinTexture(_Theme.SkinBackgroundLeft, _PartyModeID);
|
CTextureRef noteBegin = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapBackgroundLeft : _Theme.SkinBackgroundLeft, _PartyModeID);
|
||||||
CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(_Theme.SkinBackgroundMiddle, _PartyModeID);
|
CTextureRef noteMiddle = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapBackgroundMiddle : _Theme.SkinBackgroundMiddle, _PartyModeID);
|
||||||
CTextureRef noteEnd = CBase.Themes.GetSkinTexture(_Theme.SkinBackgroundRight, _PartyModeID);
|
CTextureRef noteEnd = CBase.Themes.GetSkinTexture(isRapNote ? _Theme.SkinRapBackgroundRight : _Theme.SkinBackgroundRight, _PartyModeID);
|
||||||
|
|
||||||
_DrawNote(rect, col, noteBegin, noteMiddle, noteEnd, 1f);
|
_DrawNote(rect, col, noteBegin, noteMiddle, noteEnd, 1f);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,18 @@ namespace VocaluxeLib.Menu.SingNotes
|
|||||||
public string SkinBackgroundMiddle;
|
public string SkinBackgroundMiddle;
|
||||||
public string SkinBackgroundRight;
|
public string SkinBackgroundRight;
|
||||||
|
|
||||||
|
public string SkinRapLeft;
|
||||||
|
public string SkinRapMiddle;
|
||||||
|
public string SkinRapRight;
|
||||||
|
|
||||||
|
public string SkinRapFillLeft;
|
||||||
|
public string SkinRapFillMiddle;
|
||||||
|
public string SkinRapFillRight;
|
||||||
|
|
||||||
|
public string SkinRapBackgroundLeft;
|
||||||
|
public string SkinRapBackgroundMiddle;
|
||||||
|
public string SkinRapBackgroundRight;
|
||||||
|
|
||||||
public string SkinGoldenStar;
|
public string SkinGoldenStar;
|
||||||
public string SkinToneHelper;
|
public string SkinToneHelper;
|
||||||
public string SkinPerfectNoteStart;
|
public string SkinPerfectNoteStart;
|
||||||
|
|||||||
Reference in new issue
Block a user