Changeset 10571 for code/branches/core7/src

Timestamp:

Sep 9, 2015, 1:11:13 PM (9 years ago)

Author:

landauf

Message:

BaseObject returns plain pointers instead of StrongPtrs for Namespace, Level, Scene, and Gametype.

Location:

code/branches/core7/src

Files:

• libraries/core/BaseObject.cc (modified) (1 diff)
• libraries/core/BaseObject.h (modified) (3 diffs)
• modules/dodgerace/DodgeRaceCenterPoint.cc (modified) (1 diff)
• modules/dodgerace/DodgeRaceHUDinfo.cc (modified) (1 diff)
• modules/gametypes/OldRaceCheckPoint.cc (modified) (3 diffs)
• modules/gametypes/SpaceRaceManager.cc (modified) (2 diffs)
• modules/invader/InvaderCenterPoint.cc (modified) (1 diff)
• modules/invader/InvaderHUDinfo.cc (modified) (1 diff)
• modules/jump/JumpCenterpoint.cc (modified) (1 diff)
• modules/jump/JumpScore.cc (modified) (1 diff)
• modules/mini4dgame/Mini4DgameBoard.cc (modified) (1 diff)
• modules/objects/triggers/CheckPoint.cc (modified) (1 diff)
• modules/overlays/hud/LastManStandingInfos.cc (modified) (1 diff)
• modules/overlays/hud/LastTeamStandingInfos.cc (modified) (1 diff)
• modules/overlays/hud/TeamBaseMatchScore.cc (modified) (1 diff)
• modules/pong/PongCenterpoint.cc (modified) (1 diff)
• modules/pong/PongScore.cc (modified) (1 diff)
• modules/tetris/TetrisBrick.cc (modified) (1 diff)
• modules/tetris/TetrisCenterpoint.cc (modified) (1 diff)
• modules/tetris/TetrisScore.cc (modified) (1 diff)
• modules/towerdefense/TowerDefenseCenterpoint.cc (modified) (1 diff)
• modules/towerdefense/TowerDefenseEnemy.cc (modified) (1 diff)
• modules/towerdefense/TowerDefenseHUDController.cc (modified) (1 diff)
• orxonox/Scene.cc (modified) (1 diff)
• orxonox/overlays/OverlayGroup.cc (modified) (1 diff)
• orxonox/worldentities/pawns/Destroyer.cc (modified) (1 diff)
• orxonox/worldentities/pawns/TeamBaseMatchBase.cc (modified) (2 diffs)

code/branches/core7/src/libraries/core/BaseObject.cc

@@ -78 +78 @@
         {
             this->setFile(this->creator_->getFile());
-            this->setNamespace(this->creator_->getNamespace());
-            this->setScene(this->creator_->getScene(), this->creator_->getSceneID());
-            this->setGametype(this->creator_->getGametype());
-            this->setLevel(this->creator_->getLevel());
+            this->setNamespace(this->creator_->namespace_);
+            this->setScene(this->creator_->scene_, this->creator_->sceneID_);
+            this->setGametype(this->creator_->gametype_);
+            this->setLevel(this->creator_->level_);
         }
         else

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

@@ -139 +139 @@
 
             inline void setNamespace(const StrongPtr<Namespace>& ns) { this->namespace_ = ns; }
-            inline const StrongPtr<Namespace>& getNamespace() const { return this->namespace_; }
+            inline Namespace* getNamespace() const { return this->namespace_; }
 
             inline void setCreator(BaseObject* creator) { this->creator_ = creator; }
@@ -145 +145 @@
 
             inline void setScene(const StrongPtr<Scene>& scene, uint32_t sceneID) { this->scene_ = scene; this->sceneID_=sceneID; }
-            inline const StrongPtr<Scene>& getScene() const { return this->scene_; }
+            inline Scene* getScene() const { return this->scene_; }
             inline virtual uint32_t getSceneID() const { return this->sceneID_; }
 
@@ -157 +157 @@
                 }
             }
