mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 06:09:42 +00:00
Code Issues Releases Wiki Activity

Copy only required RecastMeshObject fields

Browse source
This commit is contained in:
elsid 2021-08-04 18:35:25 +02:00
parent c91ef34a70
commit 41b02ff1aa
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
components/detournavigator/recastmeshmanager.cpp
View file

@ -123,7 +123,13 @@ namespace DetourNavigator
tileBounds.mMin /= mSettings.mRecastScaleFactor;
tileBounds.mMax /= mSettings.mRecastScaleFactor;
RecastMeshBuilder builder(tileBounds);
std::vector<RecastMeshObject> objects;
using Object = std::tuple<
osg::ref_ptr<const osg::Referenced>,
std::reference_wrapper<const btCollisionShape>,
btTransform,
AreaType
>;
std::vector<Object> objects;
std::size_t revision;
{
const std::lock_guard lock(mMutex);
@ -133,11 +139,14 @@ namespace DetourNavigator
std::visit(AddHeightfield {v.mCell, builder}, v.mShape);
objects.reserve(mObjects.size());
for (const auto& [k, object] : mObjects)
objects.push_back(object.getImpl());
{
const RecastMeshObject& impl = object.getImpl();
objects.emplace_back(impl.getHolder(), impl.getShape(), impl.getTransform(), impl.getAreaType());
}
revision = mRevision;
}
for (const auto& v : objects)
builder.addObject(v.getShape(), v.getTransform(), v.getAreaType());
for (const auto& [holder, shape, transform, areaType] : objects)
builder.addObject(shape, transform, areaType);
return std::move(builder).create(mGeneration, revision);
}

5
components/detournavigator/recastmeshobject.hpp
View file

@ -39,6 +39,11 @@ namespace DetourNavigator
bool update(const btTransform& transform, const AreaType areaType);
const osg::ref_ptr<const osg::Referenced>& getHolder() const
{
return mHolder;
}
const btCollisionShape& getShape() const
{
return mShape;