birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Legacy cleanup, part 2 (#3659)

Browse Source 
* Legacy cleanup, part 2

There are still things that can be removed, those will be likely done in part three:
`The Return of the Cleanup` :)

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix windows build

Somehow there were some unfixed errors from enabled warnings?
I'm unsure if I've pulled repo in unstable state, or those were somehow
missed.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
This commit is contained in:
Artur K
2021-08-30 22:40:02 +02:00
committed by GitHub
parent fa0f2a1007
commit 96a5f06ca3
116 changed files with 189 additions and 18706 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Legacy/CryCommon/IPathfinder.h
+4 -25
View File
@@ -15,11 +15,12 @@ struct IAIPathAgent;
#include <INavigationSystem.h>
#include <IMNM.h>
#include <ISerialize.h>
#include <SerializeFwd.h>
#include <Cry_Geo.h>
#include <LegacyAllocator.h>
#include <AzCore/std/functional.h>
#include <AzCore/std/containers/vector.h>
#include <AzCore/std/smart_ptr/shared_ptr.h>
#include <limits>
@@ -131,8 +132,7 @@ struct NavigationBlocker
Location location;
};
typedef DynArray<NavigationBlocker> NavigationBlockers;
using NavigationBlockers = AZStd::vector<NavigationBlocker, AZ::StdLegacyAllocator>;
//====================================================================
// PathPointDescriptor
@@ -240,8 +240,7 @@ struct PathfindingExtraConstraint
UConstraint constraint;
};
typedef DynArray<PathfindingExtraConstraint> PathfindingExtraConstraints;
using PathfindingExtraConstraints = AZStd::vector<PathfindingExtraConstraint, AZ::StdLegacyAllocator>;
struct PathfindRequest
{
@@ -557,26 +556,6 @@ public:
virtual void Draw(const Vec3& drawOffset = ZERO) const = 0;
virtual void Dump(const char* name) const = 0;
bool ArePathsEqual(const INavPath& otherNavPath)
{
const TPathPoints& path1 = this->GetPath();
const TPathPoints& path2 = otherNavPath.GetPath();
const TPathPoints::size_type path1Size = path1.size();
const TPathPoints::size_type path2Size = path2.size();
if (path1Size != path2Size)
{
return false;
}
TPathPoints::const_iterator path1It = path1.begin();
TPathPoints::const_iterator path1End = path1.end();
TPathPoints::const_iterator path2It = path2.begin();
typedef std::pair<TPathPoints::const_iterator, TPathPoints::const_iterator> TMismatchResult;
TMismatchResult result = std::mismatch(path1It, path1End, path2It, PathPointDescriptor::ArePointsEquivalent);
return result.first == path1.end();
}
};
using INavPathPtr = AZStd::shared_ptr<INavPath>;