mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 08:09:46 +00:00
Code Issues Releases Wiki Activity

Remove unnecessary relation between updateCompoundObject and RecastMeshObject

Browse source
This commit is contained in:
elsid 2021-04-18 17:31:21 +02:00
parent 629cedb6d0
commit 64fb700ae9
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
components/detournavigator/recastmeshobject.cpp
View file

@ -8,6 +8,22 @@
namespace DetourNavigator namespace DetourNavigator
{ {
namespace
{
bool updateCompoundObject(const btCompoundShape& shape, const AreaType areaType,
std::vector<RecastMeshObject>& children)
{
assert(static_cast<std::size_t>(shape.getNumChildShapes()) == children.size());
bool result = false;
for (int i = 0, num = shape.getNumChildShapes(); i < num; ++i)
{
assert(shape.getChildShape(i) == std::addressof(children[static_cast<std::size_t>(i)].getShape()));
result = children[static_cast<std::size_t>(i)].update(shape.getChildTransform(i), areaType) || result;
}
return result;
}
}
RecastMeshObject::RecastMeshObject(const btCollisionShape& shape, const btTransform& transform, RecastMeshObject::RecastMeshObject(const btCollisionShape& shape, const btTransform& transform,
const AreaType areaType) const AreaType areaType)
: mShape(shape) : mShape(shape)
@ -42,19 +58,6 @@ namespace DetourNavigator
return result; return result;
} }
bool RecastMeshObject::updateCompoundObject(const btCompoundShape& shape,
const AreaType areaType, std::vector<RecastMeshObject>& children)
{
assert(static_cast<std::size_t>(shape.getNumChildShapes()) == children.size());
bool result = false;
for (int i = 0, num = shape.getNumChildShapes(); i < num; ++i)
{
assert(shape.getChildShape(i) == std::addressof(children[static_cast<std::size_t>(i)].mShape.get()));
result = children[static_cast<std::size_t>(i)].update(shape.getChildTransform(i), areaType) || result;
}
return result;
}
std::vector<RecastMeshObject> makeChildrenObjects(const btCollisionShape& shape, const AreaType areaType) std::vector<RecastMeshObject> makeChildrenObjects(const btCollisionShape& shape, const AreaType areaType)
{ {
if (shape.isCompound()) if (shape.isCompound())

3
components/detournavigator/recastmeshobject.hpp
View file

@ -41,9 +41,6 @@ namespace DetourNavigator
AreaType mAreaType; AreaType mAreaType;
btVector3 mLocalScaling; btVector3 mLocalScaling;
std::vector<RecastMeshObject> mChildren; std::vector<RecastMeshObject> mChildren;
static bool updateCompoundObject(const btCompoundShape& shape, const AreaType areaType,
std::vector<RecastMeshObject>& children);
}; };
std::vector<RecastMeshObject> makeChildrenObjects(const btCollisionShape& shape, const AreaType areaType); std::vector<RecastMeshObject> makeChildrenObjects(const btCollisionShape& shape, const AreaType areaType);