mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-22 22:44:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor drawing frames.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-09-18 21:26:22 +02:00
parent 0331d548d2
commit da36ddd1c6
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
server/TracyView.cpp
View File

@ -300,7 +300,20 @@ void View::UpdateZone( Event* zone )
assert( zone->end != -1 ); assert( zone->end != -1 );
} }
uint64_t View::GetLastTime() uint64_t View::GetFrameTime( size_t idx ) const
{
if( idx < m_frames.size() - 1 )
{
return m_frames[idx+1] - m_frames[idx];
}
else
{
const auto last = GetLastTime();
return last == 0 ? 0 : last - m_frames.back();
}
}
uint64_t View::GetLastTime() const
{ {
uint64_t last = 0; uint64_t last = 0;
if( !m_frames.empty() ) last = m_frames.back(); if( !m_frames.empty() ) last = m_frames.back();
@ -402,24 +415,17 @@ void View::DrawFrames()
if( m_frameScale < 10 ) m_frameScale++; if( m_frameScale < 10 ) m_frameScale++;
} }
} }
const int fwidth = m_frameScale == 0 ? 4 : 1; const int fwidth = m_frameScale == 0 ? 4 : 1;
//const int group = m_frameScale < 2 ? 1 : ( 1 << ( m_frameScale - 1 ) ); //const int group = m_frameScale < 2 ? 1 : ( 1 << ( m_frameScale - 1 ) );
const int total = m_frames.size(); const int total = m_frames.size();
const int onScreen = ( w + fwidth-1 ) / fwidth; const int onScreen = ( w + fwidth-1 ) / fwidth;
const int start = total < onScreen ? 0 : total - onScreen; const int start = total < onScreen ? 0 : total - onScreen;
for( int i=0; i<onScreen; i++ )
int i = 0;
while( i < onScreen && start + i < total )
{ {
if( start + i == total ) break; uint64_t f = GetFrameTime( start + i );
uint64_t f;
if( start + i < total-1 )
{
f = m_frames[start+i+1] - m_frames[start+i];
}
else
{
const auto last = GetLastTime();
f = last == 0 ? 0 : last - m_frames.back();
}
const auto h = float( std::min<uint64_t>( MaxFrameTime, f ) ) / MaxFrameTime * ( Height - 2 ); const auto h = float( std::min<uint64_t>( MaxFrameTime, f ) ) / MaxFrameTime * ( Height - 2 );
if( fwidth != 1 ) if( fwidth != 1 )
{ {
@ -429,6 +435,7 @@ void View::DrawFrames()
{ {
draw->AddLine( wpos + ImVec2( 1+i, Height-2-h ), wpos + ImVec2( 1+i, Height-2 ), GetFrameColor( f ) ); draw->AddLine( wpos + ImVec2( 1+i, Height-2-h ), wpos + ImVec2( 1+i, Height-2 ), GetFrameColor( f ) );
} }
i++;
} }
} }

3
server/TracyView.hpp
View File

@ -48,7 +48,8 @@ private:
void NewZone( Event* zone ); void NewZone( Event* zone );
void UpdateZone( Event* zone ); void UpdateZone( Event* zone );
uint64_t GetLastTime(); uint64_t GetFrameTime( size_t idx ) const;
uint64_t GetLastTime() const;
void DrawImpl(); void DrawImpl();
void DrawFrames(); void DrawFrames();