Changeset 3239 for code/branches/core4/src/orxonox/objects/worldentities

Timestamp:

Jun 28, 2009, 2:45:37 PM (15 years ago)

Author:

rgrieder

Message:

Found a way to write orxonox_cast<T*> instead of orxonox_cast<T> so that the syntax resembles dynamic_cast<T*>.

Location:

code/branches/core4/src/orxonox/objects/worldentities

Files:

• Attacher.cc (modified) (1 diff)
• BigExplosion.cc (modified) (2 diffs)
• ControllableEntity.cc (modified) (1 diff)
• MovableEntity.cc (modified) (1 diff)
• PongBall.cc (modified) (1 diff)
• PongCenterpoint.cc (modified) (1 diff)
• WorldEntity.cc (modified) (1 diff)
• pawns/Destroyer.cc (modified) (1 diff)
• pawns/SpaceShip.cc (modified) (1 diff)
• pawns/TeamBaseMatchBase.cc (modified) (3 diffs)
• triggers/CheckPoint.cc (modified) (1 diff)
• triggers/DistanceTrigger.cc (modified) (2 diffs)

code/branches/core4/src/orxonox/objects/worldentities/Attacher.cc

@@ -111 +111 @@
             return;
 
-        WorldEntity* entity = orxonox_cast<WorldEntity>(object);
+        WorldEntity* entity = orxonox_cast<WorldEntity*>(object);
         if (entity && entity->getName() == this->targetname_)
         {

code/branches/core4/src/orxonox/objects/worldentities/BigExplosion.cc

@@ -99 +99 @@
         Identifier* idDE1 = Class(MovableEntity);
         BaseObject* oDE1 = idDE1->fabricate(this);
-        this->debrisEntity1_ = orxonox_cast<MovableEntity>(oDE1);
+        this->debrisEntity1_ = orxonox_cast<MovableEntity*>(oDE1);
 
         Identifier* idDE2 = Class(MovableEntity);
         BaseObject* oDE2 = idDE2->fabricate(this);
-        this->debrisEntity2_ = orxonox_cast<MovableEntity>(oDE2);
+        this->debrisEntity2_ = orxonox_cast<MovableEntity*>(oDE2);
 
         Identifier* idDE3 = Class(MovableEntity);
         BaseObject* oDE3 = idDE3 ->fabricate(this);
-        this->debrisEntity3_ = orxonox_cast<MovableEntity>(oDE3);
+        this->debrisEntity3_ = orxonox_cast<MovableEntity*>(oDE3);
 
         Identifier* idDE4 = Class(MovableEntity);
         BaseObject* oDE4 = idDE4->fabricate(this);
-        this->debrisEntity4_ = orxonox_cast<MovableEntity>(oDE4);
+        this->debrisEntity4_ = orxonox_cast<MovableEntity*>(oDE4);
 
         Identifier* idD1 = Class(Model);
         BaseObject* oD1 = idD1->fabricate(this);
-        this->debris1_ = orxonox_cast<Model>(oD1);
+        this->debris1_ = orxonox_cast<Model*>(oD1);
 
         Identifier* idD2 = Class(Model);
         BaseObject* oD2 = idD2->fabricate(this);
-        this->debris2_ = orxonox_cast<Model>(oD2);
+        this->debris2_ = orxonox_cast<Model*>(oD2);
 
         Identifier* idD3 = Class(Model);
         BaseObject* oD3 = idD3->fabricate(this);
-        this->debris3_ = orxonox_cast<Model>(oD3);
+        this->debris3_ = orxonox_cast<Model*>(oD3);
 
         Identifier* idD4 = Class(Model);
         BaseObject* oD4 = idD4->fabricate(this);
-        this->debris4_ = orxonox_cast<Model>(oD4);
+        this->debris4_ = orxonox_cast<Model*>(oD4);
 
         Identifier* id6 = Class(StaticEntity);
         BaseObject* object4 = id6->fabricate(this);
-        this->explosion_ = orxonox_cast<StaticEntity>(object4);
+        this->explosion_ = orxonox_cast<StaticEntity*>(object4);
 
         this->debrisSmoke1_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/smoke7", this->LOD_);
@@ -202 +202 @@
             Identifier* idf1 = Class(Model);
             BaseObject* obj1 = idf1->fabricate(this);
-            Model* part1 = orxonox_cast<Model>(obj1);
+            Model* part1 = orxonox_cast<Model*>(obj1);
 
 
             Identifier* idf2 = Class(Model);
             BaseObject* obj2 = idf2->fabricate(this);
-            Model* part2 = orxonox_cast<Model>(obj2);
+            Model* part2 = orxonox_cast<Model*>(obj2);
 
             Identifier* idf3 = Class(MovableEntity);
             BaseObject* obj3 = idf3->fabricate(this);
-            MovableEntity* partEntity1 = orxonox_cast<MovableEntity>(obj3);
+            MovableEntity* partEntity1 = orxonox_cast<MovableEntity*>(obj3);
 
             Identifier* idf4 = Class(MovableEntity);
             BaseObject* obj4 = idf4->fabricate(this);
-            MovableEntity* partEntity2 = orxonox_cast<MovableEntity>(obj4);
+            MovableEntity* partEntity2 = orxonox_cast<MovableEntity*>(obj4);
 
             partEntity1->setVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1))*rnd(10,100));

