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.
70 lines
2.0 KiB
C++
70 lines
2.0 KiB
C++
#ifndef OPENMW_MWPHYSICS_OBJECT_H
|
|
#define OPENMW_MWPHYSICS_OBJECT_H
|
|
|
|
#include "ptrholder.hpp"
|
|
#include <memory>
|
|
|
|
#include <LinearMath/btTransform.h>
|
|
#include <osg/Node>
|
|
|
|
#include <map>
|
|
#include <mutex>
|
|
|
|
namespace Resource
|
|
{
|
|
class BulletShapeInstance;
|
|
}
|
|
|
|
namespace MWPhysics
|
|
{
|
|
class PhysicsTaskScheduler;
|
|
|
|
enum ScriptedCollisionType : char
|
|
{
|
|
ScriptedCollisionType_None = 0,
|
|
ScriptedCollisionType_Actor = 1,
|
|
// Note that this isn't 3, colliding with a player doesn't count as colliding with an actor
|
|
ScriptedCollisionType_Player = 2
|
|
};
|
|
|
|
class Object final : public PtrHolder
|
|
{
|
|
public:
|
|
Object(const MWWorld::Ptr& ptr, std::shared_ptr<Resource::BulletShapeInstance> shapeInstance,
|
|
osg::Quat rotation, int collisionType, PhysicsTaskScheduler* scheduler);
|
|
~Object() override;
|
|
|
|
const std::shared_ptr<Resource::BulletShapeInstance>& getShapeInstance() const;
|
|
void setScale(float scale);
|
|
void setRotation(osg::Quat quat);
|
|
void updatePosition();
|
|
void commitPositionChange();
|
|
btTransform getTransform() const;
|
|
/// Return solid flag. Not used by the object itself, true by default.
|
|
bool isSolid() const;
|
|
void setSolid(bool solid);
|
|
bool isAnimated() const;
|
|
/// @brief update object shape
|
|
/// @return true if shape changed
|
|
bool animateCollisionShapes();
|
|
bool collidedWith(ScriptedCollisionType type) const;
|
|
void addCollision(ScriptedCollisionType type);
|
|
void resetCollisions();
|
|
|
|
private:
|
|
std::shared_ptr<Resource::BulletShapeInstance> mShapeInstance;
|
|
std::map<int, osg::NodePath> mRecordIndexToNodePath;
|
|
bool mSolid;
|
|
btVector3 mScale;
|
|
osg::Vec3f mPosition;
|
|
osg::Quat mRotation;
|
|
bool mScaleUpdatePending = false;
|
|
bool mTransformUpdatePending = false;
|
|
mutable std::mutex mPositionMutex;
|
|
PhysicsTaskScheduler* mTaskScheduler;
|
|
char mCollidedWith;
|
|
};
|
|
}
|
|
|
|
#endif
|