Changeset 10419 for code/branches/core7

Timestamp:

May 3, 2015, 2:39:30 PM (10 years ago)

Author:

landauf

Message:

added destroyLater() to Destroyable. This will destroy the object (like destroy()) but not until the current tick has ended.

Location:

code/branches/core7/src/libraries/core

Files:

• CorePrereqs.h (modified) (1 diff)
• object/CMakeLists.txt (modified) (1 diff)
• object/DestroyLaterManager.cc (added)
• object/DestroyLaterManager.h (added)
• object/Destroyable.cc (modified) (2 diffs)
• object/Destroyable.h (modified) (1 diff)

code/branches/core7/src/libraries/core/CorePrereqs.h

@@ -157 +157 @@
     class Core;
     class Destroyable;
+    class DestroyLaterManager;
     class DestructionListener;
     class DynLib;

code/branches/core7/src/libraries/core/object/CMakeLists.txt

@@ -2 +2 @@
   Context.cc
   Destroyable.cc
+  DestroyLaterManager.cc
   Listable.cc
   ObjectListBase.cc

code/branches/core7/src/libraries/core/object/Destroyable.cc

@@ -33 +33 @@
 
 #include "Destroyable.h"
+#include "DestroyLaterManager.h"
 
 #include <cassert>
@@ -74 +75 @@
         }
     }
+
+    /**
+     * Works like @ref destroy() but doesn't destroy the object until the current tick has ended.
+     */
+    void Destroyable::destroyLater()
+    {
+        // register in DestroyLaterManager - this ensures that a smartPtr points to this object and keeps it alive for a while
+        DestroyLaterManager::getInstance().retain(this);
+
+        // request destruction -> object will be deleted after all smartPtrs (including the one in DestroyLaterManager) were destroyed.
+        this->destroy();
+    }
 }

code/branches/core7/src/libraries/core/object/Destroyable.h

@@ -57 +57 @@
 
             void destroy();
+            void destroyLater();
 
             /// Returns the number of @ref orxonox::SmartPtr "smart pointers" that point to this object.