GenericObjectCache stored osg::ref_ptr<osg::Object>, so everything cached had to derive from osg::Object whether that meant anything or not: NifFileHolder and BgsmFileHolder existed for no other reason, Resource::BulletShape and ESMTerrain::LandObject carried META_Object and a CopyOp constructor nothing ever called, and every getter paid a static_cast on the way out. The cache and MultiObjectCache now take their value type as a template parameter, ask "is anything else holding this?" through a useCount overload rather than a base class method, and constrain accept and releaseGLObjects so a value type with neither is not an error. Both holders are deleted; BulletShape, BulletShapeInstance and LandObject become plain classes held by std::shared_ptr across physics, pathfinding, navmeshtool and terrain storage; MWPhysics::HeightField's type-erased osg::Object keep-alive becomes the LandObject it was always holding; every remaining manager names the type it actually caches through the NodeResourceManager alias, which removes eight static_casts and stops clang-format wrapping the declarations. The preloader needs two keep-alive sets for now, because the render-owned entries are still osg::Object; they merge once those move behind the render backend.
49 lines
927 B
C++
49 lines
927 B
C++
#ifndef OPENMW_COMPONENTS_RESOURCE_FOREACHBULLETOBJECT_H
|
|
#define OPENMW_COMPONENTS_RESOURCE_FOREACHBULLETOBJECT_H
|
|
|
|
#include <components/esm/position.hpp>
|
|
#include <components/resource/bulletshape.hpp>
|
|
#include <memory>
|
|
|
|
#include <osg/ref_ptr>
|
|
|
|
#include <functional>
|
|
#include <vector>
|
|
|
|
namespace ESM
|
|
{
|
|
class ReadersCache;
|
|
struct Cell;
|
|
}
|
|
|
|
namespace VFS
|
|
{
|
|
class Manager;
|
|
}
|
|
|
|
namespace Resource
|
|
{
|
|
class BulletShapeManager;
|
|
}
|
|
|
|
namespace EsmLoader
|
|
{
|
|
struct EsmData;
|
|
}
|
|
|
|
namespace Resource
|
|
{
|
|
struct BulletObject
|
|
{
|
|
std::shared_ptr<const Resource::BulletShape> mShape;
|
|
ESM::Position mPosition;
|
|
float mScale;
|
|
};
|
|
|
|
void forEachBulletObject(ESM::ReadersCache& readers, const VFS::Manager& vfs,
|
|
Resource::BulletShapeManager& bulletShapeManager, const EsmLoader::EsmData& esmData,
|
|
std::function<void(const ESM::Cell&, const BulletObject& object)> callback);
|
|
}
|
|
|
|
#endif
|