Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tools/vmap_extractor: Move information about model type from spawns in vmap tiles to model file itself

Browse Source
This commit is contained in:
Shauren
2024-03-06 00:04:19 +01:00
parent 382e76f02d
commit a70e758ba5
16 changed files with 94 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/Collision/Models/GameObjectModel.cpp
View File

@@ -32,12 +32,11 @@ using G3D::AABox;
struct GameobjectModelData
{
GameobjectModelData(char const* name_, uint32 nameLength, Vector3 const& lowBound, Vector3 const& highBound, bool isWmo_) :
bound(lowBound, highBound), name(name_, nameLength), isWmo(isWmo_) { }
GameobjectModelData(char const* name_, uint32 nameLength, Vector3 const& lowBound, Vector3 const& highBound) :
bound(lowBound, highBound), name(name_, nameLength) { }
AABox bound;
std::string name;
bool isWmo;
};
typedef std::unordered_map<uint32, GameobjectModelData> ModelList;
@@ -63,7 +62,6 @@ bool LoadGameObjectModelList(std::string const& dataPath)
}
uint32 name_length, displayId;
uint8 isWmo;
char buff[500];
while (true)
{
@@ -72,8 +70,7 @@ bool LoadGameObjectModelList(std::string const& dataPath)
if (feof(model_list_file.get())) // EOF flag is only set after failed reading attempt
break;
if (fread(&isWmo, sizeof(uint8), 1, model_list_file.get()) != 1
|| fread(&name_length, sizeof(uint32), 1, model_list_file.get()) != 1
if (fread(&name_length, sizeof(uint32), 1, model_list_file.get()) != 1
|| name_length >= sizeof(buff)
|| fread(&buff, sizeof(char), name_length, model_list_file.get()) != name_length
|| fread(&v1, sizeof(Vector3), 1, model_list_file.get()) != 1
@@ -89,7 +86,7 @@ bool LoadGameObjectModelList(std::string const& dataPath)
continue;
}
model_list.emplace(std::piecewise_construct, std::forward_as_tuple(displayId), std::forward_as_tuple(&buff[0], name_length, v1, v2, isWmo != 0));
model_list.emplace(std::piecewise_construct, std::forward_as_tuple(displayId), std::forward_as_tuple(&buff[0], name_length, v1, v2));
}
TC_LOG_INFO("server.loading", ">> Loaded {} GameObject models in {} ms", uint32(model_list.size()), GetMSTimeDiffToNow(oldMSTime));
@@ -144,7 +141,6 @@ bool GameObjectModel::initialize(std::unique_ptr<GameObjectModelOwnerBase> model
#endif
owner = std::move(modelOwner);
isWmo = it->second.isWmo;
return true;
}
@@ -160,6 +156,11 @@ GameObjectModel* GameObjectModel::Create(std::unique_ptr<GameObjectModelOwnerBas
return mdl;
}
bool GameObjectModel::isMapObject() const
{
return !iModel->IsM2();
}
bool GameObjectModel::intersectRay(G3D::Ray const& ray, float& maxDist, bool stopAtFirstHit, PhaseShift const& phaseShift, VMAP::ModelIgnoreFlags ignoreFlags) const
{
if (!isCollisionEnabled() || !owner->IsSpawned())