edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1968 from d3fault/always-show-hook-coll-signaling

Browse source 
Invert hook coll colors when using cl_show_hook_coll_always and +showhookcoll is pressed
This commit is contained in:
Dennis Felsing 2019-12-02 09:50:34 +01:00 committed by GitHub
parent 33d88f647c 5261ca25fe
commit 5e8439acab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/game/client/components/players.cpp
View file

@ -292,7 +292,7 @@ void CPlayers::RenderPlayer(
vec2 FinishPos = InitPos + ExDirection * (m_pClient->m_Tuning[g_Config.m_ClDummy].m_HookLength-42.0f); vec2 FinishPos = InitPos + ExDirection * (m_pClient->m_Tuning[g_Config.m_ClDummy].m_HookLength-42.0f);
Graphics()->LinesBegin(); Graphics()->LinesBegin();
Graphics()->SetColor(1.00f, 0.0f, 0.0f, Alpha); vec3 HookCollColor(1.0f, 0.0f, 0.0f);
float PhysSize = 28.0f; float PhysSize = 28.0f;
@ -318,12 +318,18 @@ void CPlayers::RenderPlayer(
if(!DoBreak && Hit) if(!DoBreak && Hit)
{ {
if(Hit != TILE_NOHOOK) if(Hit != TILE_NOHOOK)
Graphics()->SetColor(130.0f/255.0f, 232.0f/255.0f, 160.0f/255.0f, Alpha); {
HookCollColor.r = 130.0f/255.0f;
HookCollColor.g = 232.0f/255.0f;
HookCollColor.b = 160.0f/255.0f;
}
} }
if(m_pClient->IntersectCharacter(OldPos, FinishPos, FinishPos, ClientID) != -1) if(m_pClient->IntersectCharacter(OldPos, FinishPos, FinishPos, ClientID) != -1)
{ {
Graphics()->SetColor(1.0f, 1.0f, 0.0f, Alpha); HookCollColor.r = 1.0f;
HookCollColor.g = 1.0f;
HookCollColor.b = 0.0f;
break; break;
} }
@ -340,6 +346,14 @@ void CPlayers::RenderPlayer(
ExDirection.y = round_to_int(ExDirection.y*256.0f) / 256.0f; ExDirection.y = round_to_int(ExDirection.y*256.0f) / 256.0f;
} while (!DoBreak); } while (!DoBreak);
if(g_Config.m_ClShowHookCollAlways && (Player.m_PlayerFlags&PLAYERFLAG_AIM))
{
// invert the hook coll colors when using cl_show_hook_coll_always and +showhookcoll is pressed
HookCollColor.r = 1.0f-HookCollColor.r;
HookCollColor.g = 1.0f-HookCollColor.g;
HookCollColor.b = 1.0f-HookCollColor.b;
}
Graphics()->SetColor(HookCollColor.r, HookCollColor.g, HookCollColor.b, Alpha);
IGraphics::CLineItem LineItem(InitPos.x, InitPos.y, FinishPos.x, FinishPos.y); IGraphics::CLineItem LineItem(InitPos.x, InitPos.y, FinishPos.x, FinishPos.y);
Graphics()->LinesDraw(&LineItem, 1); Graphics()->LinesDraw(&LineItem, 1);
Graphics()->LinesEnd(); Graphics()->LinesEnd();