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/llhudicon.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llhudicon.h') diff --git a/indra/newview/llhudicon.h b/indra/newview/llhudicon.h index 7f452b5c36..fa690668d5 100644 --- a/indra/newview/llhudicon.h +++ b/indra/newview/llhudicon.h @@ -62,12 +62,12 @@ public: static void cleanupDeadIcons(); static S32 getNumInstances(); - static BOOL iconsNearby(); + static bool iconsNearby(); - BOOL getHidden() const { return mHidden; } - void setHidden( BOOL hide ) { mHidden = hide; } + bool getHidden() const { return mHidden; } + void setHidden( bool hide ) { mHidden = hide; } - BOOL lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, LLVector4a* intersection); + bool lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, LLVector4a* intersection); protected: LLHUDIcon(const U8 type); @@ -79,7 +79,7 @@ private: LLFrameTimer mLifeTimer; F32 mDistance; F32 mScale; - BOOL mHidden; + bool mHidden; typedef std::vector > icon_instance_t; static icon_instance_t sIconInstances; -- 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/llhudicon.h | 176 +++++++++++++++++++++++----------------------- 1 file changed, 88 insertions(+), 88 deletions(-) (limited to 'indra/newview/llhudicon.h') diff --git a/indra/newview/llhudicon.h b/indra/newview/llhudicon.h index 4084ee9e45..b18a4a3b76 100644 --- a/indra/newview/llhudicon.h +++ b/indra/newview/llhudicon.h @@ -1,88 +1,88 @@ -/** - * @file llhudicon.h - * @brief LLHUDIcon class definition - * - * $LicenseInfo:firstyear=2006&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_LLHUDICON_H -#define LL_LLHUDICON_H - -#include "llpointer.h" - -#include "llhudobject.h" -#include "v4color.h" -#include "v4coloru.h" -#include "v2math.h" -#include "llrect.h" -#include "llframetimer.h" -#include "llfontgl.h" -#include -#include - -// Renders a 2D icon billboard floating at the location specified. -class LLViewerTexture; - -class LLHUDIcon : public LLHUDObject -{ -friend class LLHUDObject; - -public: - /*virtual*/ void render(); - /*virtual*/ void markDead(); - /*virtual*/ F32 getDistance() const { return mDistance; } - - void setImage(LLViewerTexture* imagep); - void setScale(F32 fraction_of_fov); - - void restartLifeTimer() { mLifeTimer.reset(); } - - static LLHUDIcon* lineSegmentIntersectAll(const LLVector4a& start, const LLVector4a& end, LLVector4a* intersection); - - static void updateAll(); - static void cleanupDeadIcons(); - static S32 getNumInstances(); - - static bool iconsNearby(); - - bool getHidden() const { return mHidden; } - void setHidden( bool hide ) { mHidden = hide; } - - bool lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, LLVector4a* intersection); - -protected: - LLHUDIcon(const U8 type); - ~LLHUDIcon(); - -private: - LLPointer mImagep; - LLFrameTimer mAnimTimer; - LLFrameTimer mLifeTimer; - F32 mDistance; - F32 mScale; - bool mHidden; - - typedef std::vector > icon_instance_t; - static icon_instance_t sIconInstances; -}; - -#endif // LL_LLHUDICON_H +/** + * @file llhudicon.h + * @brief LLHUDIcon class definition + * + * $LicenseInfo:firstyear=2006&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_LLHUDICON_H +#define LL_LLHUDICON_H + +#include "llpointer.h" + +#include "llhudobject.h" +#include "v4color.h" +#include "v4coloru.h" +#include "v2math.h" +#include "llrect.h" +#include "llframetimer.h" +#include "llfontgl.h" +#include +#include + +// Renders a 2D icon billboard floating at the location specified. +class LLViewerTexture; + +class LLHUDIcon : public LLHUDObject +{ +friend class LLHUDObject; + +public: + /*virtual*/ void render(); + /*virtual*/ void markDead(); + /*virtual*/ F32 getDistance() const { return mDistance; } + + void setImage(LLViewerTexture* imagep); + void setScale(F32 fraction_of_fov); + + void restartLifeTimer() { mLifeTimer.reset(); } + + static LLHUDIcon* lineSegmentIntersectAll(const LLVector4a& start, const LLVector4a& end, LLVector4a* intersection); + + static void updateAll(); + static void cleanupDeadIcons(); + static S32 getNumInstances(); + + static bool iconsNearby(); + + bool getHidden() const { return mHidden; } + void setHidden( bool hide ) { mHidden = hide; } + + bool lineSegmentIntersect(const LLVector4a& start, const LLVector4a& end, LLVector4a* intersection); + +protected: + LLHUDIcon(const U8 type); + ~LLHUDIcon(); + +private: + LLPointer mImagep; + LLFrameTimer mAnimTimer; + LLFrameTimer mLifeTimer; + F32 mDistance; + F32 mScale; + bool mHidden; + + typedef std::vector > icon_instance_t; + static icon_instance_t sIconInstances; +}; + +#endif // LL_LLHUDICON_H -- cgit v1.2.3