Changeset 10578 for code/branches/core7/src/orxonox

Timestamp:

Sep 9, 2015, 4:10:21 PM (9 years ago)

Author:

landauf

Message:

removed the 'bAddRef' argument from StrongPtr's constructor. it was a bad hack and shouldn't be used. in fact, it was only used to avoid recursive dependencies if one of the four base objects (Namespace, Level, Gametype, Scene) referenced itself with a StrongPtr.
instead of the 'bAddRef'-hack BaseObject now stores the references in a new construct called StrongOrWeakPtr which can either store the reference in a StrongPtr (like it did before) or in a WeakPtr (which is a cleaner alternative to 'bAddRef=true')

Location:

code/branches/core7/src/orxonox

Files:

• Level.cc (modified) (2 diffs)
• Scene.cc (modified) (1 diff)
• gametypes/Gametype.cc (modified) (1 diff)
• infos/PlayerInfo.cc (modified) (1 diff)

code/branches/core7/src/orxonox/Level.cc

@@ -49 +49 @@
         RegisterObject(Level);
 
-        this->setLevel(StrongPtr<Level>(this, false));
+        this->setLevel(WeakPtr<Level>(this)); // store a weak-pointer to itself (a strong-pointer would create a recursive dependency)
 
         this->registerVariables();
@@ -123 +123 @@
         Gametype* rootgametype = orxonox_cast<Gametype*>(identifier->fabricate(this));
 
-        rootgametype->setLevel(NULL); // avoid circular references
-        this->setGametype(rootgametype);
+        rootgametype->setLevel(StrongPtr<Level>(NULL)); // avoid circular references
+        this->setGametype(StrongPtr<Gametype>(rootgametype));
         rootgametype->init(); // call init() AFTER the gametype was set
 

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

@@ -62 +62 @@
         RegisterObject(Scene);
 
-        this->setScene(StrongPtr<Scene>(this, false), this->getObjectID());
+        this->setScene(WeakPtr<Scene>(this), this->getObjectID()); // store a weak-pointer to itself (a strong-pointer would create a recursive dependency)
 
         this->bShadows_ = true;

code/branches/core7/src/orxonox/gametypes/Gametype.cc

@@ -61 +61 @@
         RegisterObject(Gametype);
 
-        this->setGametype(StrongPtr<Gametype>(this, false));
+        this->setGametype(WeakPtr<Gametype>(this)); // store a weak-pointer to itself (a strong-pointer would create a recursive dependency)
 
         this->gtinfo_ = new GametypeInfo(context);

code/branches/core7/src/orxonox/infos/PlayerInfo.cc

@@ -98 +98 @@
     {
         Gametype* oldGametype = this->getGametype();
-        this->setGametype(gametype);
+        this->setGametype(StrongPtr<Gametype>(gametype));
         Gametype* newGametype = this->getGametype();