Changeset 6348 for code/branches/presentation2/src

Timestamp:

Dec 14, 2009, 12:50:22 AM (15 years ago)

Author:

rgrieder

Message:

Adding OrxonoxClass::preDestroy(). This method gets called when an object is about to be destroyed. The only way to prevent that is by overriding preDestroy() and then creating a SmartPtr to 'this'. This allows us to delay the destruction of an object, for instance when destroyed by the loader.

Location:

code/branches/presentation2/src/libraries/core

Files:

• OrxonoxClass.cc (modified) (1 diff)
• OrxonoxClass.h (modified) (2 diffs)

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

@@ -78 +78 @@
         this->requestedDestruction_ = true;
         if (this->referenceCount_ == 0)
-            delete this;
+        {
+            this->preDestroy();
+            if (this->referenceCount_ == 0)
+                delete this;
+        }
     }
 

code/branches/presentation2/src/libraries/core/OrxonoxClass.h

@@ -135 +135 @@
             {   return const_cast<OrxonoxClass*>(this)->getDerivedPointer<T>(classID);   }
 
+        protected:
+            virtual void preDestroy() {}
+
         private:
             /** @brief Increments the reference counter (for smart pointers). */
@@ -141 +144 @@
             /** @brief Decrements the reference counter (for smart pointers). */
             inline void decrementReferenceCount()
-                { --this->referenceCount_; if (this->referenceCount_ == 0 && this->requestedDestruction_) { delete this; } }
+            {
+                --this->referenceCount_;
+                if (this->referenceCount_ == 0 && this->requestedDestruction_)
+                    this->destroy();
+            }
                 
             /** @brief Register a weak pointer which points to this object. */