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

Timestamp:

Sep 27, 2009, 2:33:48 AM (16 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/BaseObject.h (modified) (3 diffs)

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