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/llfloaterpathfindingconsole.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterpathfindingconsole.h') diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h index e999e57741..bfd267ca10 100644 --- a/indra/newview/llfloaterpathfindingconsole.h +++ b/indra/newview/llfloaterpathfindingconsole.h @@ -55,7 +55,7 @@ class LLFloaterPathfindingConsole friend class LLFloaterReg; public: - virtual BOOL postBuild(); + virtual bool postBuild(); virtual void onOpen(const LLSD& pKey); virtual void onClose(bool pIsAppQuitting); -- 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/llfloaterpathfindingconsole.h | 38 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'indra/newview/llfloaterpathfindingconsole.h') diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h index bfd267ca10..7d557a73b5 100644 --- a/indra/newview/llfloaterpathfindingconsole.h +++ b/indra/newview/llfloaterpathfindingconsole.h @@ -61,34 +61,34 @@ public: static LLHandle getInstanceHandle(); - BOOL isRenderNavMesh() const; - void setRenderNavMesh(BOOL pIsRenderNavMesh); + bool isRenderNavMesh() const; + void setRenderNavMesh(bool pIsRenderNavMesh); - BOOL isRenderWalkables() const; - void setRenderWalkables(BOOL pIsRenderWalkables); + bool isRenderWalkables() const; + void setRenderWalkables(bool pIsRenderWalkables); - BOOL isRenderStaticObstacles() const; - void setRenderStaticObstacles(BOOL pIsRenderStaticObstacles); + bool isRenderStaticObstacles() const; + void setRenderStaticObstacles(bool pIsRenderStaticObstacles); - BOOL isRenderMaterialVolumes() const; - void setRenderMaterialVolumes(BOOL pIsRenderMaterialVolumes); + bool isRenderMaterialVolumes() const; + void setRenderMaterialVolumes(bool pIsRenderMaterialVolumes); - BOOL isRenderExclusionVolumes() const; - void setRenderExclusionVolumes(BOOL pIsRenderExclusionVolumes); + bool isRenderExclusionVolumes() const; + void setRenderExclusionVolumes(bool pIsRenderExclusionVolumes); - BOOL isRenderWorld() const; - void setRenderWorld(BOOL pIsRenderWorld); + bool isRenderWorld() const; + void setRenderWorld(bool pIsRenderWorld); - BOOL isRenderWorldMovablesOnly() const; - void setRenderWorldMovablesOnly(BOOL pIsRenderWorldMovablesOnly); + bool isRenderWorldMovablesOnly() const; + void setRenderWorldMovablesOnly(bool pIsRenderWorldMovablesOnly); - BOOL isRenderWaterPlane() const; - void setRenderWaterPlane(BOOL pIsRenderWaterPlane); + bool isRenderWaterPlane() const; + void setRenderWaterPlane(bool pIsRenderWaterPlane); - BOOL isRenderXRay() const; - void setRenderXRay(BOOL pIsRenderXRay); + bool isRenderXRay() const; + void setRenderXRay(bool pIsRenderXRay); - BOOL isRenderAnyShapes() const; + bool isRenderAnyShapes() const; U32 getRenderShapeFlags(); LLPathingLib::LLPLCharacterType getRenderHeatmapType() 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/llfloaterpathfindingconsole.h | 440 ++++++++++++++-------------- 1 file changed, 220 insertions(+), 220 deletions(-) (limited to 'indra/newview/llfloaterpathfindingconsole.h') diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h index 7b8d9c820b..bcbc94e10e 100644 --- a/indra/newview/llfloaterpathfindingconsole.h +++ b/indra/newview/llfloaterpathfindingconsole.h @@ -1,220 +1,220 @@ -/** -* @file llfloaterpathfindingconsole.h -* @brief "Pathfinding console" floater, allowing for viewing and testing of the pathfinding navmesh through Havok AI utilities. -* @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_LLFLOATERPATHFINDINGCONSOLE_H -#define LL_LLFLOATERPATHFINDINGCONSOLE_H - -#include - -#include - -#include "llfloater.h" -#include "llhandle.h" -#include "llpathfindingnavmeshzone.h" -#include "llpathfindingpathtool.h" -#include "llpathinglib.h" -#include "v4color.h" - -class LLButton; -class LLCheckBoxCtrl; -class LLComboBox; -class LLControlVariable; -class LLPanel; -class LLSD; -class LLSliderCtrl; -class LLTabContainer; -class LLTextBase; -class LLToolset; - -class LLFloaterPathfindingConsole -: public LLFloater -{ - friend class LLFloaterReg; - -public: - virtual bool postBuild(); - virtual void onOpen(const LLSD& pKey); - virtual void onClose(bool pIsAppQuitting); - - static LLHandle getInstanceHandle(); - - bool isRenderNavMesh() const; - void setRenderNavMesh(bool pIsRenderNavMesh); - - bool isRenderWalkables() const; - void setRenderWalkables(bool pIsRenderWalkables); - - bool isRenderStaticObstacles() const; - void setRenderStaticObstacles(bool pIsRenderStaticObstacles); - - bool isRenderMaterialVolumes() const; - void setRenderMaterialVolumes(bool pIsRenderMaterialVolumes); - - bool isRenderExclusionVolumes() const; - void setRenderExclusionVolumes(bool pIsRenderExclusionVolumes); - - bool isRenderWorld() const; - void setRenderWorld(bool pIsRenderWorld); - - bool isRenderWorldMovablesOnly() const; - void setRenderWorldMovablesOnly(bool pIsRenderWorldMovablesOnly); - - bool isRenderWaterPlane() const; - void setRenderWaterPlane(bool pIsRenderWaterPlane); - - bool isRenderXRay() const; - void setRenderXRay(bool pIsRenderXRay); - - bool isRenderAnyShapes() const; - U32 getRenderShapeFlags(); - - LLPathingLib::LLPLCharacterType getRenderHeatmapType() const; - void setRenderHeatmapType(LLPathingLib::LLPLCharacterType pRenderHeatmapType); - void onRegionBoundaryCross(); -protected: - -private: - typedef enum - { - kConsoleStateUnknown, - kConsoleStateLibraryNotImplemented, - kConsoleStateRegionNotEnabled, - kConsoleStateRegionLoading, - kConsoleStateCheckingVersion, - kConsoleStateDownloading, - kConsoleStateHasNavMesh, - kConsoleStateError - } EConsoleState; - - // Does its own instance management, so clients not allowed - // to allocate or destroy. - LLFloaterPathfindingConsole(const LLSD& pSeed); - virtual ~LLFloaterPathfindingConsole(); - - void onTabSwitch(); - void onShowWorldSet(); - void onShowWorldMovablesOnlySet(); - void onShowNavMeshSet(); - void onShowWalkabilitySet(); - void onCharacterWidthSet(); - void onCharacterTypeSwitch(); - void onClearPathClicked(); - - void handleNavMeshZoneStatus(LLPathfindingNavMeshZone::ENavMeshZoneRequestStatus pNavMeshZoneRequestStatus); - - void onPathEvent(); - - void setDefaultInputs(); - void setConsoleState(EConsoleState pConsoleState); - void setWorldRenderState(); - void setNavMeshRenderState(); - void updateRenderablesObjects(); - - void updateControlsOnConsoleState(); - void updateViewerStatusOnConsoleState(); - void updateSimulatorStatusOnConsoleState(); - - void initializeNavMeshZoneForCurrentRegion(); - - void switchIntoTestPathMode(); - void switchOutOfTestPathMode(); - void updateCharacterWidth(); - void updateCharacterType(); - void clearPath(); - void updatePathTestStatus(); - - void registerSavedSettingsListeners(); - void deregisterSavedSettingsListeners(); - void handleRetrieveNeighborChange(LLControlVariable *pControl, const LLSD &pNewValue); - void handleNavMeshColorChange(LLControlVariable *pControl, const LLSD &pNewValue); - void fillInColorsForNavMeshVisualization(); - void cleanupRenderableRestoreItems(); - - LLRootHandle mSelfHandle; - LLTabContainer *mViewTestTabContainer; - LLPanel *mViewTab; - LLTextBase *mShowLabel; - LLCheckBoxCtrl *mShowWorldCheckBox; - LLCheckBoxCtrl *mShowWorldMovablesOnlyCheckBox; - LLCheckBoxCtrl *mShowNavMeshCheckBox; - LLTextBase *mShowNavMeshWalkabilityLabel; - LLComboBox *mShowNavMeshWalkabilityComboBox; - LLCheckBoxCtrl *mShowWalkablesCheckBox; - LLCheckBoxCtrl *mShowStaticObstaclesCheckBox; - LLCheckBoxCtrl *mShowMaterialVolumesCheckBox; - LLCheckBoxCtrl *mShowExclusionVolumesCheckBox; - LLCheckBoxCtrl *mShowRenderWaterPlaneCheckBox; - LLCheckBoxCtrl *mShowXRayCheckBox; - LLTextBase *mPathfindingViewerStatus; - LLTextBase *mPathfindingSimulatorStatus; - LLPanel *mTestTab; - LLTextBase *mCtrlClickLabel; - LLTextBase *mShiftClickLabel; - LLTextBase *mCharacterWidthLabel; - LLTextBase *mCharacterWidthUnitLabel; - LLSliderCtrl *mCharacterWidthSlider; - LLTextBase *mCharacterTypeLabel; - LLComboBox *mCharacterTypeComboBox; - LLTextBase *mPathTestingStatus; - LLButton *mClearPathButton; - - LLColor4 mErrorColor; - LLColor4 mWarningColor; - - LLPathfindingNavMeshZone::navmesh_zone_slot_t mNavMeshZoneSlot; - LLPathfindingNavMeshZone mNavMeshZone; - bool mIsNavMeshUpdating; - - boost::signals2::connection mRegionBoundarySlot; - boost::signals2::connection mTeleportFailedSlot; - LLPathfindingPathTool::path_event_slot_t mPathEventSlot; - - LLToolset *mPathfindingToolset; - LLToolset *mSavedToolset; - - boost::signals2::connection mSavedSettingRetrieveNeighborSlot; - boost::signals2::connection mSavedSettingWalkableSlot; - boost::signals2::connection mSavedSettingStaticObstacleSlot; - boost::signals2::connection mSavedSettingMaterialVolumeSlot; - boost::signals2::connection mSavedSettingExclusionVolumeSlot; - boost::signals2::connection mSavedSettingInteriorEdgeSlot; - boost::signals2::connection mSavedSettingExteriorEdgeSlot; - boost::signals2::connection mSavedSettingHeatmapMinSlot; - boost::signals2::connection mSavedSettingHeatmapMaxSlot; - boost::signals2::connection mSavedSettingNavMeshFaceSlot; - boost::signals2::connection mSavedSettingTestPathValidEndSlot; - boost::signals2::connection mSavedSettingTestPathInvalidEndSlot; - boost::signals2::connection mSavedSettingTestPathSlot; - boost::signals2::connection mSavedSettingWaterSlot; - - EConsoleState mConsoleState; - - std::vector mRenderableRestoreList; - - static LLHandle sInstanceHandle; -}; - -#endif // LL_LLFLOATERPATHFINDINGCONSOLE_H +/** +* @file llfloaterpathfindingconsole.h +* @brief "Pathfinding console" floater, allowing for viewing and testing of the pathfinding navmesh through Havok AI utilities. +* @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_LLFLOATERPATHFINDINGCONSOLE_H +#define LL_LLFLOATERPATHFINDINGCONSOLE_H + +#include + +#include + +#include "llfloater.h" +#include "llhandle.h" +#include "llpathfindingnavmeshzone.h" +#include "llpathfindingpathtool.h" +#include "llpathinglib.h" +#include "v4color.h" + +class LLButton; +class LLCheckBoxCtrl; +class LLComboBox; +class LLControlVariable; +class LLPanel; +class LLSD; +class LLSliderCtrl; +class LLTabContainer; +class LLTextBase; +class LLToolset; + +class LLFloaterPathfindingConsole +: public LLFloater +{ + friend class LLFloaterReg; + +public: + virtual bool postBuild(); + virtual void onOpen(const LLSD& pKey); + virtual void onClose(bool pIsAppQuitting); + + static LLHandle getInstanceHandle(); + + bool isRenderNavMesh() const; + void setRenderNavMesh(bool pIsRenderNavMesh); + + bool isRenderWalkables() const; + void setRenderWalkables(bool pIsRenderWalkables); + + bool isRenderStaticObstacles() const; + void setRenderStaticObstacles(bool pIsRenderStaticObstacles); + + bool isRenderMaterialVolumes() const; + void setRenderMaterialVolumes(bool pIsRenderMaterialVolumes); + + bool isRenderExclusionVolumes() const; + void setRenderExclusionVolumes(bool pIsRenderExclusionVolumes); + + bool isRenderWorld() const; + void setRenderWorld(bool pIsRenderWorld); + + bool isRenderWorldMovablesOnly() const; + void setRenderWorldMovablesOnly(bool pIsRenderWorldMovablesOnly); + + bool isRenderWaterPlane() const; + void setRenderWaterPlane(bool pIsRenderWaterPlane); + + bool isRenderXRay() const; + void setRenderXRay(bool pIsRenderXRay); + + bool isRenderAnyShapes() const; + U32 getRenderShapeFlags(); + + LLPathingLib::LLPLCharacterType getRenderHeatmapType() const; + void setRenderHeatmapType(LLPathingLib::LLPLCharacterType pRenderHeatmapType); + void onRegionBoundaryCross(); +protected: + +private: + typedef enum + { + kConsoleStateUnknown, + kConsoleStateLibraryNotImplemented, + kConsoleStateRegionNotEnabled, + kConsoleStateRegionLoading, + kConsoleStateCheckingVersion, + kConsoleStateDownloading, + kConsoleStateHasNavMesh, + kConsoleStateError + } EConsoleState; + + // Does its own instance management, so clients not allowed + // to allocate or destroy. + LLFloaterPathfindingConsole(const LLSD& pSeed); + virtual ~LLFloaterPathfindingConsole(); + + void onTabSwitch(); + void onShowWorldSet(); + void onShowWorldMovablesOnlySet(); + void onShowNavMeshSet(); + void onShowWalkabilitySet(); + void onCharacterWidthSet(); + void onCharacterTypeSwitch(); + void onClearPathClicked(); + + void handleNavMeshZoneStatus(LLPathfindingNavMeshZone::ENavMeshZoneRequestStatus pNavMeshZoneRequestStatus); + + void onPathEvent(); + + void setDefaultInputs(); + void setConsoleState(EConsoleState pConsoleState); + void setWorldRenderState(); + void setNavMeshRenderState(); + void updateRenderablesObjects(); + + void updateControlsOnConsoleState(); + void updateViewerStatusOnConsoleState(); + void updateSimulatorStatusOnConsoleState(); + + void initializeNavMeshZoneForCurrentRegion(); + + void switchIntoTestPathMode(); + void switchOutOfTestPathMode(); + void updateCharacterWidth(); + void updateCharacterType(); + void clearPath(); + void updatePathTestStatus(); + + void registerSavedSettingsListeners(); + void deregisterSavedSettingsListeners(); + void handleRetrieveNeighborChange(LLControlVariable *pControl, const LLSD &pNewValue); + void handleNavMeshColorChange(LLControlVariable *pControl, const LLSD &pNewValue); + void fillInColorsForNavMeshVisualization(); + void cleanupRenderableRestoreItems(); + + LLRootHandle mSelfHandle; + LLTabContainer *mViewTestTabContainer; + LLPanel *mViewTab; + LLTextBase *mShowLabel; + LLCheckBoxCtrl *mShowWorldCheckBox; + LLCheckBoxCtrl *mShowWorldMovablesOnlyCheckBox; + LLCheckBoxCtrl *mShowNavMeshCheckBox; + LLTextBase *mShowNavMeshWalkabilityLabel; + LLComboBox *mShowNavMeshWalkabilityComboBox; + LLCheckBoxCtrl *mShowWalkablesCheckBox; + LLCheckBoxCtrl *mShowStaticObstaclesCheckBox; + LLCheckBoxCtrl *mShowMaterialVolumesCheckBox; + LLCheckBoxCtrl *mShowExclusionVolumesCheckBox; + LLCheckBoxCtrl *mShowRenderWaterPlaneCheckBox; + LLCheckBoxCtrl *mShowXRayCheckBox; + LLTextBase *mPathfindingViewerStatus; + LLTextBase *mPathfindingSimulatorStatus; + LLPanel *mTestTab; + LLTextBase *mCtrlClickLabel; + LLTextBase *mShiftClickLabel; + LLTextBase *mCharacterWidthLabel; + LLTextBase *mCharacterWidthUnitLabel; + LLSliderCtrl *mCharacterWidthSlider; + LLTextBase *mCharacterTypeLabel; + LLComboBox *mCharacterTypeComboBox; + LLTextBase *mPathTestingStatus; + LLButton *mClearPathButton; + + LLColor4 mErrorColor; + LLColor4 mWarningColor; + + LLPathfindingNavMeshZone::navmesh_zone_slot_t mNavMeshZoneSlot; + LLPathfindingNavMeshZone mNavMeshZone; + bool mIsNavMeshUpdating; + + boost::signals2::connection mRegionBoundarySlot; + boost::signals2::connection mTeleportFailedSlot; + LLPathfindingPathTool::path_event_slot_t mPathEventSlot; + + LLToolset *mPathfindingToolset; + LLToolset *mSavedToolset; + + boost::signals2::connection mSavedSettingRetrieveNeighborSlot; + boost::signals2::connection mSavedSettingWalkableSlot; + boost::signals2::connection mSavedSettingStaticObstacleSlot; + boost::signals2::connection mSavedSettingMaterialVolumeSlot; + boost::signals2::connection mSavedSettingExclusionVolumeSlot; + boost::signals2::connection mSavedSettingInteriorEdgeSlot; + boost::signals2::connection mSavedSettingExteriorEdgeSlot; + boost::signals2::connection mSavedSettingHeatmapMinSlot; + boost::signals2::connection mSavedSettingHeatmapMaxSlot; + boost::signals2::connection mSavedSettingNavMeshFaceSlot; + boost::signals2::connection mSavedSettingTestPathValidEndSlot; + boost::signals2::connection mSavedSettingTestPathInvalidEndSlot; + boost::signals2::connection mSavedSettingTestPathSlot; + boost::signals2::connection mSavedSettingWaterSlot; + + EConsoleState mConsoleState; + + std::vector mRenderableRestoreList; + + static LLHandle sInstanceHandle; +}; + +#endif // LL_LLFLOATERPATHFINDINGCONSOLE_H -- cgit v1.2.3