nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-17 10:55:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Collision): update some methods to UpperCamelCase (#6486)

Browse Source
This commit is contained in:
Kitzunu
2021-06-27 16:37:22 +02:00
committed by GitHub
parent a2a01e19d1
commit b84f9b8a4b
18 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/Collision/Models/GameObjectModel.h
View File

@@ -42,11 +42,11 @@ class GameObjectModel
public:
std::string name;
[[nodiscard]] const G3D::AABox& getBounds() const { return iBound; }
[[nodiscard]] const G3D::AABox& GetBounds() const { return iBound; }
~GameObjectModel();
[[nodiscard]] const G3D::Vector3& getPosition() const { return iPos; }
[[nodiscard]] const G3D::Vector3& GetPosition() const { return iPos; }
/** Enables\disables collision. */
void disable() { phasemask = 0; }

2
src/common/Collision/Models/ModelInstance.h
View File

@@ -41,7 +41,7 @@ namespace VMAP
bool operator==(const ModelSpawn& other) const { return ID == other.ID; }
//uint32 hashCode() const { return ID; }
// temp?
[[nodiscard]] const G3D::AABox& getBounds() const { return iBound; }
[[nodiscard]] const G3D::AABox& GetBounds() const { return iBound; }
static bool readFromFile(FILE* rf, ModelSpawn& spawn);
static bool writeToFile(FILE* rw, const ModelSpawn& spawn);

10
src/common/Collision/Models/WorldModel.cpp
View File

@@ -14,7 +14,7 @@ using G3D::Ray;
template<> struct BoundsTrait<VMAP::GroupModel>
{
static void getBounds(const VMAP::GroupModel& obj, G3D::AABox& out) { out = obj.GetBound(); }
static void GetBounds(const VMAP::GroupModel& obj, G3D::AABox& out) { out = obj.GetBound(); }
};
namespace VMAP
@@ -257,7 +257,7 @@ namespace VMAP
return result;
}
void WmoLiquid::getPosInfo(uint32& tilesX, uint32& tilesY, G3D::Vector3& corner) const
void WmoLiquid::GetPosInfo(uint32& tilesX, uint32& tilesY, G3D::Vector3& corner) const
{
tilesX = iTilesX;
tilesY = iTilesY;
@@ -442,7 +442,7 @@ namespace VMAP
return 0;
}
void GroupModel::getMeshData(std::vector<G3D::Vector3>& outVertices, std::vector<MeshTriangle>& outTriangles, WmoLiquid*& liquid)
void GroupModel::GetMeshData(std::vector<G3D::Vector3>& outVertices, std::vector<MeshTriangle>& outTriangles, WmoLiquid*& liquid)
{
outVertices = vertices;
outTriangles = triangles;
@@ -454,7 +454,7 @@ namespace VMAP
void WorldModel::setGroupModels(std::vector<GroupModel>& models)
{
groupModels.swap(models);
groupTree.build(groupModels, BoundsTrait<GroupModel>::getBounds, 1);
groupTree.build(groupModels, BoundsTrait<GroupModel>::GetBounds, 1);
}
struct WModelRayCallBack
@@ -638,7 +638,7 @@ namespace VMAP
return result;
}
void WorldModel::getGroupModels(std::vector<GroupModel>& outGroupModels)
void WorldModel::GetGroupModels(std::vector<GroupModel>& outGroupModels)
{
outGroupModels = groupModels;
}

6
src/common/Collision/Models/WorldModel.h
View File

@@ -45,7 +45,7 @@ namespace VMAP
uint32 GetFileSize();
bool writeToFile(FILE* wf);
static bool readFromFile(FILE* rf, WmoLiquid*& liquid);
void getPosInfo(uint32& tilesX, uint32& tilesY, G3D::Vector3& corner) const;
void GetPosInfo(uint32& tilesX, uint32& tilesY, G3D::Vector3& corner) const;
private:
WmoLiquid() { }
uint32 iTilesX{0}; //!< number of tiles in x direction, each
@@ -78,7 +78,7 @@ namespace VMAP
[[nodiscard]] const G3D::AABox& GetBound() const { return iBound; }
[[nodiscard]] uint32 GetMogpFlags() const { return iMogpFlags; }
[[nodiscard]] uint32 GetWmoID() const { return iGroupWMOID; }
void getMeshData(std::vector<G3D::Vector3>& outVertices, std::vector<MeshTriangle>& outTriangles, WmoLiquid*& liquid);
void GetMeshData(std::vector<G3D::Vector3>& outVertices, std::vector<MeshTriangle>& outTriangles, WmoLiquid*& liquid);
protected:
G3D::AABox iBound;
uint32 iMogpFlags{0};// 0x8 outdor; 0x2000 indoor
@@ -102,7 +102,7 @@ namespace VMAP
bool GetLocationInfo(const G3D::Vector3& p, const G3D::Vector3& down, float& dist, LocationInfo& info) const;
bool writeFile(const std::string& filename);
bool readFile(const std::string& filename);
void getGroupModels(std::vector<GroupModel>& outGroupModels);
void GetGroupModels(std::vector<GroupModel>& outGroupModels);
protected:
uint32 RootWMOID{0};
std::vector<GroupModel> groupModels;