Changeset 5824

Timestamp:

Sep 28, 2009, 5:50:31 PM (15 years ago)

Author:

landauf

Message:

added callback functionality to WeakPtr

Location:

code/branches/core5/src/libraries/core

Files:

• OrxonoxClass.cc (modified) (1 diff)
• WeakPtr.h (modified) (6 diffs)

code/branches/core5/src/libraries/core/OrxonoxClass.cc

@@ -66 +66 @@
         // reset all weak pointers pointing to this object
         for (std::set<WeakPtr<OrxonoxClass>*>::iterator it = this->weakPointers_.begin(); it != this->weakPointers_.end(); )
-            (*(it++))->reset();
+            (*(it++))->objectDeleted();
     }
 

code/branches/core5/src/libraries/core/WeakPtr.h

@@ -36 +36 @@
 #include <cassert>
 #include "OrxonoxClass.h"
+#include "Functor.h"
 
 namespace orxonox
@@ -42 +43 @@
     class WeakPtr
     {
+        friend class OrxonoxClass;
+        
         public:
-            inline WeakPtr() : pointer_(0), base_(0)
-            {
-            }
-
-            inline WeakPtr(int) : pointer_(0), base_(0)
-            {
-            }
-
-            inline WeakPtr(T* pointer) : pointer_(pointer), base_(pointer)
+            inline WeakPtr() : pointer_(0), base_(0), callback_(0)
+            {
+            }
+
+            inline WeakPtr(int) : pointer_(0), base_(0), callback_(0)
+            {
+            }
+
+            inline WeakPtr(T* pointer) : pointer_(pointer), base_(pointer), callback_(0)
             {
                 if (this->base_)
@@ -57 +60 @@
             }
 
-            inline WeakPtr(const WeakPtr& other) : pointer_(other.pointer_), base_(other.base_)
+            inline WeakPtr(const WeakPtr& other) : pointer_(other.pointer_), base_(other.base_), callback_(0)
             {
                 if (this->base_)
@@ -64 +67 @@
 
             template <class O>
-            inline WeakPtr(const WeakPtr<O>& other) : pointer_(other.get()), base_(other.base_)
+            inline WeakPtr(const WeakPtr<O>& other) : pointer_(other.get()), base_(other.base_), callback_(0)
             {
                 if (this->base_)
@@ -74 +77 @@
                 if (this->base_)
                     this->base_->unregisterWeakPtr(this);
+                if (this->callback_)
+                    delete this->callback_;
+                    
             }
             
@@ -151 +157 @@
                 WeakPtr().swap(*this);
             }
+            
+            inline void addCallback(Functor* callback)
+            {
+                this->callback_ = callback;
+            }
+            
+            inline Functor* getFunctor() const
+            {
+                return this->callback_;
+            }
 
         private:
+            inline void objectDeleted()
+            {
+                this->reset();
+                if (this->callback_)
+                    (*this->callback_)();
+            }
+        
             T* pointer_;
             OrxonoxClass* base_;
+            Functor* callback_;
     };