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/llpathfindingpathtool.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'indra/newview/llpathfindingpathtool.h') diff --git a/indra/newview/llpathfindingpathtool.h b/indra/newview/llpathfindingpathtool.h index 88cb3a15f8..1f55573c58 100644 --- a/indra/newview/llpathfindingpathtool.h +++ b/indra/newview/llpathfindingpathtool.h @@ -66,15 +66,15 @@ public: typedef boost::signals2::signal path_event_signal_t; typedef boost::signals2::connection path_event_slot_t; - virtual BOOL handleMouseDown(S32 pX, S32 pY, MASK pMask); - virtual BOOL handleMouseUp(S32 pX, S32 pY, MASK pMask); - virtual BOOL handleMiddleMouseDown(S32 pX, S32 pY, MASK pMask); - virtual BOOL handleMiddleMouseUp(S32 pX, S32 pY, MASK pMask); - virtual BOOL handleRightMouseDown(S32 pX, S32 pY, MASK pMask); - virtual BOOL handleRightMouseUp(S32 pX, S32 pY, MASK pMask); - virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); - - virtual BOOL handleHover(S32 pX, S32 pY, MASK pMask); + virtual bool handleMouseDown(S32 pX, S32 pY, MASK pMask); + virtual bool handleMouseUp(S32 pX, S32 pY, MASK pMask); + virtual bool handleMiddleMouseDown(S32 pX, S32 pY, MASK pMask); + virtual bool handleMiddleMouseUp(S32 pX, S32 pY, MASK pMask); + virtual bool handleRightMouseDown(S32 pX, S32 pY, MASK pMask); + virtual bool handleRightMouseUp(S32 pX, S32 pY, MASK pMask); + virtual bool handleDoubleClick(S32 x, S32 y, MASK mask); + + virtual bool handleHover(S32 pX, S32 pY, MASK pMask); virtual BOOL handleKey(KEY pKey, MASK pMask); -- 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/llpathfindingpathtool.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpathfindingpathtool.h') diff --git a/indra/newview/llpathfindingpathtool.h b/indra/newview/llpathfindingpathtool.h index 1f55573c58..720314df02 100644 --- a/indra/newview/llpathfindingpathtool.h +++ b/indra/newview/llpathfindingpathtool.h @@ -76,7 +76,7 @@ public: virtual bool handleHover(S32 pX, S32 pY, MASK pMask); - virtual BOOL handleKey(KEY pKey, MASK pMask); + virtual bool handleKey(KEY pKey, MASK pMask); EPathStatus getPathStatus() const; -- 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/llpathfindingpathtool.h | 276 +++++++++++++++++----------------- 1 file changed, 138 insertions(+), 138 deletions(-) (limited to 'indra/newview/llpathfindingpathtool.h') diff --git a/indra/newview/llpathfindingpathtool.h b/indra/newview/llpathfindingpathtool.h index c263c8ad76..189b9d4954 100644 --- a/indra/newview/llpathfindingpathtool.h +++ b/indra/newview/llpathfindingpathtool.h @@ -1,138 +1,138 @@ -/** -* @file llpathfindingpathtool.h -* @brief Header file for llpathfindingpathtool -* @author Stinson@lindenlab.com -* -* $LicenseInfo:firstyear=2012&license=viewerlgpl$ -* Second Life Viewer Source Code -* Copyright (C) 2012, 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_LLPATHFINDINGPATHTOOL_H -#define LL_LLPATHFINDINGPATHTOOL_H - -#include -#include - -#include "llpathinglib.h" -#include "llsingleton.h" -#include "lltool.h" - -class LLPathfindingPathTool : public LLTool, public LLSingleton -{ - LLSINGLETON(LLPathfindingPathTool); - virtual ~LLPathfindingPathTool(); - -public: - typedef enum - { - kPathStatusUnknown, - kPathStatusChooseStartAndEndPoints, - kPathStatusChooseStartPoint, - kPathStatusChooseEndPoint, - kPathStatusHasValidPath, - kPathStatusHasInvalidPath, - kPathStatusNotEnabled, - kPathStatusNotImplemented, - kPathStatusError - } EPathStatus; - - typedef enum - { - kCharacterTypeNone, - kCharacterTypeA, - kCharacterTypeB, - kCharacterTypeC, - kCharacterTypeD - } ECharacterType; - - typedef boost::function path_event_callback_t; - typedef boost::signals2::signal path_event_signal_t; - typedef boost::signals2::connection path_event_slot_t; - - virtual bool handleMouseDown(S32 pX, S32 pY, MASK pMask) override; - virtual bool handleMouseUp(S32 pX, S32 pY, MASK pMask) override; - virtual bool handleMiddleMouseDown(S32 pX, S32 pY, MASK pMask) override; - virtual bool handleMiddleMouseUp(S32 pX, S32 pY, MASK pMask) override; - virtual bool handleRightMouseDown(S32 pX, S32 pY, MASK pMask) override; - virtual bool handleRightMouseUp(S32 pX, S32 pY, MASK pMask) override; - virtual bool handleDoubleClick(S32 x, S32 y, MASK mask) override; - - virtual bool handleHover(S32 pX, S32 pY, MASK pMask) override; - - virtual bool handleKey(KEY pKey, MASK pMask) override; - - EPathStatus getPathStatus() const; - - F32 getCharacterWidth() const; - void setCharacterWidth(F32 pCharacterWidth); - - ECharacterType getCharacterType() const; - void setCharacterType(ECharacterType pCharacterType); - - bool isRenderPath() const; - void clearPath(); - - path_event_slot_t registerPathEventListener(path_event_callback_t pPathEventCallback); - -protected: - -private: - bool isAnyPathToolModKeys(MASK pMask) const; - bool isPointAModKeys(MASK pMask) const; - bool isPointBModKeys(MASK pMask) const; - bool isCameraModKeys(MASK pMask) const; - - void getRayPoints(S32 pX, S32 pY, LLVector3 &pRayStart, LLVector3 &pRayEnd) const; - void computeFinalPoints(S32 pX, S32 pY, MASK pMask); - void computeTempPoints(S32 pX, S32 pY, MASK pMask); - - void setFinalA(const LLVector3 &pStartPoint, const LLVector3 &pEndPoint); - bool hasFinalA() const; - const LLVector3 &getFinalAStart() const; - const LLVector3 &getFinalAEnd() const; - - void setTempA(const LLVector3 &pStartPoint, const LLVector3 &pEndPoint); - bool hasTempA() const; - - void setFinalB(const LLVector3 &pStartPoint, const LLVector3 &pEndPoint); - bool hasFinalB() const; - const LLVector3 &getFinalBStart() const; - const LLVector3 &getFinalBEnd() const; - - void setTempB(const LLVector3 &pStartPoint, const LLVector3 &pEndPoint); - bool hasTempB() const; - - void clearFinal(); - void clearTemp(); - - void computeFinalPath(); - void computeTempPath(); - - LLPathingLib::PathingPacket mFinalPathData; - LLPathingLib::PathingPacket mTempPathData; - LLPathingLib::LLPLResult mPathResult; - ECharacterType mCharacterType; - path_event_signal_t mPathEventSignal; - bool mIsLeftMouseButtonHeld; - bool mIsMiddleMouseButtonHeld; - bool mIsRightMouseButtonHeld; -}; - -#endif // LL_LLPATHFINDINGPATHTOOL_H +/** +* @file llpathfindingpathtool.h +* @brief Header file for llpathfindingpathtool +* @author Stinson@lindenlab.com +* +* $LicenseInfo:firstyear=2012&license=viewerlgpl$ +* Second Life Viewer Source Code +* Copyright (C) 2012, 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_LLPATHFINDINGPATHTOOL_H +#define LL_LLPATHFINDINGPATHTOOL_H + +#include +#include + +#include "llpathinglib.h" +#include "llsingleton.h" +#include "lltool.h" + +class LLPathfindingPathTool : public LLTool, public LLSingleton +{ + LLSINGLETON(LLPathfindingPathTool); + virtual ~LLPathfindingPathTool(); + +public: + typedef enum + { + kPathStatusUnknown, + kPathStatusChooseStartAndEndPoints, + kPathStatusChooseStartPoint, + kPathStatusChooseEndPoint, + kPathStatusHasValidPath, + kPathStatusHasInvalidPath, + kPathStatusNotEnabled, + kPathStatusNotImplemented, + kPathStatusError + } EPathStatus; + + typedef enum + { + kCharacterTypeNone, + kCharacterTypeA, + kCharacterTypeB, + kCharacterTypeC, + kCharacterTypeD + } ECharacterType; + + typedef boost::function path_event_callback_t; + typedef boost::signals2::signal path_event_signal_t; + typedef boost::signals2::connection path_event_slot_t; + + virtual bool handleMouseDown(S32 pX, S32 pY, MASK pMask) override; + virtual bool handleMouseUp(S32 pX, S32 pY, MASK pMask) override; + virtual bool handleMiddleMouseDown(S32 pX, S32 pY, MASK pMask) override; + virtual bool handleMiddleMouseUp(S32 pX, S32 pY, MASK pMask) override; + virtual bool handleRightMouseDown(S32 pX, S32 pY, MASK pMask) override; + virtual bool handleRightMouseUp(S32 pX, S32 pY, MASK pMask) override; + virtual bool handleDoubleClick(S32 x, S32 y, MASK mask) override; + + virtual bool handleHover(S32 pX, S32 pY, MASK pMask) override; + + virtual bool handleKey(KEY pKey, MASK pMask) override; + + EPathStatus getPathStatus() const; + + F32 getCharacterWidth() const; + void setCharacterWidth(F32 pCharacterWidth); + + ECharacterType getCharacterType() const; + void setCharacterType(ECharacterType pCharacterType); + + bool isRenderPath() const; + void clearPath(); + + path_event_slot_t registerPathEventListener(path_event_callback_t pPathEventCallback); + +protected: + +private: + bool isAnyPathToolModKeys(MASK pMask) const; + bool isPointAModKeys(MASK pMask) const; + bool isPointBModKeys(MASK pMask) const; + bool isCameraModKeys(MASK pMask) const; + + void getRayPoints(S32 pX, S32 pY, LLVector3 &pRayStart, LLVector3 &pRayEnd) const; + void computeFinalPoints(S32 pX, S32 pY, MASK pMask); + void computeTempPoints(S32 pX, S32 pY, MASK pMask); + + void setFinalA(const LLVector3 &pStartPoint, const LLVector3 &pEndPoint); + bool hasFinalA() const; + const LLVector3 &getFinalAStart() const; + const LLVector3 &getFinalAEnd() const; + + void setTempA(const LLVector3 &pStartPoint, const LLVector3 &pEndPoint); + bool hasTempA() const; + + void setFinalB(const LLVector3 &pStartPoint, const LLVector3 &pEndPoint); + bool hasFinalB() const; + const LLVector3 &getFinalBStart() const; + const LLVector3 &getFinalBEnd() const; + + void setTempB(const LLVector3 &pStartPoint, const LLVector3 &pEndPoint); + bool hasTempB() const; + + void clearFinal(); + void clearTemp(); + + void computeFinalPath(); + void computeTempPath(); + + LLPathingLib::PathingPacket mFinalPathData; + LLPathingLib::PathingPacket mTempPathData; + LLPathingLib::LLPLResult mPathResult; + ECharacterType mCharacterType; + path_event_signal_t mPathEventSignal; + bool mIsLeftMouseButtonHeld; + bool mIsMiddleMouseButtonHeld; + bool mIsRightMouseButtonHeld; +}; + +#endif // LL_LLPATHFINDINGPATHTOOL_H -- cgit v1.2.3