code/branches/core4/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -267 +267 @@
         if (this->playerID_ != OBJECTID_UNKNOWN)
         {
-            this->player_ = orxonox_cast<PlayerInfo>(Synchronisable::getSynchronisable(this->playerID_));
+            this->player_ = orxonox_cast<PlayerInfo*>(Synchronisable::getSynchronisable(this->playerID_));
             if (this->player_ && (this->player_->getControllableEntity() != this))
                 this->player_->startControl(this);

code/branches/core4/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -76 +76 @@
         if (GameMode::isMaster() && enableCollisionDamage_)
         {
-            Pawn* victim = orxonox_cast<Pawn>(otherObject);
+            Pawn* victim = orxonox_cast<Pawn*>(otherObject);
             if (victim)
             {

code/branches/core4/src/orxonox/objects/worldentities/PongBall.cc

@@ -231 +231 @@
             this->bat_ = new PongBat*[2];
         if (this->batID_[0] != OBJECTID_UNKNOWN)
-            this->bat_[0] = orxonox_cast<PongBat>(Synchronisable::getSynchronisable(this->batID_[0]));
+            this->bat_[0] = orxonox_cast<PongBat*>(Synchronisable::getSynchronisable(this->batID_[0]));
         if (this->batID_[1] != OBJECTID_UNKNOWN)
-            this->bat_[1] = orxonox_cast<PongBat>(Synchronisable::getSynchronisable(this->batID_[1]));
+            this->bat_[1] = orxonox_cast<PongBat*>(Synchronisable::getSynchronisable(this->batID_[1]));
     }
 }

code/branches/core4/src/orxonox/objects/worldentities/PongCenterpoint.cc

@@ -73 +73 @@
         if (this->getGametype() && this->getGametype()->isA(Class(Pong)))
         {
-            Pong* pong_gametype = orxonox_cast<Pong>(this->getGametype());
+            Pong* pong_gametype = orxonox_cast<Pong*>(this->getGametype());
             pong_gametype->setCenterpoint(this);
         }

code/branches/core4/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -210 +210 @@
         if (this->parentID_ != OBJECTID_UNKNOWN)
         {
-            WorldEntity* parent = orxonox_cast<WorldEntity>(Synchronisable::getSynchronisable(this->parentID_));
+            WorldEntity* parent = orxonox_cast<WorldEntity*>(Synchronisable::getSynchronisable(this->parentID_));
             if (parent)
                 this->attachToParent(parent);

code/branches/core4/src/orxonox/objects/worldentities/pawns/Destroyer.cc

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

code/branches/core4/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

@@ -198 +198 @@
                 {
                     BaseObject* object = identifier->fabricate(this);
-                    this->engine_ = orxonox_cast<Engine>(object);
+                    this->engine_ = orxonox_cast<Engine*>(object);
 
                     if (this->engine_)

code/branches/core4/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc

@@ -45 +45 @@
         this->state_ = BaseState::uncontrolled;
 
-        TeamBaseMatch* gametype = orxonox_cast<TeamBaseMatch>(this->getGametype());
+        TeamBaseMatch* gametype = orxonox_cast<TeamBaseMatch*>(this->getGametype());
         if (gametype)
         {
@@ -58 +58 @@
         this->fireEvent();
 
-        TeamDeathmatch* gametype = orxonox_cast<TeamDeathmatch>(this->getGametype());
+        TeamDeathmatch* gametype = orxonox_cast<TeamDeathmatch*>(this->getGametype());
         if (!gametype)
             return;
@@ -84 +84 @@
             if ((*it)->isA(Class(TeamColourable)))
             {
-                TeamColourable* tc = orxonox_cast<TeamColourable>(*it);
+                TeamColourable* tc = orxonox_cast<TeamColourable*>(*it);
                 tc->setTeamColour(colour);
             }

code/branches/core4/src/orxonox/objects/worldentities/triggers/CheckPoint.cc

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

code/branches/core4/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

@@ -120 +120 @@
     for (ClassTreeMaskObjectIterator it = this->targetMask_.begin(); it != this->targetMask_.end(); ++it)
     {
-      WorldEntity* entity = orxonox_cast<WorldEntity>(*it);
+      WorldEntity* entity = orxonox_cast<WorldEntity*>(*it);
       if (!entity)
         continue;
@@ -131 +131 @@
         if(this->isForPlayer())
         {
-          Pawn* player = orxonox_cast<Pawn>(entity);
+          Pawn* player = orxonox_cast<Pawn*>(entity);
           this->setTriggeringPlayer(player);
         }