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/llhudeffectlookat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llhudeffectlookat.h') diff --git a/indra/newview/llhudeffectlookat.h b/indra/newview/llhudeffectlookat.h index fd057715b6..6d928213a4 100644 --- a/indra/newview/llhudeffectlookat.h +++ b/indra/newview/llhudeffectlookat.h @@ -57,7 +57,7 @@ public: /*virtual*/ void markDead(); /*virtual*/ void setSourceObject(LLViewerObject* objectp); - BOOL setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position); + bool setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position); void clearLookAtTarget(); ELookAtType getLookAtType() { return mTargetType; } @@ -79,7 +79,7 @@ protected: void setTargetPosGlobal(const LLVector3d &target_pos_global); public: - static BOOL sDebugLookAt; + static bool sDebugLookAt; private: ELookAtType mTargetType; -- 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/llhudeffectlookat.h | 190 +++++++++++++++++++------------------- 1 file changed, 95 insertions(+), 95 deletions(-) (limited to 'indra/newview/llhudeffectlookat.h') diff --git a/indra/newview/llhudeffectlookat.h b/indra/newview/llhudeffectlookat.h index fd22774c8c..0e57422ee1 100644 --- a/indra/newview/llhudeffectlookat.h +++ b/indra/newview/llhudeffectlookat.h @@ -1,95 +1,95 @@ -/** - * @file llhudeffectlookat.h - * @brief LLHUDEffectLookAt class definition - * - * $LicenseInfo:firstyear=2002&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_LLHUDEFFECTLOOKAT_H -#define LL_LLHUDEFFECTLOOKAT_H - -#include "llhudeffect.h" - -class LLViewerObject; -class LLVOAvatar; -class LLAttentionSet; - -typedef enum e_lookat_type -{ - LOOKAT_TARGET_NONE, - LOOKAT_TARGET_IDLE, - LOOKAT_TARGET_AUTO_LISTEN, - LOOKAT_TARGET_FREELOOK, - LOOKAT_TARGET_RESPOND, - LOOKAT_TARGET_HOVER, - LOOKAT_TARGET_CONVERSATION, - LOOKAT_TARGET_SELECT, - LOOKAT_TARGET_FOCUS, - LOOKAT_TARGET_MOUSELOOK, - LOOKAT_TARGET_CLEAR, - LOOKAT_NUM_TARGETS -} ELookAtType; - -class LLHUDEffectLookAt : public LLHUDEffect -{ -public: - friend class LLHUDObject; - - /*virtual*/ void markDead(); - /*virtual*/ void setSourceObject(LLViewerObject* objectp); - - bool setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position); - void clearLookAtTarget(); - - ELookAtType getLookAtType() { return mTargetType; } - const LLVector3& getTargetPos() { return mTargetPos; } - const LLVector3d& getTargetOffset() { return mTargetOffsetGlobal; } - bool calcTargetPosition(); - -protected: - LLHUDEffectLookAt(const U8 type); - ~LLHUDEffectLookAt(); - - /*virtual*/ void update(); - /*virtual*/ void render(); - /*virtual*/ void packData(LLMessageSystem *mesgsys); - /*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum); - - // lookat behavior has either target position or target object with offset - void setTargetObjectAndOffset(LLViewerObject *objp, LLVector3d offset); - void setTargetPosGlobal(const LLVector3d &target_pos_global); - -public: - static bool sDebugLookAt; - -private: - ELookAtType mTargetType; - LLVector3d mTargetOffsetGlobal; - LLVector3 mLastSentOffsetGlobal; - F32 mKillTime; - LLFrameTimer mTimer; - LLVector3 mTargetPos; - F32 mLastSendTime; - LLAttentionSet* mAttentions; -}; - -#endif // LL_LLHUDEFFECTLOOKAT_H +/** + * @file llhudeffectlookat.h + * @brief LLHUDEffectLookAt class definition + * + * $LicenseInfo:firstyear=2002&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_LLHUDEFFECTLOOKAT_H +#define LL_LLHUDEFFECTLOOKAT_H + +#include "llhudeffect.h" + +class LLViewerObject; +class LLVOAvatar; +class LLAttentionSet; + +typedef enum e_lookat_type +{ + LOOKAT_TARGET_NONE, + LOOKAT_TARGET_IDLE, + LOOKAT_TARGET_AUTO_LISTEN, + LOOKAT_TARGET_FREELOOK, + LOOKAT_TARGET_RESPOND, + LOOKAT_TARGET_HOVER, + LOOKAT_TARGET_CONVERSATION, + LOOKAT_TARGET_SELECT, + LOOKAT_TARGET_FOCUS, + LOOKAT_TARGET_MOUSELOOK, + LOOKAT_TARGET_CLEAR, + LOOKAT_NUM_TARGETS +} ELookAtType; + +class LLHUDEffectLookAt : public LLHUDEffect +{ +public: + friend class LLHUDObject; + + /*virtual*/ void markDead(); + /*virtual*/ void setSourceObject(LLViewerObject* objectp); + + bool setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position); + void clearLookAtTarget(); + + ELookAtType getLookAtType() { return mTargetType; } + const LLVector3& getTargetPos() { return mTargetPos; } + const LLVector3d& getTargetOffset() { return mTargetOffsetGlobal; } + bool calcTargetPosition(); + +protected: + LLHUDEffectLookAt(const U8 type); + ~LLHUDEffectLookAt(); + + /*virtual*/ void update(); + /*virtual*/ void render(); + /*virtual*/ void packData(LLMessageSystem *mesgsys); + /*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum); + + // lookat behavior has either target position or target object with offset + void setTargetObjectAndOffset(LLViewerObject *objp, LLVector3d offset); + void setTargetPosGlobal(const LLVector3d &target_pos_global); + +public: + static bool sDebugLookAt; + +private: + ELookAtType mTargetType; + LLVector3d mTargetOffsetGlobal; + LLVector3 mLastSentOffsetGlobal; + F32 mKillTime; + LLFrameTimer mTimer; + LLVector3 mTargetPos; + F32 mLastSendTime; + LLAttentionSet* mAttentions; +}; + +#endif // LL_LLHUDEFFECTLOOKAT_H -- cgit v1.2.3