From c285f59ce2a05703e3a1232fcaf3ee3aea714b3f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 18 Feb 2024 12:52:19 +0100 Subject: Replace BOOL with bool in llwindow and dependent classes --- indra/newview/llfasttimerview.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/newview/llfasttimerview.h') diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h index ff65f8da07..2207188009 100644 --- a/indra/newview/llfasttimerview.h +++ b/indra/newview/llfasttimerview.h @@ -55,13 +55,13 @@ private: public: - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); - virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); - virtual BOOL handleHover(S32 x, S32 y, MASK mask); - virtual BOOL handleToolTip(S32 x, S32 y, MASK mask); - virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); + virtual bool handleMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleDoubleClick(S32 x, S32 y, MASK mask); + virtual bool handleRightMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); + virtual bool handleHover(S32 x, S32 y, MASK mask); + virtual bool handleToolTip(S32 x, S32 y, MASK mask); + virtual bool handleScrollWheel(S32 x, S32 y, S32 clicks); virtual void draw(); virtual void onOpen(const LLSD& key); virtual void onClose(bool app_quitting); -- cgit v1.2.3 From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llfasttimerview.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfasttimerview.h') diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h index 2207188009..b1320f74c8 100644 --- a/indra/newview/llfasttimerview.h +++ b/indra/newview/llfasttimerview.h @@ -40,7 +40,7 @@ class LLFastTimerView : public LLFloater public: LLFastTimerView(const LLSD&); ~LLFastTimerView(); - BOOL postBuild(); + bool postBuild(); static BOOL sAnalyzePerformance; -- cgit v1.2.3 From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/llfasttimerview.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfasttimerview.h') diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h index b1320f74c8..1541684567 100644 --- a/indra/newview/llfasttimerview.h +++ b/indra/newview/llfasttimerview.h @@ -42,7 +42,7 @@ public: ~LLFastTimerView(); bool postBuild(); - static BOOL sAnalyzePerformance; + static bool sAnalyzePerformance; static void outputAllMetrics(); static void doAnalysis(std::string baseline, std::string target, std::string output); -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llfasttimerview.h | 302 ++++++++++++++++++++-------------------- 1 file changed, 151 insertions(+), 151 deletions(-) (limited to 'indra/newview/llfasttimerview.h') diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h index 35158b1bdd..e0ef52f166 100644 --- a/indra/newview/llfasttimerview.h +++ b/indra/newview/llfasttimerview.h @@ -1,151 +1,151 @@ -/** - * @file llfasttimerview.h - * @brief LLFastTimerView class definition - * - * $LicenseInfo:firstyear=2004&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLFASTTIMERVIEW_H -#define LL_LLFASTTIMERVIEW_H - -#include "llfloater.h" -#include "llfasttimer.h" -#include "llunits.h" -#include "lltracerecording.h" -#include - -class LLScrollbar; - -class LLFastTimerView : public LLFloater -{ -public: - LLFastTimerView(const LLSD&); - ~LLFastTimerView(); - bool postBuild(); - - static bool sAnalyzePerformance; - - static void outputAllMetrics(); - static void doAnalysis(std::string baseline, std::string target, std::string output); - -private: - static void doAnalysisDefault(std::string baseline, std::string target, std::string output) ; - static LLSD analyzePerformanceLogDefault(std::istream& is) ; - static void exportCharts(const std::string& base, const std::string& target); - void onPause(); - -public: - - virtual bool handleMouseDown(S32 x, S32 y, MASK mask); - virtual bool handleDoubleClick(S32 x, S32 y, MASK mask); - virtual bool handleRightMouseDown(S32 x, S32 y, MASK mask); - virtual bool handleMouseUp(S32 x, S32 y, MASK mask); - virtual bool handleHover(S32 x, S32 y, MASK mask); - virtual bool handleToolTip(S32 x, S32 y, MASK mask); - virtual bool handleScrollWheel(S32 x, S32 y, S32 clicks); - virtual void draw(); - virtual void onOpen(const LLSD& key); - virtual void onClose(bool app_quitting); - LLTrace::BlockTimerStatHandle* getLegendID(S32 y); - -private: - void drawTicks(); - void drawLineGraph(); - void drawLegend(); - void drawHelp(S32 y); - void drawBorders( S32 y, const S32 x_start, S32 barh, S32 dy); - void drawBars(); - - void printLineStats(); - void generateUniqueColors(); - void updateTotalTime(); - - struct TimerBar - { - TimerBar() - : mTotalTime(0), - mSelfTime(0), - mStartFraction(0.f), - mEndFraction(1.f), - mFirstChild(false), - mLastChild(false) - {} - F32Seconds mTotalTime, - mSelfTime, - mChildrenStart, - mChildrenEnd, - mSelfStart, - mSelfEnd; - LLTrace::BlockTimerStatHandle* mTimeBlock; - bool mVisible, - mFirstChild, - mLastChild; - F32 mStartFraction, - mEndFraction; - }; - - struct TimerBarRow - { - TimerBarRow() - : mBottom(0), - mTop(0), - mBars(NULL) - {} - S32 mBottom, - mTop; - TimerBar* mBars; - }; - - F32Seconds updateTimerBarWidths(LLTrace::BlockTimerStatHandle* time_block, TimerBarRow& row, S32 history_index, U32& bar_index); - S32 updateTimerBarOffsets(LLTrace::BlockTimerStatHandle* time_block, TimerBarRow& row, S32 timer_bar_index = 0); - S32 drawBar(LLRect bar_rect, TimerBarRow& row, S32 image_width, S32 image_height, bool hovered = false, bool visible = true, S32 bar_index = 0); - void setPauseState(bool pause_state); - - std::deque mTimerBarRows; - TimerBarRow mAverageTimerRow; - - enum EDisplayType - { - DISPLAY_TIME, - DISPLAY_CALLS, - DISPLAY_HZ - } mDisplayType; - bool mPauseHistory; - F64Seconds mAllTimeMax, - mTotalTimeDisplay; - S32 mScrollIndex, - mHoverBarIndex, - mStatsIndex; - S32 mDisplayMode; - LLTrace::BlockTimerStatHandle* mHoverID; - LLTrace::BlockTimerStatHandle* mHoverTimer; - LLRect mToolTipRect, - mGraphRect, - mBarRect, - mLegendRect; - LLFrameTimer mHighlightTimer; - LLTrace::PeriodicRecording mRecording; - - LLScrollbar* mScrollBar; -}; - -#endif +/** + * @file llfasttimerview.h + * @brief LLFastTimerView class definition + * + * $LicenseInfo:firstyear=2004&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_LLFASTTIMERVIEW_H +#define LL_LLFASTTIMERVIEW_H + +#include "llfloater.h" +#include "llfasttimer.h" +#include "llunits.h" +#include "lltracerecording.h" +#include + +class LLScrollbar; + +class LLFastTimerView : public LLFloater +{ +public: + LLFastTimerView(const LLSD&); + ~LLFastTimerView(); + bool postBuild(); + + static bool sAnalyzePerformance; + + static void outputAllMetrics(); + static void doAnalysis(std::string baseline, std::string target, std::string output); + +private: + static void doAnalysisDefault(std::string baseline, std::string target, std::string output) ; + static LLSD analyzePerformanceLogDefault(std::istream& is) ; + static void exportCharts(const std::string& base, const std::string& target); + void onPause(); + +public: + + virtual bool handleMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleDoubleClick(S32 x, S32 y, MASK mask); + virtual bool handleRightMouseDown(S32 x, S32 y, MASK mask); + virtual bool handleMouseUp(S32 x, S32 y, MASK mask); + virtual bool handleHover(S32 x, S32 y, MASK mask); + virtual bool handleToolTip(S32 x, S32 y, MASK mask); + virtual bool handleScrollWheel(S32 x, S32 y, S32 clicks); + virtual void draw(); + virtual void onOpen(const LLSD& key); + virtual void onClose(bool app_quitting); + LLTrace::BlockTimerStatHandle* getLegendID(S32 y); + +private: + void drawTicks(); + void drawLineGraph(); + void drawLegend(); + void drawHelp(S32 y); + void drawBorders( S32 y, const S32 x_start, S32 barh, S32 dy); + void drawBars(); + + void printLineStats(); + void generateUniqueColors(); + void updateTotalTime(); + + struct TimerBar + { + TimerBar() + : mTotalTime(0), + mSelfTime(0), + mStartFraction(0.f), + mEndFraction(1.f), + mFirstChild(false), + mLastChild(false) + {} + F32Seconds mTotalTime, + mSelfTime, + mChildrenStart, + mChildrenEnd, + mSelfStart, + mSelfEnd; + LLTrace::BlockTimerStatHandle* mTimeBlock; + bool mVisible, + mFirstChild, + mLastChild; + F32 mStartFraction, + mEndFraction; + }; + + struct TimerBarRow + { + TimerBarRow() + : mBottom(0), + mTop(0), + mBars(NULL) + {} + S32 mBottom, + mTop; + TimerBar* mBars; + }; + + F32Seconds updateTimerBarWidths(LLTrace::BlockTimerStatHandle* time_block, TimerBarRow& row, S32 history_index, U32& bar_index); + S32 updateTimerBarOffsets(LLTrace::BlockTimerStatHandle* time_block, TimerBarRow& row, S32 timer_bar_index = 0); + S32 drawBar(LLRect bar_rect, TimerBarRow& row, S32 image_width, S32 image_height, bool hovered = false, bool visible = true, S32 bar_index = 0); + void setPauseState(bool pause_state); + + std::deque mTimerBarRows; + TimerBarRow mAverageTimerRow; + + enum EDisplayType + { + DISPLAY_TIME, + DISPLAY_CALLS, + DISPLAY_HZ + } mDisplayType; + bool mPauseHistory; + F64Seconds mAllTimeMax, + mTotalTimeDisplay; + S32 mScrollIndex, + mHoverBarIndex, + mStatsIndex; + S32 mDisplayMode; + LLTrace::BlockTimerStatHandle* mHoverID; + LLTrace::BlockTimerStatHandle* mHoverTimer; + LLRect mToolTipRect, + mGraphRect, + mBarRect, + mLegendRect; + LLFrameTimer mHighlightTimer; + LLTrace::PeriodicRecording mRecording; + + LLScrollbar* mScrollBar; +}; + +#endif -- cgit v1.2.3