-            inline const StrongPtr<Gametype>& getGametype() const { return this->gametype_; }
+            inline Gametype* getGametype() const { return this->gametype_; }
             inline Gametype* getOldGametype() const { return this->oldGametype_; }
             virtual void changedGametype() {}
 
             inline void setLevel(const StrongPtr<Level>& level) { this->level_ = level; }
-            inline const StrongPtr<Level>& getLevel() const { return this->level_; }
+            inline Level* getLevel() const { return this->level_; }
 
             void addEventSource(BaseObject* source, const std::string& state);

code/branches/core7/src/modules/dodgerace/DodgeRaceCenterPoint.cc

@@ -66 +66 @@
         if (this->getGametype() != NULL && this->getGametype()->isA(Class(DodgeRace)))
         {
-            DodgeRace* DodgeRaceGametype = orxonox_cast<DodgeRace*>(this->getGametype().get());
+            DodgeRace* DodgeRaceGametype = orxonox_cast<DodgeRace*>(this->getGametype());
             DodgeRaceGametype->setCenterpoint(this);
         }

code/branches/core7/src/modules/dodgerace/DodgeRaceHUDinfo.cc

@@ -82 +82 @@
         if (this->getOwner() && this->getOwner()->getGametype())
         {
-            this->DodgeRaceGame = orxonox_cast<DodgeRace*>(this->getOwner()->getGametype().get());
+            this->DodgeRaceGame = orxonox_cast<DodgeRace*>(this->getOwner()->getGametype());
         }
         else

code/branches/core7/src/modules/gametypes/OldRaceCheckPoint.cc

@@ -61 +61 @@
         SUPER(OldRaceCheckPoint, tick, dt);
 
-        OldSpaceRace* gametype = orxonox_cast<OldSpaceRace*>(this->getGametype().get());
+        OldSpaceRace* gametype = orxonox_cast<OldSpaceRace*>(this->getGametype());
         assert(gametype);
         if (this->getCheckpointIndex() == gametype->getCheckpointsReached())
@@ -82 +82 @@
         DistanceTrigger::triggered(bIsTriggered);
 
