diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-05-30 18:47:12 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-05-30 18:47:12 -0700 |
| commit | 3c2be426e5e905076d00b9492c0e66c8b31caf19 (patch) | |
| tree | 08d6c5592f0cf0e5b772812e182fdd71a31893fa /indra/newview/llpathfindinglinksetlist.h | |
| parent | 5d13d78c13a28b92c339a52403e76eb5a50b7b6b (diff) | |
First pass at refactoring the pathfinding linksets and pathfinding characters classes to reduce code duplication, as both functionalities were heavily duplicated.
Diffstat (limited to 'indra/newview/llpathfindinglinksetlist.h')
| -rw-r--r-- | indra/newview/llpathfindinglinksetlist.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/indra/newview/llpathfindinglinksetlist.h b/indra/newview/llpathfindinglinksetlist.h index 855b1cc451..7bd6986094 100644 --- a/indra/newview/llpathfindinglinksetlist.h +++ b/indra/newview/llpathfindinglinksetlist.h @@ -28,34 +28,32 @@ #ifndef LL_LLPATHFINDINGLINKSETLIST_H #define LL_LLPATHFINDINGLINKSETLIST_H -#include <string> -#include <map> #include "llpathfindinglinkset.h" - -#include <boost/shared_ptr.hpp> +#include "llpathfindingobjectlist.h" class LLSD; -class LLPathfindingLinksetList; - -typedef boost::shared_ptr<LLPathfindingLinksetList> LLPathfindingLinksetListPtr; -typedef std::map<std::string, LLPathfindingLinksetPtr> LLPathfindingLinksetMap; +class LLVector3; -class LLPathfindingLinksetList : public LLPathfindingLinksetMap +class LLPathfindingLinksetList : public LLPathfindingObjectList { public: LLPathfindingLinksetList(); - LLPathfindingLinksetList(const LLSD& pLinksetItems); + LLPathfindingLinksetList(const LLSD& pLinksetListData); virtual ~LLPathfindingLinksetList(); - void update(const LLPathfindingLinksetList &pUpdateLinksetList); - LLSD encodeObjectFields(LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const; LLSD encodeTerrainFields(LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const; + bool isShowUnmodifiablePhantomWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const; + bool isShowCannotBeVolumeWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const; + + void determinePossibleStates(BOOL &pCanBeWalkable, BOOL &pCanBeStaticObstacle, BOOL &pCanBeDynamicObstacle, + BOOL &pCanBeMaterialVolume, BOOL &pCanBeExclusionVolume, BOOL &pCanBeDynamicPhantom) const; + protected: private: - + void parseLinksetListData(const LLSD& pLinksetListData); }; #endif // LL_LLPATHFINDINGLINKSETLIST_H |