Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-18 15:17:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not have additional compoundMeshes variable in computeShapeInfo

Browse source
This commit is contained in:
sabrina-shanman 2018-10-08 11:46:46 -07:00
parent e15a41c839
commit 57f67ffe91
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -514,15 +514,16 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
return;
}
std::vector<std::shared_ptr<const graphics::Mesh>> compoundMeshes;
std::vector<std::shared_ptr<const graphics::Mesh>> meshes;
if (type == SHAPE_TYPE_SIMPLE_COMPOUND) {
auto& fbxMeshes = _compoundShapeResource->getFBXGeometry().meshes;
compoundMeshes.reserve(fbxMeshes.size());
meshes.reserve(fbxMeshes.size());
for (auto& fbxMesh : fbxMeshes) {
compoundMeshes.push_back(fbxMesh._mesh);
meshes.push_back(fbxMesh._mesh);
}
} else {
meshes = model->getGeometry()->getMeshes();
}
auto& meshes = (type == SHAPE_TYPE_SIMPLE_COMPOUND ? compoundMeshes : model->getGeometry()->getMeshes());
int32_t numMeshes = (int32_t)(meshes.size());
const int MAX_ALLOWED_MESH_COUNT = 1000;