-        OldSpaceRace* gametype = orxonox_cast<OldSpaceRace*>(this->getGametype().get());
+        OldSpaceRace* gametype = orxonox_cast<OldSpaceRace*>(this->getGametype());
         if (gametype && this->getCheckpointIndex() == gametype->getCheckpointsReached() && bIsTriggered)
         {
@@ -107 +107 @@
         if (this->bTimeLimit_ != 0)
         {
-            OldSpaceRace* gametype = orxonox_cast<OldSpaceRace*>(this->getGametype().get());
+            OldSpaceRace* gametype = orxonox_cast<OldSpaceRace*>(this->getGametype());
             if (gametype)
             {

code/branches/core7/src/modules/gametypes/SpaceRaceManager.cc

@@ -46 +46 @@
     {
         RegisterObject(SpaceRaceManager);
-        this->race_ = orxonox_cast<SpaceRace*>(this->getGametype().get());
+        this->race_ = orxonox_cast<SpaceRace*>(this->getGametype());
         assert(race_);
         //amountOfPlayers=(race_->getPlayers()).size();
@@ -139 +139 @@
     void SpaceRaceManager::checkpointReached(RaceCheckPoint* newCheckpoint, PlayerInfo* player)
     {
-        SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype().get());
+        SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype());
         assert(gametype);
         if (!gametype)

code/branches/core7/src/modules/invader/InvaderCenterPoint.cc

@@ -66 +66 @@
         if (this->getGametype() != NULL && this->getGametype()->isA(Class(Invader)))
         {
-            Invader* InvaderGametype = orxonox_cast<Invader*>(this->getGametype().get());
+            Invader* InvaderGametype = orxonox_cast<Invader*>(this->getGametype());
             InvaderGametype->setCenterpoint(this);
         }

code/branches/core7/src/modules/invader/InvaderHUDinfo.cc

@@ -128 +128 @@
         if (this->getOwner() && this->getOwner()->getGametype())
         {
-            this->InvaderGame = orxonox_cast<Invader*>(this->getOwner()->getGametype().get());
+            this->InvaderGame = orxonox_cast<Invader*>(this->getOwner()->getGametype());
         }
         else

code/branches/core7/src/modules/jump/JumpCenterpoint.cc

@@ -91 +91 @@
         if (getGametype() != NULL && this->getGametype()->isA(Class(Jump)))
         {
-            Jump* jumpGametype = orxonox_cast<Jump*>(this->getGametype().get());
+            Jump* jumpGametype = orxonox_cast<Jump*>(this->getGametype());
             jumpGametype->setCenterpoint(this);
         }

code/branches/core7/src/modules/jump/JumpScore.cc

@@ -119 +119 @@
         if (this->getOwner() != NULL && this->getOwner()->getGametype())
         {
-            this->owner_ = orxonox_cast<Jump*>(this->getOwner()->getGametype().get());
+            this->owner_ = orxonox_cast<Jump*>(this->getOwner()->getGametype());
         }
         else

code/branches/core7/src/modules/mini4dgame/Mini4DgameBoard.cc

@@ -919 +919 @@
         if (this->getGametype() != NULL && this->getGametype()->isA(Class(Mini4Dgame)))
         {
-            Mini4Dgame* Mini4DgameGametype = orxonox_cast<Mini4Dgame*>(this->getGametype().get());
+            Mini4Dgame* Mini4DgameGametype = orxonox_cast<Mini4Dgame*>(this->getGametype());
             Mini4DgameGametype->setGameboard(this);
         }

code/branches/core7/src/modules/objects/triggers/CheckPoint.cc

@@ -93 +93 @@
         DistanceTrigger::triggered(bIsTriggered);
 
-        Asteroids* gametype = orxonox_cast<Asteroids*>(this->getGametype().get());
+        Asteroids* gametype = orxonox_cast<Asteroids*>(this->getGametype());
         if (gametype)
         {

code/branches/core7/src/modules/overlays/hud/LastManStandingInfos.cc

@@ -87 +87 @@
         {
             this->player_ = orxonox_cast<PlayerInfo*>(this->getOwner());
-            this->lms_ = orxonox_cast<LastManStanding*>(this->getOwner()->getGametype().get());
+            this->lms_ = orxonox_cast<LastManStanding*>(this->getOwner()->getGametype());
         }
         else

code/branches/core7/src/modules/overlays/hud/LastTeamStandingInfos.cc

@@ -87 +87 @@
         {
             this->player_ = orxonox_cast<PlayerInfo*>(this->getOwner());
-            this->lts_ = orxonox_cast<LastTeamStanding*>(this->getOwner()->getGametype().get());
+            this->lts_ = orxonox_cast<LastTeamStanding*>(this->getOwner()->getGametype());
         }
         else

code/branches/core7/src/modules/overlays/hud/TeamBaseMatchScore.cc

@@ -118 +118 @@
 
         if (this->getOwner() && this->getOwner()->getGametype())
-            this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype().get());
+            this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype());
         else
             this->owner_ = 0;

code/branches/core7/src/modules/pong/PongCenterpoint.cc

@@ -98 +98 @@
         if (this->getGametype() != NULL && this->getGametype()->isA(Class(Pong)))
         {
-            Pong* pongGametype = orxonox_cast<Pong*>(this->getGametype().get());
+            Pong* pongGametype = orxonox_cast<Pong*>(this->getGametype());
             pongGametype->setCenterpoint(this);
         }

code/branches/core7/src/modules/pong/PongScore.cc

@@ -170 +170 @@
 
         if (this->getOwner() != NULL && this->getOwner()->getGametype())
-            this->owner_ = orxonox_cast<Pong*>(this->getOwner()->getGametype().get());
+            this->owner_ = orxonox_cast<Pong*>(this->getOwner()->getGametype());
         else
             this->owner_ = 0;

code/branches/core7/src/modules/tetris/TetrisBrick.cc

@@ -169 +169 @@
         if (this->getGametype() != NULL && this->getGametype()->isA(Class(Tetris)))
         {
-            Tetris* tetrisGametype = orxonox_cast<Tetris*>(this->getGametype().get());
+            Tetris* tetrisGametype = orxonox_cast<Tetris*>(this->getGametype());
             return tetrisGametype;
         }

code/branches/core7/src/modules/tetris/TetrisCenterpoint.cc

@@ -98 +98 @@
         if (this->getGametype() != NULL && this->getGametype()->isA(Class(Tetris)))
         {
-            Tetris* tetrisGametype = orxonox_cast<Tetris*>(this->getGametype().get());
+            Tetris* tetrisGametype = orxonox_cast<Tetris*>(this->getGametype());
             tetrisGametype->setCenterpoint(this);
         }

code/branches/core7/src/modules/tetris/TetrisScore.cc

@@ -118 +118 @@
 
         if (this->getOwner() != NULL && this->getOwner()->getGametype())
-            this->owner_ = orxonox_cast<Tetris*>(this->getOwner()->getGametype().get());
+            this->owner_ = orxonox_cast<Tetris*>(this->getOwner()->getGametype());
         else
             this->owner_ = 0;

code/branches/core7/src/modules/towerdefense/TowerDefenseCenterpoint.cc

@@ -103 +103 @@
         {
             // Sets the centerpoint of the gametype. The gametype uses this to later spawn in towers, he needs the tower template stored in the center point
-            TowerDefense* towerDefenseGametype = orxonox_cast<TowerDefense*>(this->getGametype().get());
+            TowerDefense* towerDefenseGametype = orxonox_cast<TowerDefense*>(this->getGametype());
             towerDefenseGametype->setCenterpoint(this);
         }

code/branches/core7/src/modules/towerdefense/TowerDefenseEnemy.cc

@@ -29 +29 @@
         this->setCollisionType(WorldEntity::Dynamic);
         //needed to keep track of the PlayerStats coded in TowerDefense.h
-        this->td = orxonox_cast<TowerDefense*>(this->getGametype().get());
+        this->td = orxonox_cast<TowerDefense*>(this->getGametype());
         once_=false;
 

code/branches/core7/src/modules/towerdefense/TowerDefenseHUDController.cc

@@ -80 +80 @@
             if (this->getOwner() && this->getOwner()->getGametype())
                     {
-                        this->td = orxonox_cast<TowerDefense*>(this->getOwner()->getGametype().get());
+                        this->td = orxonox_cast<TowerDefense*>(this->getOwner()->getGametype());
                     }
                     else

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

@@ -63 +63 @@
 
         this->setScene(StrongPtr<Scene>(this, false), this->getObjectID());
+
         this->bShadows_ = true;
         this->bDebugDrawPhysics_ = false;

code/branches/core7/src/orxonox/overlays/OverlayGroup.cc

@@ -38 +38 @@
 #include "core/command/ConsoleCommandIncludes.h"
 #include "OrxonoxOverlay.h"
+#include "gametypes/Gametype.h"
 
 namespace orxonox

code/branches/core7/src/orxonox/worldentities/pawns/Destroyer.cc

@@ -40 +40 @@
         RegisterObject(Destroyer);
 
-        UnderAttack* gametype = orxonox_cast<UnderAttack*>(this->getGametype().get());
+        UnderAttack* gametype = orxonox_cast<UnderAttack*>(this->getGametype());
         if (gametype)
         {

code/branches/core7/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc

@@ -45 +45 @@
         this->state_ = BaseState::Uncontrolled;
 
-        TeamBaseMatch* gametype = orxonox_cast<TeamBaseMatch*>(this->getGametype().get());
+        TeamBaseMatch* gametype = orxonox_cast<TeamBaseMatch*>(this->getGametype());
         if (gametype)
         {
@@ -58 +58 @@
         this->fireEvent();
 
-        TeamDeathmatch* gametype = orxonox_cast<TeamDeathmatch*>(this->getGametype().get());
+        TeamDeathmatch* gametype = orxonox_cast<TeamDeathmatch*>(this->getGametype());
         if (!gametype)
             return;