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

Combine CGraph::ScaleMin and ScaleMax into Scale

Browse source 
As the methods are always called at the same time, they can be combined. This also improves the performance, as the array only needs to be iterated once.
This commit is contained in:
Robert Müller 2022-08-12 13:58:07 +02:00
parent f10edfa589
commit 8e0a935d5c
3 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/engine/client/client.cpp
View file

@ -89,25 +89,16 @@ void CGraph::Init(float Min, float Max)
m_Index = 0; m_Index = 0;
} }
void CGraph::ScaleMax() void CGraph::Scale()
{ {
int i = 0;
m_Max = m_MaxRange;
for(i = 0; i < MAX_VALUES; i++)
{
if(m_aValues[i] > m_Max)
m_Max = m_aValues[i];
}
}
void CGraph::ScaleMin()
{
int i = 0;
m_Min = m_MinRange; m_Min = m_MinRange;
for(i = 0; i < MAX_VALUES; i++) m_Max = m_MaxRange;
for(auto Value : m_aValues)
{ {
if(m_aValues[i] < m_Min) if(Value > m_Max)
m_Min = m_aValues[i]; m_Max = Value;
else if(Value < m_Min)
m_Min = Value;
} }
} }
@ -1143,14 +1134,11 @@ void CClient::DebugRender()
float sp = Graphics()->ScreenWidth() / 100.0f; float sp = Graphics()->ScreenWidth() / 100.0f;
float x = Graphics()->ScreenWidth() - w - sp; float x = Graphics()->ScreenWidth() - w - sp;
m_FpsGraph.ScaleMax(); m_FpsGraph.Scale();
m_FpsGraph.ScaleMin();
m_FpsGraph.Render(Graphics(), m_DebugFont, x, sp * 5, w, h, "FPS"); m_FpsGraph.Render(Graphics(), m_DebugFont, x, sp * 5, w, h, "FPS");
m_InputtimeMarginGraph.ScaleMin(); m_InputtimeMarginGraph.Scale();
m_InputtimeMarginGraph.ScaleMax();
m_InputtimeMarginGraph.Render(Graphics(), m_DebugFont, x, sp * 5 + h + sp, w, h, "Prediction Margin"); m_InputtimeMarginGraph.Render(Graphics(), m_DebugFont, x, sp * 5 + h + sp, w, h, "Prediction Margin");
m_GametimeMarginGraph.ScaleMin(); m_GametimeMarginGraph.Scale();
m_GametimeMarginGraph.ScaleMax();
m_GametimeMarginGraph.Render(Graphics(), m_DebugFont, x, sp * 5 + h + sp + h + sp, w, h, "Gametime Margin"); m_GametimeMarginGraph.Render(Graphics(), m_DebugFont, x, sp * 5 + h + sp + h + sp, w, h, "Gametime Margin");
} }
} }

4
src/engine/client/client.h
View file

@ -56,9 +56,7 @@ public:
void Init(float Min, float Max); void Init(float Min, float Max);
void ScaleMax(); void Scale();
void ScaleMin();
void Add(float v, float r, float g, float b); void Add(float v, float r, float g, float b);
bool InsertAt(int i, float v, float r, float g, float b); bool InsertAt(int i, float v, float r, float g, float b);
void Render(IGraphics *pGraphics, IGraphics::CTextureHandle FontTexture, float x, float y, float w, float h, const char *pDescription); void Render(IGraphics *pGraphics, IGraphics::CTextureHandle FontTexture, float x, float y, float w, float h, const char *pDescription);

6
src/game/client/components/debughud.cpp
View file

@ -162,8 +162,7 @@ void CDebugHud::RenderTuning()
} }
pv = RampedSpeed; pv = RampedSpeed;
} }
m_RampGraph.ScaleMin(); m_RampGraph.Scale();
m_RampGraph.ScaleMax();
m_ZoomedInGraph.Init(0.0f, 0.0f); m_ZoomedInGraph.Init(0.0f, 0.0f);
pv = 1; pv = 1;
@ -189,8 +188,7 @@ void CDebugHud::RenderTuning()
} }
pv = RampedSpeed; pv = RampedSpeed;
} }
m_ZoomedInGraph.ScaleMin(); m_ZoomedInGraph.Scale();
m_ZoomedInGraph.ScaleMax();
} }
char aBuf[128]; char aBuf[128];
str_format(aBuf, sizeof(aBuf), "Velspeed.X*Ramp in Bps (Velspeed %d to %d)", StepSizeRampGraph / 32, 128 * StepSizeRampGraph / 32); str_format(aBuf, sizeof(aBuf), "Velspeed.X*Ramp in Bps (Velspeed %d to %d)", StepSizeRampGraph / 32, 128 * StepSizeRampGraph / 32);