diff --git a/src/common/Collision/BoundingIntervalHierarchy.h b/src/common/Collision/BoundingIntervalHierarchy.h index f69493af3..50e40e8ba 100644 --- a/src/common/Collision/BoundingIntervalHierarchy.h +++ b/src/common/Collision/BoundingIntervalHierarchy.h @@ -66,7 +66,7 @@ private: public: BIH() { init_empty(); } template< class BoundsFunc, class PrimArray > - void build(const PrimArray& primitives, BoundsFunc& getBounds, uint32 leafSize = 3, bool printStats = false) + void build(const PrimArray& primitives, BoundsFunc& GetBounds, uint32 leafSize = 3, bool printStats = false) { if (primitives.size() == 0) { @@ -79,11 +79,11 @@ public: dat.numPrims = primitives.size(); dat.indices = new uint32[dat.numPrims]; dat.primBound = new G3D::AABox[dat.numPrims]; - getBounds(primitives[0], bounds); + GetBounds(primitives[0], bounds); for (uint32 i = 0; i < dat.numPrims; ++i) { dat.indices[i] = i; - getBounds(primitives[i], dat.primBound[i]); + GetBounds(primitives[i], dat.primBound[i]); bounds.merge(dat.primBound[i]); } std::vector tempTree; diff --git a/src/common/Collision/BoundingIntervalHierarchyWrapper.h b/src/common/Collision/BoundingIntervalHierarchyWrapper.h index ddc6ebda2..1c98ca023 100644 --- a/src/common/Collision/BoundingIntervalHierarchyWrapper.h +++ b/src/common/Collision/BoundingIntervalHierarchyWrapper.h @@ -97,7 +97,7 @@ public: m_objects_to_push.getMembers(m_objects); //assert that m_obj2Idx has all the keys - m_tree.build(m_objects, BoundsFunc::getBounds2); + m_tree.build(m_objects, BoundsFunc::GetBounds2); } template diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp index dfbecd69a..aedf3e746 100644 --- a/src/common/Collision/DynamicTree.cpp +++ b/src/common/Collision/DynamicTree.cpp @@ -29,13 +29,13 @@ template<> struct HashTrait< GameObjectModel> template<> struct PositionTrait< GameObjectModel> { - static void getPosition(const GameObjectModel& g, G3D::Vector3& p) { p = g.getPosition(); } + static void GetPosition(const GameObjectModel& g, G3D::Vector3& p) { p = g.GetPosition(); } }; template<> struct BoundsTrait< GameObjectModel> { - static void getBounds(const GameObjectModel& g, G3D::AABox& out) { out = g.getBounds();} - static void getBounds2(const GameObjectModel* g, G3D::AABox& out) { out = g->getBounds();} + static void GetBounds(const GameObjectModel& g, G3D::AABox& out) { out = g.GetBounds();} + static void GetBounds2(const GameObjectModel* g, G3D::AABox& out) { out = g->GetBounds();} }; typedef RegularGrid2D> ParentTree; @@ -145,7 +145,7 @@ struct DynamicTreeIntersectionCallback bool didHit() const { return did_hit;} }; -bool DynamicMapTree::getIntersectionTime(const uint32 phasemask, const G3D::Ray& ray, +bool DynamicMapTree::GetIntersectionTime(const uint32 phasemask, const G3D::Ray& ray, const G3D::Vector3& endPos, float& maxDist) const { float distance = maxDist; @@ -158,7 +158,7 @@ bool DynamicMapTree::getIntersectionTime(const uint32 phasemask, const G3D::Ray& return callback.didHit(); } -bool DynamicMapTree::getObjectHitPos(const uint32 phasemask, const G3D::Vector3& startPos, +bool DynamicMapTree::GetObjectHitPos(const uint32 phasemask, const G3D::Vector3& startPos, const G3D::Vector3& endPos, G3D::Vector3& resultHit, float modifyDist) const { @@ -175,7 +175,7 @@ bool DynamicMapTree::getObjectHitPos(const uint32 phasemask, const G3D::Vector3& G3D::Vector3 dir = (endPos - startPos) / maxDist; // direction with length of 1 G3D::Ray ray(startPos, dir); float dist = maxDist; - if (getIntersectionTime(phasemask, ray, endPos, dist)) + if (GetIntersectionTime(phasemask, ray, endPos, dist)) { resultHit = startPos + dir * dist; if (modifyDist < 0) diff --git a/src/common/Collision/DynamicTree.h b/src/common/Collision/DynamicTree.h index 92b9c056d..ae59e696f 100644 --- a/src/common/Collision/DynamicTree.h +++ b/src/common/Collision/DynamicTree.h @@ -29,10 +29,10 @@ public: [[nodiscard]] bool isInLineOfSight(float x1, float y1, float z1, float x2, float y2, float z2, uint32 phasemask) const; - bool getIntersectionTime(uint32 phasemask, const G3D::Ray& ray, + bool GetIntersectionTime(uint32 phasemask, const G3D::Ray& ray, const G3D::Vector3& endPos, float& maxDist) const; - bool getObjectHitPos(uint32 phasemask, const G3D::Vector3& pPos1, + bool GetObjectHitPos(uint32 phasemask, const G3D::Vector3& pPos1, const G3D::Vector3& pPos2, G3D::Vector3& pResultHitPos, float pModifyDist) const; diff --git a/src/common/Collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h index dc5429462..bc54eeb3e 100644 --- a/src/common/Collision/Management/IVMapManager.h +++ b/src/common/Collision/Management/IVMapManager.h @@ -53,7 +53,7 @@ namespace VMAP test if we hit an object. return true if we hit one. rx, ry, rz will hold the hit position or the dest position, if no intersection was found return a position, that is pReduceDist closer to the origin */ - virtual bool getObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float pModifyDist) = 0; + virtual bool GetObjectHitPos(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float pModifyDist) = 0; /** send debug commands */ @@ -79,7 +79,7 @@ namespace VMAP Query world model area info. \param z gets adjusted to the ground height for which this are info is valid */ - virtual bool getAreaInfo(unsigned int pMapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const = 0; + virtual bool GetAreaInfo(unsigned int pMapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const = 0; virtual bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 ReqLiquidType, float& level, float& floor, uint32& type) const = 0; }; } diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp index 11cb1278e..2794a8c40 100644 --- a/src/common/Collision/Management/VMapManager2.cpp +++ b/src/common/Collision/Management/VMapManager2.cpp @@ -200,7 +200,7 @@ namespace VMAP get the hit position and return true if we hit something otherwise the result pos will be the dest pos */ - bool VMapManager2::getObjectHitPos(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist) + bool VMapManager2::GetObjectHitPos(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist) { #if defined(ENABLE_VMAP_CHECKS) if (isLineOfSightCalcEnabled() && !IsVMAPDisabledForPtr(mapId, VMAP_DISABLE_LOS)) @@ -212,7 +212,7 @@ namespace VMAP Vector3 pos1 = convertPositionToInternalRep(x1, y1, z1); Vector3 pos2 = convertPositionToInternalRep(x2, y2, z2); Vector3 resultPos; - bool result = instanceTree->second->getObjectHitPos(pos1, pos2, resultPos, modifyDist); + bool result = instanceTree->second->GetObjectHitPos(pos1, pos2, resultPos, modifyDist); resultPos = convertPositionToInternalRep(resultPos.x, resultPos.y, resultPos.z); rx = resultPos.x; ry = resultPos.y; @@ -255,7 +255,7 @@ namespace VMAP return VMAP_INVALID_HEIGHT_VALUE; } - bool VMapManager2::getAreaInfo(unsigned int mapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const + bool VMapManager2::GetAreaInfo(unsigned int mapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const { #if defined(ENABLE_VMAP_CHECKS) if (!IsVMAPDisabledForPtr(mapId, VMAP_DISABLE_AREAFLAG)) @@ -265,7 +265,7 @@ namespace VMAP if (instanceTree != iInstanceMapTrees.end()) { Vector3 pos = convertPositionToInternalRep(x, y, z); - bool result = instanceTree->second->getAreaInfo(pos, flags, adtId, rootId, groupId); + bool result = instanceTree->second->GetAreaInfo(pos, flags, adtId, rootId, groupId); // z is not touched by convertPositionToInternalRep(), so just copy z = pos.z; return result; @@ -353,7 +353,7 @@ namespace VMAP return StaticMapTree::CanLoadMap(std::string(basePath), mapId, x, y); } - void VMapManager2::getInstanceMapTree(InstanceTreeMap& instanceMapTree) + void VMapManager2::GetInstanceMapTree(InstanceTreeMap& instanceMapTree) { instanceMapTree = iInstanceMapTrees; } diff --git a/src/common/Collision/Management/VMapManager2.h b/src/common/Collision/Management/VMapManager2.h index 51df3c20f..a31526ef9 100644 --- a/src/common/Collision/Management/VMapManager2.h +++ b/src/common/Collision/Management/VMapManager2.h @@ -112,12 +112,12 @@ namespace VMAP /** fill the hit pos and return true, if an object was hit */ - bool getObjectHitPos(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist) override; + bool GetObjectHitPos(unsigned int mapId, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist) override; float getHeight(unsigned int mapId, float x, float y, float z, float maxSearchDist) override; bool processCommand(char* /*command*/) override { return false; } // for debug and extensions - bool getAreaInfo(unsigned int pMapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const override; + bool GetAreaInfo(unsigned int pMapId, float x, float y, float& z, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const override; bool GetLiquidLevel(uint32 pMapId, float x, float y, float z, uint8 reqLiquidType, float& level, float& floor, uint32& type) const override; WorldModel* acquireModelInstance(const std::string& basepath, const std::string& filename); @@ -129,7 +129,7 @@ namespace VMAP return getMapFileName(mapId); } bool existsMap(const char* basePath, unsigned int mapId, int x, int y) override; - void getInstanceMapTree(InstanceTreeMap& instanceMapTree); + void GetInstanceMapTree(InstanceTreeMap& instanceMapTree); typedef uint32(*GetLiquidFlagsFn)(uint32 liquidType); GetLiquidFlagsFn GetLiquidFlagsPtr; diff --git a/src/common/Collision/Maps/MapTree.cpp b/src/common/Collision/Maps/MapTree.cpp index a390accbd..62aef13ee 100644 --- a/src/common/Collision/Maps/MapTree.cpp +++ b/src/common/Collision/Maps/MapTree.cpp @@ -86,7 +86,7 @@ namespace VMAP return tilefilename.str(); } - bool StaticMapTree::getAreaInfo(Vector3& pos, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const + bool StaticMapTree::GetAreaInfo(Vector3& pos, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const { AreaInfoCallback intersectionCallBack(iTreeValues); iTree.intersectPoint(pos, intersectionCallBack); @@ -131,7 +131,7 @@ namespace VMAP Else, pMaxDist is not modified and returns false; */ - bool StaticMapTree::getIntersectionTime(const G3D::Ray& pRay, float& pMaxDist, bool StopAtFirstHit) const + bool StaticMapTree::GetIntersectionTime(const G3D::Ray& pRay, float& pMaxDist, bool StopAtFirstHit) const { float distance = pMaxDist; MapRayCallback intersectionCallBack(iTreeValues); @@ -162,8 +162,10 @@ namespace VMAP } // direction with length of 1 G3D::Ray ray = G3D::Ray::fromOriginAndDirection(pos1, (pos2 - pos1) / maxDist); - if (getIntersectionTime(ray, maxDist, true)) + + if (GetIntersectionTime(ray, maxDist, true)) { + return false; } @@ -175,7 +177,7 @@ namespace VMAP Return the hit pos or the original dest pos */ - bool StaticMapTree::getObjectHitPos(const Vector3& pPos1, const Vector3& pPos2, Vector3& pResultHitPos, float pModifyDist) const + bool StaticMapTree::GetObjectHitPos(const Vector3& pPos1, const Vector3& pPos2, Vector3& pResultHitPos, float pModifyDist) const { bool result = false; float maxDist = (pPos2 - pPos1).magnitude(); @@ -190,7 +192,7 @@ namespace VMAP Vector3 dir = (pPos2 - pPos1) / maxDist; // direction with length of 1 G3D::Ray ray(pPos1, dir); float dist = maxDist; - if (getIntersectionTime(ray, dist, false)) + if (GetIntersectionTime(ray, dist, false)) { pResultHitPos = pPos1 + dir * dist; if (pModifyDist < 0) @@ -226,7 +228,7 @@ namespace VMAP Vector3 dir = Vector3(0, 0, -1); G3D::Ray ray(pPos, dir); // direction with length of 1 float maxDist = maxSearchDist; - if (getIntersectionTime(ray, maxDist, false)) + if (GetIntersectionTime(ray, maxDist, false)) { height = pPos.z - maxDist; } @@ -507,7 +509,7 @@ namespace VMAP iLoadedTiles.erase(tile); } - void StaticMapTree::getModelInstances(ModelInstance*& models, uint32& count) + void StaticMapTree::GetModelInstances(ModelInstance*& models, uint32& count) { models = iTreeValues; count = iNTreeValues; diff --git a/src/common/Collision/Maps/MapTree.h b/src/common/Collision/Maps/MapTree.h index 37f639d4f..c910f3abc 100644 --- a/src/common/Collision/Maps/MapTree.h +++ b/src/common/Collision/Maps/MapTree.h @@ -45,7 +45,7 @@ namespace VMAP std::string iBasePath; private: - bool getIntersectionTime(const G3D::Ray& pRay, float& pMaxDist, bool StopAtFirstHit) const; + bool GetIntersectionTime(const G3D::Ray& pRay, float& pMaxDist, bool StopAtFirstHit) const; //bool containsLoadedMapTile(unsigned int pTileIdent) const { return(iLoadedMapTiles.containsKey(pTileIdent)); } public: static std::string getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY); @@ -57,9 +57,9 @@ namespace VMAP ~StaticMapTree(); [[nodiscard]] bool isInLineOfSight(const G3D::Vector3& pos1, const G3D::Vector3& pos2) const; - bool getObjectHitPos(const G3D::Vector3& pos1, const G3D::Vector3& pos2, G3D::Vector3& pResultHitPos, float pModifyDist) const; + bool GetObjectHitPos(const G3D::Vector3& pos1, const G3D::Vector3& pos2, G3D::Vector3& pResultHitPos, float pModifyDist) const; [[nodiscard]] float getHeight(const G3D::Vector3& pPos, float maxSearchDist) const; - bool getAreaInfo(G3D::Vector3& pos, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const; + bool GetAreaInfo(G3D::Vector3& pos, uint32& flags, int32& adtId, int32& rootId, int32& groupId) const; bool GetLocationInfo(const G3D::Vector3& pos, LocationInfo& info) const; bool InitMap(const std::string& fname, VMapManager2* vm); @@ -68,7 +68,7 @@ namespace VMAP void UnloadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm); [[nodiscard]] bool isTiled() const { return iIsTiled; } [[nodiscard]] uint32 numLoadedTiles() const { return iLoadedTiles.size(); } - void getModelInstances(ModelInstance*& models, uint32& count); + void GetModelInstances(ModelInstance*& models, uint32& count); }; struct AreaInfo diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index 361a06e85..97502a0f0 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -20,7 +20,7 @@ using std::pair; template<> struct BoundsTrait { - static void getBounds(const VMAP::ModelSpawn* const& obj, G3D::AABox& out) { out = obj->getBounds(); } + static void GetBounds(const VMAP::ModelSpawn* const& obj, G3D::AABox& out) { out = obj->GetBounds(); } }; namespace VMAP @@ -92,7 +92,7 @@ namespace VMAP try { - pTree.build(mapSpawns, BoundsTrait::getBounds); + pTree.build(mapSpawns, BoundsTrait::GetBounds); } catch (std::exception& e) { diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h index e17ac44e0..7378dfbae 100644 --- a/src/common/Collision/Models/GameObjectModel.h +++ b/src/common/Collision/Models/GameObjectModel.h @@ -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; } diff --git a/src/common/Collision/Models/ModelInstance.h b/src/common/Collision/Models/ModelInstance.h index bfe7328a0..35583ec87 100644 --- a/src/common/Collision/Models/ModelInstance.h +++ b/src/common/Collision/Models/ModelInstance.h @@ -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); diff --git a/src/common/Collision/Models/WorldModel.cpp b/src/common/Collision/Models/WorldModel.cpp index 29d927ab2..c7e0e0fc4 100644 --- a/src/common/Collision/Models/WorldModel.cpp +++ b/src/common/Collision/Models/WorldModel.cpp @@ -14,7 +14,7 @@ using G3D::Ray; template<> struct BoundsTrait { - 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& outVertices, std::vector& outTriangles, WmoLiquid*& liquid) + void GroupModel::GetMeshData(std::vector& outVertices, std::vector& outTriangles, WmoLiquid*& liquid) { outVertices = vertices; outTriangles = triangles; @@ -454,7 +454,7 @@ namespace VMAP void WorldModel::setGroupModels(std::vector& models) { groupModels.swap(models); - groupTree.build(groupModels, BoundsTrait::getBounds, 1); + groupTree.build(groupModels, BoundsTrait::GetBounds, 1); } struct WModelRayCallBack @@ -638,7 +638,7 @@ namespace VMAP return result; } - void WorldModel::getGroupModels(std::vector& outGroupModels) + void WorldModel::GetGroupModels(std::vector& outGroupModels) { outGroupModels = groupModels; } diff --git a/src/common/Collision/Models/WorldModel.h b/src/common/Collision/Models/WorldModel.h index 6f23647b5..b65be64da 100644 --- a/src/common/Collision/Models/WorldModel.h +++ b/src/common/Collision/Models/WorldModel.h @@ -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& outVertices, std::vector& outTriangles, WmoLiquid*& liquid); + void GetMeshData(std::vector& outVertices, std::vector& 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& outGroupModels); + void GetGroupModels(std::vector& outGroupModels); protected: uint32 RootWMOID{0}; std::vector groupModels; diff --git a/src/common/Collision/RegularGrid.h b/src/common/Collision/RegularGrid.h index 688be035f..13a8130be 100644 --- a/src/common/Collision/RegularGrid.h +++ b/src/common/Collision/RegularGrid.h @@ -74,10 +74,10 @@ public: void insert(const T& value) { G3D::Vector3 pos[9]; - pos[0] = value.getBounds().corner(0); - pos[1] = value.getBounds().corner(1); - pos[2] = value.getBounds().corner(2); - pos[3] = value.getBounds().corner(3); + pos[0] = value.GetBounds().corner(0); + pos[1] = value.GetBounds().corner(1); + pos[2] = value.GetBounds().corner(2); + pos[3] = value.GetBounds().corner(3); pos[4] = (pos[0] + pos[1]) / 2.0f; pos[5] = (pos[1] + pos[2]) / 2.0f; pos[6] = (pos[2] + pos[3]) / 2.0f; diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 6041c9c8a..416718411 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2076,7 +2076,7 @@ bool Map::GetAreaInfo(float x, float y, float z, uint32& flags, int32& adtId, in { float vmap_z = z; VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager(); - if (vmgr->getAreaInfo(GetId(), x, y, vmap_z, flags, adtId, rootId, groupId)) + if (vmgr->GetAreaInfo(GetId(), x, y, vmap_z, flags, adtId, rootId, groupId)) { // check if there's terrain between player height and object height if (GridMap* gmap = const_cast(this)->GetGrid(x, y)) @@ -2265,13 +2265,13 @@ bool Map::isInLineOfSight(float x1, float y1, float z1, float x2, float y2, floa return true; } -bool Map::getObjectHitPos(uint32 phasemask, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist) +bool Map::GetObjectHitPos(uint32 phasemask, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist) { G3D::Vector3 startPos(x1, y1, z1); G3D::Vector3 dstPos(x2, y2, z2); G3D::Vector3 resultPos; - bool result = _dynamicTree.getObjectHitPos(phasemask, startPos, dstPos, resultPos, modifyDist); + bool result = _dynamicTree.GetObjectHitPos(phasemask, startPos, dstPos, resultPos, modifyDist); rx = resultPos.x; ry = resultPos.y; @@ -3701,7 +3701,7 @@ bool Map::CheckCollisionAndGetValidCoords(const WorldObject* source, float start // Unit is not on the ground, check for potential collision via vmaps if (notOnGround) { - bool col = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(source->GetMapId(), + bool col = VMAP::VMapFactory::createOrGetVMapManager()->GetObjectHitPos(source->GetMapId(), startX, startY, startZ + halfHeight, destX, destY, destZ + halfHeight, destX, destY, destZ, -CONTACT_DISTANCE); @@ -3716,7 +3716,7 @@ bool Map::CheckCollisionAndGetValidCoords(const WorldObject* source, float start } // check dynamic collision - bool col = source->GetMap()->getObjectHitPos(source->GetPhaseMask(), + bool col = source->GetMap()->GetObjectHitPos(source->GetPhaseMask(), startX, startY, startZ + halfHeight, destX, destY, destZ + halfHeight, destX, destY, destZ, -CONTACT_DISTANCE); diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index 0de8325bf..4efcb8deb 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -499,7 +499,7 @@ public: void InsertGameObjectModel(const GameObjectModel& model) { _dynamicTree.insert(model); } [[nodiscard]] bool ContainsGameObjectModel(const GameObjectModel& model) const { return _dynamicTree.contains(model);} [[nodiscard]] DynamicMapTree const& GetDynamicMapTree() const { return _dynamicTree; } - bool getObjectHitPos(uint32 phasemask, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist); + bool GetObjectHitPos(uint32 phasemask, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float& ry, float& rz, float modifyDist); [[nodiscard]] float GetGameObjectFloor(uint32 phasemask, float x, float y, float z, float maxSearchDist = DEFAULT_HEIGHT_SEARCH) const { return _dynamicTree.getHeight(x, y, z, maxSearchDist, phasemask); diff --git a/src/tools/mmaps_generator/TerrainBuilder.cpp b/src/tools/mmaps_generator/TerrainBuilder.cpp index aaf33f675..df3b89080 100644 --- a/src/tools/mmaps_generator/TerrainBuilder.cpp +++ b/src/tools/mmaps_generator/TerrainBuilder.cpp @@ -646,14 +646,14 @@ namespace MMAP break; InstanceTreeMap instanceTrees; - ((VMapManager2*)vmapManager)->getInstanceMapTree(instanceTrees); + ((VMapManager2*)vmapManager)->GetInstanceMapTree(instanceTrees); if (!instanceTrees[mapID]) break; ModelInstance* models = nullptr; uint32 count = 0; - instanceTrees[mapID]->getModelInstances(models, count); + instanceTrees[mapID]->GetModelInstances(models, count); if (!models) break; @@ -671,7 +671,7 @@ namespace MMAP retval = true; std::vector groupModels; - worldModel->getGroupModels(groupModels); + worldModel->GetGroupModels(groupModels); // all M2s need to have triangle indices reversed bool isM2 = instance.name.find(".m2") != std::string::npos || instance.name.find(".M2") != std::string::npos; @@ -690,7 +690,7 @@ namespace MMAP std::vector tempTriangles; WmoLiquid* liquid = nullptr; - groupModel.getMeshData(tempVertices, tempTriangles, liquid); + groupModel.GetMeshData(tempVertices, tempTriangles, liquid); // first handle collision mesh transform(tempVertices, transformedVertices, scale, rotation, position); @@ -707,7 +707,7 @@ namespace MMAP std::vector liqTris; uint32 tilesX, tilesY, vertsX, vertsY; G3D::Vector3 corner; - liquid->getPosInfo(tilesX, tilesY, corner); + liquid->GetPosInfo(tilesX, tilesY, corner); vertsX = tilesX + 1; vertsY = tilesY + 1; uint8* flags = liquid->GetFlagsStorage();