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

Merge pull request #772 from waiei/fix_hold/0609

Browse Source 
fix draw hold body inactive texture bug
This commit is contained in:
Kyzentun
2015-09-18 18:35:32 -06:00
parent 59499a7f6b 3d838a81a2
commit bb99481363
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NoteDisplay.cpp
+8 -3
View File
@@ -756,7 +756,12 @@ void NoteDisplay::DrawHoldPart(vector<Sprite*> &vpSpr,
/* Only draw the section that's within the range specified. If a hold note is /* 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 * 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. */ * part_args.y_top or part_args.y_bottom; they need to be left alone to calculate texture coordinates. */
const float y_start_pos = max(part_args.y_top, part_args.y_start_pos); // 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)
{
y_start_pos = fmod((y_start_pos - part_args.y_start_pos), unzoomed_frame_height) + part_args.y_start_pos;
}
float y_end_pos = min(part_args.y_bottom, part_args.y_end_pos); float y_end_pos = min(part_args.y_bottom, part_args.y_end_pos);
const float color_scale= glow ? 1 : part_args.color_scale; const float color_scale= glow ? 1 : part_args.color_scale;
if(part_type == hpt_body) if(part_type == hpt_body)
@@ -787,8 +792,8 @@ void NoteDisplay::DrawHoldPart(vector<Sprite*> &vpSpr,
{ {
/* For very large hold notes, shift the texture coordinates to be near 0, so we /* For very large hold notes, shift the texture coordinates to be near 0, so we
* don't send very large values to the renderer. */ * don't send very large values to the renderer. */
const float fDistFromTop = y_start_pos - part_args.y_top; const float fDistFromTop = y_start_pos - part_args.y_top;
float fTexCoordTop = SCALE(fDistFromTop, 0, unzoomed_frame_height, rect.top, rect.bottom); float fTexCoordTop = SCALE(fDistFromTop, 0, unzoomed_frame_height, rect.top, rect.bottom);
fTexCoordTop += add_to_tex_coord; fTexCoordTop += add_to_tex_coord;
add_to_tex_coord -= floorf(fTexCoordTop); add_to_tex_coord -= floorf(fTexCoordTop);
} }