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/llpathfindinglinksetlist.cpp | 42 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'indra/newview/llpathfindinglinksetlist.cpp') diff --git a/indra/newview/llpathfindinglinksetlist.cpp b/indra/newview/llpathfindinglinksetlist.cpp index eb7b95552e..beceacb94a 100644 --- a/indra/newview/llpathfindinglinksetlist.cpp +++ b/indra/newview/llpathfindinglinksetlist.cpp @@ -141,15 +141,15 @@ bool LLPathfindingLinksetList::isShowCannotBeVolumeWarning(LLPathfindingLinkset: return isShowWarning; } -void LLPathfindingLinksetList::determinePossibleStates(BOOL &pCanBeWalkable, BOOL &pCanBeStaticObstacle, BOOL &pCanBeDynamicObstacle, - BOOL &pCanBeMaterialVolume, BOOL &pCanBeExclusionVolume, BOOL &pCanBeDynamicPhantom) const +void LLPathfindingLinksetList::determinePossibleStates(bool &pCanBeWalkable, bool &pCanBeStaticObstacle, bool &pCanBeDynamicObstacle, + bool &pCanBeMaterialVolume, bool &pCanBeExclusionVolume, bool &pCanBeDynamicPhantom) const { - pCanBeWalkable = FALSE; - pCanBeStaticObstacle = FALSE; - pCanBeDynamicObstacle = FALSE; - pCanBeMaterialVolume = FALSE; - pCanBeExclusionVolume = FALSE; - pCanBeDynamicPhantom = FALSE; + pCanBeWalkable = false; + pCanBeStaticObstacle = false; + pCanBeDynamicObstacle = false; + pCanBeMaterialVolume = false; + pCanBeExclusionVolume = false; + pCanBeDynamicPhantom = false; for (const_iterator objectIter = begin(); !(pCanBeWalkable && pCanBeStaticObstacle && pCanBeDynamicObstacle && pCanBeMaterialVolume && pCanBeExclusionVolume && pCanBeDynamicPhantom) && (objectIter != end()); @@ -160,36 +160,36 @@ void LLPathfindingLinksetList::determinePossibleStates(BOOL &pCanBeWalkable, BOO if (linkset->isTerrain()) { - pCanBeWalkable = TRUE; + pCanBeWalkable = true; } else { if (linkset->isModifiable()) { - pCanBeWalkable = TRUE; - pCanBeStaticObstacle = TRUE; - pCanBeDynamicObstacle = TRUE; - pCanBeDynamicPhantom = TRUE; + pCanBeWalkable = true; + pCanBeStaticObstacle = true; + pCanBeDynamicObstacle = true; + pCanBeDynamicPhantom = true; if (linkset->canBeVolume()) { - pCanBeMaterialVolume = TRUE; - pCanBeExclusionVolume = TRUE; + pCanBeMaterialVolume = true; + pCanBeExclusionVolume = true; } } else if (linkset->isPhantom()) { - pCanBeDynamicPhantom = TRUE; + pCanBeDynamicPhantom = true; if (linkset->canBeVolume()) { - pCanBeMaterialVolume = TRUE; - pCanBeExclusionVolume = TRUE; + pCanBeMaterialVolume = true; + pCanBeExclusionVolume = true; } } else { - pCanBeWalkable = TRUE; - pCanBeStaticObstacle = TRUE; - pCanBeDynamicObstacle = TRUE; + pCanBeWalkable = true; + pCanBeStaticObstacle = true; + pCanBeDynamicObstacle = true; } } } -- 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/llpathfindinglinksetlist.cpp | 426 ++++++++++++++--------------- 1 file changed, 213 insertions(+), 213 deletions(-) (limited to 'indra/newview/llpathfindinglinksetlist.cpp') diff --git a/indra/newview/llpathfindinglinksetlist.cpp b/indra/newview/llpathfindinglinksetlist.cpp index 497b132a97..2012d7a094 100644 --- a/indra/newview/llpathfindinglinksetlist.cpp +++ b/indra/newview/llpathfindinglinksetlist.cpp @@ -1,213 +1,213 @@ -/** -* @file llpathfindinglinksetlist.cpp -* @brief Implementation of llpathfindinglinksetlist -* @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$ -*/ - - -#include "llviewerprecompiledheaders.h" - -#include "llpathfindinglinksetlist.h" - -#include -#include - -#include "llpathfindinglinkset.h" -#include "llpathfindingobject.h" -#include "llpathfindingobjectlist.h" -#include "llsd.h" - -//--------------------------------------------------------------------------- -// LLPathfindingLinksetList -//--------------------------------------------------------------------------- - -LLPathfindingLinksetList::LLPathfindingLinksetList() - : LLPathfindingObjectList() -{ -} - -LLPathfindingLinksetList::LLPathfindingLinksetList(const LLSD& pLinksetListData) - : LLPathfindingObjectList() -{ - parseLinksetListData(pLinksetListData); -} - -LLPathfindingLinksetList::~LLPathfindingLinksetList() -{ -} - -LLSD LLPathfindingLinksetList::encodeObjectFields(LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const -{ - LLSD listData; - - for (const_iterator linksetIter = begin(); linksetIter != end(); ++linksetIter) - { - const LLPathfindingObjectPtr objectPtr = linksetIter->second; - const LLPathfindingLinkset *linkset = dynamic_cast(objectPtr.get()); - - if (!linkset->isTerrain()) - { - LLSD linksetData = linkset->encodeAlteredFields(pLinksetUse, pA, pB, pC, pD); - if (!linksetData.isUndefined()) - { - const std::string& uuid(linksetIter->first); - listData[uuid] = linksetData; - } - } - } - - return listData; -} - -LLSD LLPathfindingLinksetList::encodeTerrainFields(LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const -{ - LLSD terrainData; - - for (const_iterator linksetIter = begin(); linksetIter != end(); ++linksetIter) - { - const LLPathfindingObjectPtr objectPtr = linksetIter->second; - const LLPathfindingLinkset *linkset = dynamic_cast(objectPtr.get()); - - if (linkset->isTerrain()) - { - terrainData = linkset->encodeAlteredFields(pLinksetUse, pA, pB, pC, pD); - break; - } - } - - return terrainData; -} - -bool LLPathfindingLinksetList::isShowUnmodifiablePhantomWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const -{ - bool isShowWarning = false; - - for (const_iterator objectIter = begin(); !isShowWarning && (objectIter != end()); ++objectIter) - { - const LLPathfindingObjectPtr objectPtr = objectIter->second; - const LLPathfindingLinkset *linkset = dynamic_cast(objectPtr.get()); - isShowWarning = linkset->isShowUnmodifiablePhantomWarning(pLinksetUse); - } - - return isShowWarning; -} - -bool LLPathfindingLinksetList::isShowPhantomToggleWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const -{ - bool isShowWarning = false; - - for (const_iterator objectIter = begin(); !isShowWarning && (objectIter != end()); ++objectIter) - { - const LLPathfindingObjectPtr objectPtr = objectIter->second; - const LLPathfindingLinkset *linkset = dynamic_cast(objectPtr.get()); - isShowWarning = linkset->isShowPhantomToggleWarning(pLinksetUse); - } - - return isShowWarning; -} - -bool LLPathfindingLinksetList::isShowCannotBeVolumeWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const -{ - bool isShowWarning = false; - - for (const_iterator objectIter = begin(); !isShowWarning && (objectIter != end()); ++objectIter) - { - const LLPathfindingObjectPtr objectPtr = objectIter->second; - const LLPathfindingLinkset *linkset = dynamic_cast(objectPtr.get()); - isShowWarning = linkset->isShowCannotBeVolumeWarning(pLinksetUse); - } - - return isShowWarning; -} - -void LLPathfindingLinksetList::determinePossibleStates(bool &pCanBeWalkable, bool &pCanBeStaticObstacle, bool &pCanBeDynamicObstacle, - bool &pCanBeMaterialVolume, bool &pCanBeExclusionVolume, bool &pCanBeDynamicPhantom) const -{ - pCanBeWalkable = false; - pCanBeStaticObstacle = false; - pCanBeDynamicObstacle = false; - pCanBeMaterialVolume = false; - pCanBeExclusionVolume = false; - pCanBeDynamicPhantom = false; - - for (const_iterator objectIter = begin(); - !(pCanBeWalkable && pCanBeStaticObstacle && pCanBeDynamicObstacle && pCanBeMaterialVolume && pCanBeExclusionVolume && pCanBeDynamicPhantom) && (objectIter != end()); - ++objectIter) - { - const LLPathfindingObjectPtr objectPtr = objectIter->second; - const LLPathfindingLinkset *linkset = dynamic_cast(objectPtr.get()); - - if (linkset->isTerrain()) - { - pCanBeWalkable = true; - } - else - { - if (linkset->isModifiable()) - { - pCanBeWalkable = true; - pCanBeStaticObstacle = true; - pCanBeDynamicObstacle = true; - pCanBeDynamicPhantom = true; - if (linkset->canBeVolume()) - { - pCanBeMaterialVolume = true; - pCanBeExclusionVolume = true; - } - } - else if (linkset->isPhantom()) - { - pCanBeDynamicPhantom = true; - if (linkset->canBeVolume()) - { - pCanBeMaterialVolume = true; - pCanBeExclusionVolume = true; - } - } - else - { - pCanBeWalkable = true; - pCanBeStaticObstacle = true; - pCanBeDynamicObstacle = true; - } - } - } -} - -void LLPathfindingLinksetList::parseLinksetListData(const LLSD& pLinksetListData) -{ - LLPathfindingObjectMap &objectMap = getObjectMap(); - - for (LLSD::map_const_iterator linksetDataIter = pLinksetListData.beginMap(); - linksetDataIter != pLinksetListData.endMap(); ++linksetDataIter) - { - const std::string& uuid(linksetDataIter->first); - const LLSD& linksetData = linksetDataIter->second; - if(linksetData.size() != 0) - { - LLPathfindingObjectPtr linksetPtr(new LLPathfindingLinkset(uuid, linksetData)); - objectMap.insert(std::pair(uuid, linksetPtr)); - } - } -} +/** +* @file llpathfindinglinksetlist.cpp +* @brief Implementation of llpathfindinglinksetlist +* @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$ +*/ + + +#include "llviewerprecompiledheaders.h" + +#include "llpathfindinglinksetlist.h" + +#include +#include + +#include "llpathfindinglinkset.h" +#include "llpathfindingobject.h" +#include "llpathfindingobjectlist.h" +#include "llsd.h" + +//--------------------------------------------------------------------------- +// LLPathfindingLinksetList +//--------------------------------------------------------------------------- + +LLPathfindingLinksetList::LLPathfindingLinksetList() + : LLPathfindingObjectList() +{ +} + +LLPathfindingLinksetList::LLPathfindingLinksetList(const LLSD& pLinksetListData) + : LLPathfindingObjectList() +{ + parseLinksetListData(pLinksetListData); +} + +LLPathfindingLinksetList::~LLPathfindingLinksetList() +{ +} + +LLSD LLPathfindingLinksetList::encodeObjectFields(LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const +{ + LLSD listData; + + for (const_iterator linksetIter = begin(); linksetIter != end(); ++linksetIter) + { + const LLPathfindingObjectPtr objectPtr = linksetIter->second; + const LLPathfindingLinkset *linkset = dynamic_cast(objectPtr.get()); + + if (!linkset->isTerrain()) + { + LLSD linksetData = linkset->encodeAlteredFields(pLinksetUse, pA, pB, pC, pD); + if (!linksetData.isUndefined()) + { + const std::string& uuid(linksetIter->first); + listData[uuid] = linksetData; + } + } + } + + return listData; +} + +LLSD LLPathfindingLinksetList::encodeTerrainFields(LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const +{ + LLSD terrainData; + + for (const_iterator linksetIter = begin(); linksetIter != end(); ++linksetIter) + { + const LLPathfindingObjectPtr objectPtr = linksetIter->second; + const LLPathfindingLinkset *linkset = dynamic_cast(objectPtr.get()); + + if (linkset->isTerrain()) + { + terrainData = linkset->encodeAlteredFields(pLinksetUse, pA, pB, pC, pD); + break; + } + } + + return terrainData; +} + +bool LLPathfindingLinksetList::isShowUnmodifiablePhantomWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const +{ + bool isShowWarning = false; + + for (const_iterator objectIter = begin(); !isShowWarning && (objectIter != end()); ++objectIter) + { + const LLPathfindingObjectPtr objectPtr = objectIter->second; + const LLPathfindingLinkset *linkset = dynamic_cast(objectPtr.get()); + isShowWarning = linkset->isShowUnmodifiablePhantomWarning(pLinksetUse); + } + + return isShowWarning; +} + +bool LLPathfindingLinksetList::isShowPhantomToggleWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const +{ + bool isShowWarning = false; + + for (const_iterator objectIter = begin(); !isShowWarning && (objectIter != end()); ++objectIter) + { + const LLPathfindingObjectPtr objectPtr = objectIter->second; + const LLPathfindingLinkset *linkset = dynamic_cast(objectPtr.get()); + isShowWarning = linkset->isShowPhantomToggleWarning(pLinksetUse); + } + + return isShowWarning; +} + +bool LLPathfindingLinksetList::isShowCannotBeVolumeWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const +{ + bool isShowWarning = false; + + for (const_iterator objectIter = begin(); !isShowWarning && (objectIter != end()); ++objectIter) + { + const LLPathfindingObjectPtr objectPtr = objectIter->second; + const LLPathfindingLinkset *linkset = dynamic_cast(objectPtr.get()); + isShowWarning = linkset->isShowCannotBeVolumeWarning(pLinksetUse); + } + + return isShowWarning; +} + +void LLPathfindingLinksetList::determinePossibleStates(bool &pCanBeWalkable, bool &pCanBeStaticObstacle, bool &pCanBeDynamicObstacle, + bool &pCanBeMaterialVolume, bool &pCanBeExclusionVolume, bool &pCanBeDynamicPhantom) const +{ + pCanBeWalkable = false; + pCanBeStaticObstacle = false; + pCanBeDynamicObstacle = false; + pCanBeMaterialVolume = false; + pCanBeExclusionVolume = false; + pCanBeDynamicPhantom = false; + + for (const_iterator objectIter = begin(); + !(pCanBeWalkable && pCanBeStaticObstacle && pCanBeDynamicObstacle && pCanBeMaterialVolume && pCanBeExclusionVolume && pCanBeDynamicPhantom) && (objectIter != end()); + ++objectIter) + { + const LLPathfindingObjectPtr objectPtr = objectIter->second; + const LLPathfindingLinkset *linkset = dynamic_cast(objectPtr.get()); + + if (linkset->isTerrain()) + { + pCanBeWalkable = true; + } + else + { + if (linkset->isModifiable()) + { + pCanBeWalkable = true; + pCanBeStaticObstacle = true; + pCanBeDynamicObstacle = true; + pCanBeDynamicPhantom = true; + if (linkset->canBeVolume()) + { + pCanBeMaterialVolume = true; + pCanBeExclusionVolume = true; + } + } + else if (linkset->isPhantom()) + { + pCanBeDynamicPhantom = true; + if (linkset->canBeVolume()) + { + pCanBeMaterialVolume = true; + pCanBeExclusionVolume = true; + } + } + else + { + pCanBeWalkable = true; + pCanBeStaticObstacle = true; + pCanBeDynamicObstacle = true; + } + } + } +} + +void LLPathfindingLinksetList::parseLinksetListData(const LLSD& pLinksetListData) +{ + LLPathfindingObjectMap &objectMap = getObjectMap(); + + for (LLSD::map_const_iterator linksetDataIter = pLinksetListData.beginMap(); + linksetDataIter != pLinksetListData.endMap(); ++linksetDataIter) + { + const std::string& uuid(linksetDataIter->first); + const LLSD& linksetData = linksetDataIter->second; + if(linksetData.size() != 0) + { + LLPathfindingObjectPtr linksetPtr(new LLPathfindingLinkset(uuid, linksetData)); + objectMap.insert(std::pair(uuid, linksetPtr)); + } + } +} -- cgit v1.2.3