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

using time_get_mircoseconds and storing it as int64 val

Browse source
This commit is contained in:
Дядя Женя 2020-10-26 17:47:26 +03:00
parent b6d94a85f3
commit b18d72db1f
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/game/client/components/menus.cpp
View file

@ -218,15 +218,14 @@ void CMenus::DoButton_KeySelect(const void *pID, const char *pText, int Checked,
int CMenus::DoButton_MenuTab(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Corners, SUIAnimator *pAnimator, const ColorRGBA *pDefaultColor, const ColorRGBA *pActiveColor, const ColorRGBA *pHoverColor, float EdgeRounding, int AlignVertically) int CMenus::DoButton_MenuTab(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Corners, SUIAnimator *pAnimator, const ColorRGBA *pDefaultColor, const ColorRGBA *pActiveColor, const ColorRGBA *pHoverColor, float EdgeRounding, int AlignVertically)
{ {
int Time = 0;
bool MouseInside = UI()->MouseInside(pRect); bool MouseInside = UI()->MouseInside(pRect);
CUIRect Rect = *pRect; CUIRect Rect = *pRect;
if(pAnimator != NULL) if(pAnimator != NULL)
{ {
Time = time(); int64 Time = time_get_microseconds();
if(pAnimator->m_Time + 1000000.f < Time) if(pAnimator->m_Time + 100000 < Time)
{ {
pAnimator->m_Value = pAnimator->m_Active ? 1 : 0; pAnimator->m_Value = pAnimator->m_Active ? 1 : 0;
pAnimator->m_Time = Time; pAnimator->m_Time = Time;
@ -235,9 +234,9 @@ int CMenus::DoButton_MenuTab(const void *pID, const char *pText, int Checked, co
pAnimator->m_Active = Checked || MouseInside; pAnimator->m_Active = Checked || MouseInside;
if(pAnimator->m_Active) if(pAnimator->m_Active)
pAnimator->m_Value = clamp<float>(pAnimator->m_Value + (Time - pAnimator->m_Time) / 1000000.f, 0, 1); pAnimator->m_Value = clamp<float>(pAnimator->m_Value + (Time - pAnimator->m_Time) / 100000.f, 0, 1);
else else
pAnimator->m_Value = clamp<float>(pAnimator->m_Value - (Time - pAnimator->m_Time) / 1000000.f, 0, 1); pAnimator->m_Value = clamp<float>(pAnimator->m_Value - (Time - pAnimator->m_Time) / 100000.f, 0, 1);
Rect.w += pAnimator->m_Value * pAnimator->m_WOffset; Rect.w += pAnimator->m_Value * pAnimator->m_WOffset;
Rect.h += pAnimator->m_Value * pAnimator->m_HOffset; Rect.h += pAnimator->m_Value * pAnimator->m_HOffset;
@ -290,12 +289,9 @@ int CMenus::DoButton_MenuTab(const void *pID, const char *pText, int Checked, co
Rect.w = pRect->w; Rect.w = pRect->w;
Rect.h = pRect->h; Rect.h = pRect->h;
} }
Rect.HMargin(2.0f, &Temp);
} }
else
pRect->HMargin(2.0f, &Temp); Rect.HMargin(2.0f, &Temp);
UI()->DoLabel(&Temp, pText, Temp.h * ms_FontmodHeight, 0, -1, AlignVertically); UI()->DoLabel(&Temp, pText, Temp.h * ms_FontmodHeight, 0, -1, AlignVertically);
return UI()->DoButtonLogic(pID, pText, Checked, pRect); return UI()->DoButtonLogic(pID, pText, Checked, pRect);

2
src/game/client/ui.h
View file

@ -103,7 +103,7 @@ struct SUIAnimator
bool m_ScaleLabel; bool m_ScaleLabel;
bool m_RepositionLabel; bool m_RepositionLabel;
float m_Time; long long m_Time;
float m_Value; float m_Value;
float m_XOffset; float m_XOffset;