TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-20 04:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ref pointers

Browse source 
TODO: Cleanup

WeakRefBase lifetime is now controlled by a shared_ptr and a control block
objects now act like shared and weakptrs so they free themselves without any outside involvement, last of an objects reference goes out of scope object deletes.
This commit is contained in:
marauder2k7 2026-02-22 23:37:08 +00:00
parent f1f09efbfa
commit 43e673d8ea
4 changed files with 166 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Engine/source/console/simObject.h
View file

@ -1053,17 +1053,17 @@ class SimObjectPtr : public WeakRefPtr< T >
typedef WeakRefPtr< T > Parent;
SimObjectPtr() {}
SimObjectPtr(T *ptr) { this->mReference = NULL; set(ptr); }
SimObjectPtr( const SimObjectPtr& ref ) { this->mReference = NULL; set(ref.mReference); }
SimObjectPtr() = default;
SimObjectPtr(T *ptr) { set(ptr); }
SimObjectPtr( const SimObjectPtr& ref ) { this->mReference = ref.mReference; }
T* getObject() const { return Parent::getPointer(); }
~SimObjectPtr() { set((WeakRefBase::WeakReference*)NULL); }
~SimObjectPtr() { mReference = NULL; }
SimObjectPtr<T>& operator=(const SimObjectPtr ref)
{
set(ref.mReference);
mReference = ref.mReference;
return *this;
}
SimObjectPtr<T>& operator=(T *ptr)
@ -1073,31 +1073,10 @@ class SimObjectPtr : public WeakRefPtr< T >
}
protected:
void set(WeakRefBase::WeakReference * ref)
{
if( ref == this->mReference )
return;
if( this->mReference )
{
// Auto-delete
T* obj = this->getPointer();
if ( this->mReference->getRefCount() == 2 && obj && obj->isAutoDeleted() )
obj->deleteObject();
this->mReference->decRefCount();
}
this->mReference = NULL;
if( ref )
{
this->mReference = ref;
this->mReference->incRefCount();
}
}
void set(T * obj)
{
set(obj ? obj->getWeakReference() : (WeakRefBase::WeakReference *)NULL);
mReference = obj ? obj->getWeakReference() : nullptr;
}
};