Changeset 5805 for code/branches/core5/src/libraries/core/SmartPtr.h

Timestamp:

Sep 27, 2009, 2:33:48 AM (15 years ago)

Author:

landauf

Message:

• Enhanced SmartPtr: a) It stores now two pointers, one OrxonoxClass* (for reference counting) and one T* (for normal use). b) Incrementing the reference is now optional in the constructor for raw pointers. This is needed because Scene has a selfreference but should still be destroyable.
• Changed BaseObject to store a SmartPtr to it's Scene instead of a normal pointer.
• Changed setScene and getScene to deal directly with SmartPtr instead of a Scene* pointer to avoid casting-to-OrxonoxClass issues.
• Fixed two problems with lost SceneManagers in CameraManger: a) added a SmartPtr to the Scene for the fallback camera b) added a call to GUIManager in the destructor to release the scene manager
• Enabled unloading in GSLevel again (after years). Works if playing without bots.

File:

• code/branches/core5/src/libraries/core/SmartPtr.h (modified) (4 diffs)

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

@@ -42 +42 @@
     {
         public:
-            inline SmartPtr() : pointer_(0)
-            {
-            }
-
-            inline SmartPtr(T* pointer) : pointer_(pointer)
-            {
-                if (this->pointer_)
-                    this->pointer_->incrementReferenceCount();
-            }
-
-            inline SmartPtr(const SmartPtr& other) : pointer_(other.pointer_)
-            {
-                if (this->pointer_)
-                    this->pointer_->incrementReferenceCount();
+            inline SmartPtr() : pointer_(0), base_(0)
+            {
+            }
+
+            inline SmartPtr(int) : pointer_(0), base_(0)
+            {
+            }
+
+            inline SmartPtr(T* pointer, bool bAddRef = true) : pointer_(pointer), base_(pointer)
+            {
+                if (this->base_ && bAddRef)
+                    this->base_->incrementReferenceCount();
+            }
+
+            inline SmartPtr(const SmartPtr& other) : pointer_(other.pointer_), base_(other.base_)
+            {
+                if (this->base_)
+                    this->base_->incrementReferenceCount();
             }
 
             template <class O>
-            inline SmartPtr(const SmartPtr<O>& other) : pointer_(other.get())
-            {
-                if (this->pointer_)
-                    this->pointer_->incrementReferenceCount();
+            inline SmartPtr(const SmartPtr<O>& other) : pointer_(other.get()), base_(other.base_)
+            {
+                if (this->base_)
+                    this->base_->incrementReferenceCount();
             }
 
             inline ~SmartPtr()
             {
-                if (this->pointer_)
-                    this->pointer_->decrementReferenceCount();
+                if (this->base_)
+                    this->base_->decrementReferenceCount();
+            }
+            
+            inline const SmartPtr& operator=(int)
+            {
+                SmartPtr(0).swap(*this);
+                return *this;
             }
 
@@ -96 +106 @@
 
             inline operator T*() const
-            {std::cout << "(implizit)";
+            {
                 return this->pointer_;
             }
@@ -117 +127 @@
             inline void swap(SmartPtr& other)
             {
-                T* temp = this->pointer_;
-                this->pointer_ = other.pointer_;
-                other.pointer_ = temp;
+                {
+                    T* temp = this->pointer_;
+                    this->pointer_ = other.pointer_;
+                    other.pointer_ = temp;
+                }
+                {
+                    OrxonoxClass* temp = this->base_;
+                    this->base_ = other.base_;
+                    other.base_ = temp;
+                }
             }
 
@@ -129 +146 @@
         private:
             T* pointer_;
+            OrxonoxClass* base_;
     };