Changeset 5805

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.

Location:

code/branches/core5/src

Files:

• libraries/core/BaseObject.h (modified) (3 diffs)
• libraries/core/OrxonoxClass.cc (modified) (1 diff)
• libraries/core/OrxonoxClass.h (modified) (1 diff)
• libraries/core/SmartPtr.h (modified) (4 diffs)
• modules/gamestates/GSLevel.cc (modified) (1 diff)
• orxonox/CameraManager.cc (modified) (3 diffs)
• orxonox/CameraManager.h (modified) (2 diffs)
• orxonox/Scene.cc (modified) (1 diff)

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

@@ -53 +53 @@
 #include "OrxonoxClass.h"
 #include "Super.h"
+#include "SmartPtr.h"
 
 namespace orxonox
@@ -134 +135 @@
             inline BaseObject* getCreator() const { return this->creator_; }
 
-            inline void setScene(Scene* scene) { this->scene_ = scene; }
-            inline Scene* getScene() const { return this->scene_; }
+            inline void setScene(const SmartPtr<Scene>& scene) { this->scene_ = scene; }
+            inline const SmartPtr<Scene>& getScene() const { return this->scene_; }
 
             inline void setGametype(Gametype* gametype)
@@ -194 +195 @@
             Namespace*             namespace_;
             BaseObject*            creator_;
-            Scene*                 scene_;
+            SmartPtr<Scene>        scene_;
             Gametype*              gametype_;
             Gametype*              oldGametype_;

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

@@ -55 +55 @@
 //            COUT(2) << "Warning: Destroyed object without destroy() (" << this->getIdentifier()->getName() << ")" << std::endl;
 
-        assert(this->referenceCount_ == 0);
+        assert(this->referenceCount_ <= 0);
 
         delete this->metaList_;

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

@@ -135 +135 @@
             std::set<const Identifier*>* parents_;     //!< List of all parents of the object
             MetaObjectList* metaList_;                 //!< MetaObjectList, containing all ObjectLists and ObjectListElements the object is registered in
-            unsigned int referenceCount_;              //!< Counts the references from smart pointers to this object
+            int referenceCount_;                       //!< Counts the references from smart pointers to this object
             bool requestedDestruction_;                //!< Becomes true after someone called delete on this object
 

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_;
     };
 

code/branches/core5/src/modules/gamestates/GSLevel.cc

@@ -242 +242 @@
     void GSLevel::unloadLevel()
     {
-        //////////////////////////////////////////////////////////////////////////////////////////
-        // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO //
-        //////////////////////////////////////////////////////////////////////////////////////////
-        // Loader::unload(startFile_); // TODO: REACTIVATE THIS IF LOADER::UNLOAD WORKS PROPERLY /
-        //////////////////////////////////////////////////////////////////////////////////////////
+        Loader::unload(startFile_s);
 
         delete startFile_s;

code/branches/core5/src/orxonox/CameraManager.cc

@@ -53 +53 @@
     {
         if (this->fallbackCamera_)
-            this->fallbackCamera_->getSceneManager()->destroyCamera(this->fallbackCamera_);
+            this->fallbackCameraScene_->getSceneManager()->destroyCamera(this->fallbackCamera_);
+        GUIManager::getInstance().setCamera(0);
     }
 
@@ -74 +75 @@
         else if (this->fallbackCamera_)
         {
-            this->fallbackCamera_->getSceneManager()->destroyCamera(this->fallbackCamera_);
+            this->fallbackCameraScene_->getSceneManager()->destroyCamera(this->fallbackCamera_);
             this->fallbackCamera_ = 0;
         }
@@ -107 +108 @@
                 // there are no more cameras, create a fallback
                 if (!this->fallbackCamera_)
-                    this->fallbackCamera_ = camera->getScene()->getSceneManager()->createCamera(getUniqueNumberString());
+                {
+                    this->fallbackCameraScene_ = camera->getScene();
+                    this->fallbackCamera_ = this->fallbackCameraScene_->getSceneManager()->createCamera(getUniqueNumberString());
+                }
                 this->useCamera(this->fallbackCamera_);
             }

code/branches/core5/src/orxonox/CameraManager.h

@@ -42 +42 @@
 #include "util/OgreForwardRefs.h"
 #include "util/Singleton.h"
+#include "core/SmartPtr.h"
 
 namespace orxonox
@@ -67 +68 @@
             Ogre::Viewport*       viewport_;
             Ogre::Camera*         fallbackCamera_;
+            SmartPtr<Scene>       fallbackCameraScene_;
 
             static CameraManager* singletonPtr_s;

code/branches/core5/src/orxonox/Scene.cc

@@ -54 +54 @@
         RegisterObject(Scene);
 
-        this->setScene(this);
+        this->setScene(SmartPtr<Scene>(this, false));
         this->bShadows_ = true;