TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-22 13:50:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

working weak ref

Browse source 
WeakRefPtr now actually acts like a weak reference
backend of weakRefPtr is now a weak_ptr so once the main shared_ptr is freed, they all get freed.
This commit is contained in:
marauder2k7 2026-02-23 17:42:09 +00:00
parent d688f1cfde
commit ca4517c076
4 changed files with 56 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Engine/source/core/util/refBase.h
View file

@ -79,22 +79,10 @@ public:
virtual ~WeakRefBase();
// Copy constructor
WeakRefBase(const WeakRefBase& other)
{
mControl = other.mControl;
mReference = std::make_unique<WeakReference>(mControl);
}
// Copy assignment
WeakRefBase& operator=(const WeakRefBase& other)
{
if (this != &other)
{
mControl = other.mControl;
mReference = std::make_unique<WeakReference>(mControl);
}
return *this;
}
WeakRefBase(const WeakRefBase&) = delete;
WeakRefBase& operator=(const WeakRefBase&) = delete;
WeakRefBase(WeakRefBase&&) = delete;
WeakRefBase& operator=(WeakRefBase&&) = delete;
std::shared_ptr<WeakReference> getWeakReference()
{
@ -103,6 +91,12 @@ public:
return mReference;
}
std::weak_ptr<WeakControlBlock> getWeakControl()
{
ensureControl();
return mControl;
}
protected:
void ensureControl()
@ -127,15 +121,11 @@ template< typename T > class SimObjectPtr;
template <class T> class WeakRefPtr
{
public:
WeakRefPtr() = default;
WeakRefPtr(T* obj) { set(obj); }
WeakRefPtr(const WeakRefPtr& other) { mReference = other.mReference; }
WeakRefPtr() = default;
WeakRefPtr(T* obj) { set(obj); }
WeakRefPtr& operator=(const WeakRefPtr& other)
{
mReference = other.mReference;
return *this;
}
WeakRefPtr(const WeakRefPtr&) = default;
WeakRefPtr& operator=(const WeakRefPtr&) = default;
WeakRefPtr& operator=(T* obj)
{
@ -143,24 +133,36 @@ public:
return *this;
}
bool isValid() const { return mReference && mReference->get(); }
bool isNull() const { return !isValid(); }
bool isValid() const { return getPointer() != NULL; }
bool isNull() const { return getPointer() == NULL; }
[[nodiscard]] constexpr T* operator->() const { return getPointer(); }
[[nodiscard]] constexpr T& operator*() const { return *getPointer(); }
[[nodiscard]] constexpr operator T*() const { return getPointer(); }
/// Returns the pointer.
[[nodiscard]] constexpr T* getPointer() const { return mReference ? (T*)mReference->get() : NULL; }
[[nodiscard]] constexpr T* getPointer() const
{
auto obj_ctrl = mWeak.lock();
if (!obj_ctrl) return NULL;
return (T*)obj_ctrl->object;
}
protected:
void set(T* obj)
{
mReference = obj ? obj->getWeakReference() : NULL;
if (!obj)
{
mWeak.reset();
return;
}
auto obj_ctrl = obj->getWeakControl().lock();
mWeak = obj_ctrl;
}
private:
template< typename > friend class SimObjectPtr;
std::shared_ptr<WeakRefBase::WeakReference> mReference;
std::weak_ptr<WeakControlBlock> mWeak;
};
/// Union of an arbitrary type with a WeakRefBase. The exposed type will