refactor(Core): apply clang-tidy modernize-* (#9975)

Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com>
This commit is contained in:
Francesco Borzì
2022-01-17 14:35:07 +01:00
committed by GitHub
parent fe4899202d
commit 9dc88def35
71 changed files with 533 additions and 534 deletions
+8 -8
View File
@@ -50,9 +50,9 @@ namespace MMAP
~MMapData()
{
for (NavMeshQuerySet::iterator i = navMeshQueries.begin(); i != navMeshQueries.end(); ++i)
for (auto& navMeshQuerie : navMeshQueries)
{
dtFreeNavMeshQuery(i->second);
dtFreeNavMeshQuery(navMeshQuerie.second);
}
if (navMesh)
@@ -74,7 +74,7 @@ namespace MMAP
class MMapMgr
{
public:
MMapMgr() : loadedTiles(0), thread_safe_environment(true) { }
MMapMgr() = default;
~MMapMgr();
void InitializeThreadUnsafe(const std::vector<uint32>& mapIds);
@@ -87,17 +87,17 @@ namespace MMAP
dtNavMeshQuery const* GetNavMeshQuery(uint32 mapId, uint32 instanceId);
dtNavMesh const* GetNavMesh(uint32 mapId);
uint32 getLoadedTilesCount() const { return loadedTiles; }
uint32 getLoadedMapsCount() const { return loadedMMaps.size(); }
[[nodiscard]] uint32 getLoadedTilesCount() const { return loadedTiles; }
[[nodiscard]] uint32 getLoadedMapsCount() const { return loadedMMaps.size(); }
private:
bool loadMapData(uint32 mapId);
uint32 packTileID(int32 x, int32 y);
MMapDataSet::const_iterator GetMMapData(uint32 mapId) const;
[[nodiscard]] MMapDataSet::const_iterator GetMMapData(uint32 mapId) const;
MMapDataSet loadedMMaps;
uint32 loadedTiles;
bool thread_safe_environment;
uint32 loadedTiles{0};
bool thread_safe_environment{true};
};
}
+12 -12
View File
@@ -39,18 +39,18 @@ class GameObjectModelOwnerBase
public:
virtual ~GameObjectModelOwnerBase() = default;
virtual bool IsSpawned() const = 0;
virtual uint32 GetDisplayId() const = 0;
virtual uint32 GetPhaseMask() const = 0;
virtual G3D::Vector3 GetPosition() const = 0;
virtual float GetOrientation() const = 0;
virtual float GetScale() const = 0;
[[nodiscard]] virtual bool IsSpawned() const = 0;
[[nodiscard]] virtual uint32 GetDisplayId() const = 0;
[[nodiscard]] virtual uint32 GetPhaseMask() const = 0;
[[nodiscard]] virtual G3D::Vector3 GetPosition() const = 0;
[[nodiscard]] virtual float GetOrientation() const = 0;
[[nodiscard]] virtual float GetScale() const = 0;
virtual void DebugVisualizeCorner(G3D::Vector3 const& /*corner*/) const = 0;
};
class GameObjectModel
{
GameObjectModel() : phasemask(0), iInvScale(0), iScale(0), iModel(nullptr), isWmo(false) { }
GameObjectModel() = default;
public:
std::string name;
@@ -80,15 +80,15 @@ public:
private:
bool initialize(std::unique_ptr<GameObjectModelOwnerBase> modelOwner, std::string const& dataPath);
uint32 phasemask;
uint32 phasemask{0};
G3D::AABox iBound;
G3D::Matrix3 iInvRot;
G3D::Vector3 iPos;
float iInvScale;
float iScale;
VMAP::WorldModel* iModel;
float iInvScale{0};
float iScale{0};
VMAP::WorldModel* iModel{nullptr};
std::unique_ptr<GameObjectModelOwnerBase> owner;
bool isWmo;
bool isWmo{false};
};
void LoadGameObjectModelList(std::string const& dataPath);