actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_hold/0609' into fix_hold/0609

Browse Source 
Conflicts:
	src/NoteDisplay.cpp
This commit is contained in:
A.C
2015-09-10 01:23:53 +09:00
parent 1d61989ccb 4d13ab304b
commit 3d838a81a2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NoteDisplay.cpp
+3 -3
View File
@@ -756,7 +756,7 @@ void NoteDisplay::DrawHoldPart(vector<Sprite*> &vpSpr,
/* Only draw the section that's within the range specified. If a hold note is
* very long, don't process or draw the part outside of the range. Don't change
* part_args.y_top or part_args.y_bottom; they need to be left alone to calculate texture coordinates. */
// If hold body, draw texture to the outside screen.(fix by A.C)
// If hold body, draw texture to the outside screen.(fix by A.C)
float y_start_pos = (part_type == hpt_body) ? part_args.y_top : max(part_args.y_top, part_args.y_start_pos);
if (part_args.y_top < part_args.y_start_pos - unzoomed_frame_height)
{
@@ -792,8 +792,8 @@ void NoteDisplay::DrawHoldPart(vector<Sprite*> &vpSpr,
{
/* For very large hold notes, shift the texture coordinates to be near 0, so we
* don't send very large values to the renderer. */
const float fDistFromTop = y_start_pos - part_args.y_top;
float fTexCoordTop = SCALE(fDistFromTop, 0, unzoomed_frame_height, rect.top, rect.bottom);
const float fDistFromTop = y_start_pos - part_args.y_top;
float fTexCoordTop = SCALE(fDistFromTop, 0, unzoomed_frame_height, rect.top, rect.bottom);
fTexCoordTop += add_to_tex_coord;
add_to_tex_coord -= floorf(fTexCoordTop);
}