From 53632ccb5ba164e0269e4a70cdd736e92e7ae4e8 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 4 Sep 2022 14:56:12 +0200 Subject: [PATCH] Cleanup. --- server/TracyTimelineController.cpp | 1 - server/TracyTimelineController.hpp | 1 - server/TracyView_CpuData.cpp | 3 --- server/TracyView_Options.cpp | 2 +- server/TracyView_Timeline.cpp | 10 ---------- 5 files changed, 1 insertion(+), 16 deletions(-) diff --git a/server/TracyTimelineController.cpp b/server/TracyTimelineController.cpp index 2fadf6cd..7cabd444 100644 --- a/server/TracyTimelineController.cpp +++ b/server/TracyTimelineController.cpp @@ -7,7 +7,6 @@ namespace tracy TimelineController::TimelineController( View& view, Worker& worker ) : m_height( 0 ) - , m_offset( 0 ) , m_scroll( 0 ) , m_firstFrame( true ) , m_view( view ) diff --git a/server/TracyTimelineController.hpp b/server/TracyTimelineController.hpp index e83b9baf..1d8e4f37 100644 --- a/server/TracyTimelineController.hpp +++ b/server/TracyTimelineController.hpp @@ -43,7 +43,6 @@ private: unordered_flat_map> m_itemMap; float m_height; - float m_offset; float m_scroll; bool m_firstFrame; diff --git a/server/TracyView_CpuData.cpp b/server/TracyView_CpuData.cpp index 3b3bd600..577553c9 100644 --- a/server/TracyView_CpuData.cpp +++ b/server/TracyView_CpuData.cpp @@ -19,12 +19,9 @@ bool View::DrawCpuData( double pxns, int& offset, const ImVec2& wpos, bool hover const auto w = ImGui::GetContentRegionAvail().x - 1; const auto ty = ImGui::GetTextLineHeight(); - const auto ostep = ty + 1; const auto nspxdbl = 1.0 / pxns; const auto nspx = int64_t( nspxdbl ); auto draw = ImGui::GetWindowDrawList(); - const auto to = 9.f; - const auto th = ( ty - to ) * sqrt( 3 ) * 0.5; const auto dpos = wpos + ImVec2( 0.5f, 0.5f ); #ifdef TRACY_NO_STATISTICS diff --git a/server/TracyView_Options.cpp b/server/TracyView_Options.cpp index b7f887d6..77ab4f87 100644 --- a/server/TracyView_Options.cpp +++ b/server/TracyView_Options.cpp @@ -109,7 +109,7 @@ void View::DrawOptions() { char buf[64]; auto& item = (TimelineItemGpu&)( m_tc.GetItem( gpuData[i] ) ); - sprintf( buf, "%s context %zu", GpuContextNames[(int)gpuData[i]->type], item.GetIdx() ); + sprintf( buf, "%s context %i", GpuContextNames[(int)gpuData[i]->type], item.GetIdx() ); ImGui::PushFont( m_smallFont ); ImGui::TextUnformatted( buf ); ImGui::PopFont(); diff --git a/server/TracyView_Timeline.cpp b/server/TracyView_Timeline.cpp index 998f4d71..0c06e8b9 100644 --- a/server/TracyView_Timeline.cpp +++ b/server/TracyView_Timeline.cpp @@ -13,8 +13,6 @@ namespace tracy { -constexpr float MinVisSize = 3; - extern double s_time; void View::HandleTimelineMouse( int64_t timespan, const ImVec2& wpos, float w, double& pxns ) @@ -328,15 +326,7 @@ void View::DrawTimeline() bool hover = ImGui::IsWindowHovered() && ImGui::IsMouseHoveringRect( wpos, wpos + ImVec2( w, h ) ); draw = ImGui::GetWindowDrawList(); - const auto nspx = 1.0 / pxns; - - ImGui::PushFont( m_smallFont ); - const auto sty = ImGui::GetTextLineHeight(); - const auto sstep = sty + 1; - ImGui::PopFont(); - const auto ty = ImGui::GetTextLineHeight(); - const auto ostep = ty + 1; int offset = 0; const auto to = 9.f; const auto th = ( ty - to ) * sqrt( 3 ) * 0.5;