Changeset 9279 for code/branches

Timestamp:

Jun 4, 2012, 10:50:28 PM (12 years ago)

Author:

landauf

Message:

use orxonox_cast instead of dynamic_cast wherever possible

Location:

code/branches/presentation2012merge/src

Files:

• libraries/core/Super.h (modified) (2 diffs)
• libraries/core/XMLPort.h (modified) (1 diff)
• modules/overlays/hud/HUDNavigation.cc (modified) (1 diff)
• modules/overlays/hud/HUDRadar.cc (modified) (2 diffs)
• modules/pickup/Pickup.cc (modified) (1 diff)
• modules/pickup/PickupCollection.cc (modified) (4 diffs)
• modules/pickup/PickupSpawner.cc (modified) (2 diffs)
• modules/pickup/items/DamageBoostPickup.cc (modified) (2 diffs)
• modules/pickup/items/DronePickup.cc (modified) (3 diffs)
• modules/pickup/items/HealthPickup.cc (modified) (3 diffs)
• modules/pickup/items/InvisiblePickup.cc (modified) (2 diffs)
• modules/pickup/items/MetaPickup.cc (modified) (1 diff)
• modules/pickup/items/ShieldPickup.cc (modified) (2 diffs)
• modules/pickup/items/ShrinkPickup.cc (modified) (4 diffs)
• modules/pickup/items/SpeedPickup.cc (modified) (2 diffs)
• modules/weapons/RocketController.cc (modified) (1 diff)
• orxonox/controllers/NewHumanController.cc (modified) (2 diffs)
• orxonox/gamestates/GSRoot.cc (modified) (1 diff)
• orxonox/gametypes/Dynamicmatch.cc (modified) (3 diffs)
• orxonox/gametypes/LastManStanding.cc (modified) (1 diff)
• orxonox/gametypes/LastTeamStanding.cc (modified) (1 diff)
• orxonox/interfaces/Pickupable.cc (modified) (1 diff)
• orxonox/worldentities/ControllableEntity.cc (modified) (1 diff)

code/branches/presentation2012merge/src/libraries/core/Super.h

@@ -398 +398 @@
                     inline void operator()( SUPER_CALL_ARGUMENTS##hasarguments(__VA_ARGS__) ) \
                     { \
-                        (dynamic_cast<T*>(object))->T:: functionname
+                        (orxonox_cast<T*>(object))->T:: functionname
 
         /*
@@ -508 +508 @@
                 inline void operator()( SUPER_CALL_ARGUMENTS##hasarguments(__VA_ARGS__) )
                 {
-                    (dynamic_cast<T*>(object))->T:: functionname ( Call the function with it's arguments );
+                    (orxonox_cast<T*>(object))->T:: functionname ( Call the function with it's arguments );
                 }
 

code/branches/presentation2012merge/src/libraries/core/XMLPort.h

@@ -197 +197 @@
         ClassIdentifier<classname>::getIdentifier()->addXMLPortParamContainer(paramname, containername); \
     } \
-    containername->port(dynamic_cast<BaseObject*>(this), object, xmlelement, mode)
+    containername->port(orxonox_cast<BaseObject*>(this), object, xmlelement, mode)
 
 // --------------------

code/branches/presentation2012merge/src/modules/overlays/hud/HUDNavigation.cc

@@ -427 +427 @@
 bool HUDNavigation::showObject(RadarViewable* rv)
 {
-    if ( rv == dynamic_cast<RadarViewable*> ( this->getOwner() ) )
+    if ( rv == orxonox_cast<RadarViewable*> ( this->getOwner() ) )
         return false;
     assert( rv->getWorldEntity() );

code/branches/presentation2012merge/src/modules/overlays/hud/HUDRadar.cc

@@ -92 +92 @@
     void HUDRadar::addObject(RadarViewable* object)
     {
-        if (object == dynamic_cast<RadarViewable*>(this->owner_))
+        if (object == orxonox_cast<RadarViewable*>(this->owner_))
             return;
         if( showObject(object) == false ) //do not show objects that are "invisible" or "radar invisible"
@@ -189 +189 @@
     bool HUDRadar::showObject(RadarViewable* rv)
     {
-        if ( rv == dynamic_cast<RadarViewable*> ( this->getOwner() ) )
+        if ( rv == orxonox_cast<RadarViewable*> ( this->getOwner() ) )
             return false;
         assert( rv->getWorldEntity() );

code/branches/presentation2012merge/src/modules/pickup/Pickup.cc

@@ -210 +210 @@
         SUPER(Pickup, clone, item);
 
-        Pickup* pickup = dynamic_cast<Pickup*>(item);
+        Pickup* pickup = orxonox_cast<Pickup*>(item);
         pickup->setActivationTypeDirect(this->getActivationTypeDirect());
         pickup->setDurationTypeDirect(this->getDurationTypeDirect());

code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc

@@ -79 +79 @@
         }
         this->pickups_.clear();
-        
+
         if(this->pickupCollectionIdentifier_ != NULL)
             delete this->pickupCollectionIdentifier_;
@@ -195 +195 @@
             return;
 
-        // If at least all the enabled pickups of this PickupCollection are no longer picked up. 
+        // If at least all the enabled pickups of this PickupCollection are no longer picked up.
         if(this->pickedUpCounter_ <= this->disabledCounter_ && this->isPickedUp())
             this->Pickupable::destroy();
@@ -218 +218 @@
         SUPER(PickupCollection, clone, item);
 
-        PickupCollection* pickup = dynamic_cast<PickupCollection*>(item);
+        PickupCollection* pickup = orxonox_cast<PickupCollection*>(item);
         // Clone all Pickupables this PickupCollection consist of.
         for(std::vector<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
@@ -297 +297 @@
         This is used internally by the CollectiblePickup class.
     @param changed
-        The value the used status has changed to. 
+        The value the used status has changed to.
     */
     void PickupCollection::pickupChangedUsed(bool changed)

code/branches/presentation2012merge/src/modules/pickup/PickupSpawner.cc

@@ -199 +199 @@
 
                 Vector3 distance = it->getWorldPosition() - this->getWorldPosition();
-                PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(*it);
+                PickupCarrier* carrier = orxonox_cast<PickupCarrier*>(*it);
                 // If a PickupCarrier, that fits the target-range of the Pickupable spawned by this PickupSpawner, is in trigger-distance and the carrier is not blocked.
                 if(distance.length() < this->triggerDistance_ && carrier != NULL && this->blocked_.find(carrier) == this->blocked_.end())
@@ -303 +303 @@
             orxout(verbose, context::pickups) << "PickupSpawner (&" << this << ") triggered and active." << endl;
 
-            PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(pawn);
+            PickupCarrier* carrier = orxonox_cast<PickupCarrier*>(pawn);
             assert(carrier);
 

code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc

@@ -180 +180 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        SpaceShip* ship = dynamic_cast<SpaceShip*>(carrier);
+        SpaceShip* ship = orxonox_cast<SpaceShip*>(carrier);
 
         if(ship == NULL)
@@ -203 +203 @@
         SUPER(DamageBoostPickup, clone, item);
 
-        DamageBoostPickup* pickup = dynamic_cast<DamageBoostPickup*>(item);
+        DamageBoostPickup* pickup = orxonox_cast<DamageBoostPickup*>(item);
         pickup->setDuration(this->getDuration());
         pickup->setDamageMultiplier(this->getDamageMultiplier());

code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc

@@ -144 +144 @@
 
                 Controller* controller = drone->getController();
-                DroneController* droneController = dynamic_cast<DroneController*>(controller);
+                DroneController* droneController = orxonox_cast<DroneController*>(controller);
                 if(droneController != NULL)
                 {
@@ -175 +175 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+        Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
         if(pawn == NULL)
@@ -198 +198 @@
         SUPER(DronePickup, clone, item);
 
-        DronePickup* pickup = dynamic_cast<DronePickup*>(item);
+        DronePickup* pickup = orxonox_cast<DronePickup*>(item);
         pickup->setDroneTemplate(this->getDroneTemplate());
 

code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.cc

@@ -230 +230 @@
             {
                 PickupCarrier* carrier = this->getCarrier();
-                Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+                Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
                 if(pawn == NULL)
@@ -264 +264 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+        Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
         if(pawn == NULL)
@@ -285 +285 @@
         SUPER(HealthPickup, clone, item);
 
-        HealthPickup* pickup = dynamic_cast<HealthPickup*>(item);
+        HealthPickup* pickup = orxonox_cast<HealthPickup*>(item);
         pickup->setHealth(this->getHealth());
         pickup->setHealthRate(this->getHealthRate());

code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc

@@ -159 +159 @@
         SUPER(InvisiblePickup, clone, item);
 
-        InvisiblePickup* pickup = dynamic_cast<InvisiblePickup*>(item);
+        InvisiblePickup* pickup = orxonox_cast<InvisiblePickup*>(item);
         pickup->setDuration(this->getDuration());
         pickup->initializeIdentifier();
@@ -202 +202 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+        Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
         if(pawn == NULL)

code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc

@@ -172 +172 @@
         SUPER(MetaPickup, clone, item);
 
-        MetaPickup* pickup = dynamic_cast<MetaPickup*>(item);
+        MetaPickup* pickup = orxonox_cast<MetaPickup*>(item);
         pickup->setMetaTypeDirect(this->getMetaTypeDirect());
 

code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc

@@ -177 +177 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+        Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
         if(pawn == NULL)
@@ -199 +199 @@
         SUPER(ShieldPickup, clone, item);
 
-        ShieldPickup* pickup = dynamic_cast<ShieldPickup*>(item);
+        ShieldPickup* pickup = orxonox_cast<ShieldPickup*>(item);
         pickup->setDuration(this->getDuration());
         pickup->setShieldAbsorption(this->getShieldAbsorption());

code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc

@@ -148 +148 @@
     {
         SUPER(ShrinkPickup, changedPickedUp);
-        
+
         if(!this->isPickedUp() && this->isActive_)
         {
@@ -271 +271 @@
 
                 bool destroy = false;
-                
+
                 // Stop shrinking if the desired size is reached.
                 if(this->timeRemainig_ <= 0.0f)
@@ -314 +314 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        Pawn* pawn = dynamic_cast<Pawn*>(carrier);
+        Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
         return pawn;
@@ -331 +331 @@
 
         SUPER(ShrinkPickup, clone, item);
-        ShrinkPickup* pickup = dynamic_cast<ShrinkPickup*>(item);
+        ShrinkPickup* pickup = orxonox_cast<ShrinkPickup*>(item);
         pickup->setShrinkFactor(this->getShrinkFactor());
         pickup->setDuration(this->getDuration());

code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc

@@ -176 +176 @@
     {
         PickupCarrier* carrier = this->getCarrier();
-        SpaceShip* ship = dynamic_cast<SpaceShip*>(carrier);
+        SpaceShip* ship = orxonox_cast<SpaceShip*>(carrier);
 
         if(ship == NULL)
@@ -199 +199 @@
         SUPER(SpeedPickup, clone, item);
 
-        SpeedPickup* pickup = dynamic_cast<SpeedPickup*>(item);
+        SpeedPickup* pickup = orxonox_cast<SpeedPickup*>(item);
         pickup->setDuration(this->getDuration());
         pickup->setSpeedAdd(this->getSpeedAdd());

code/branches/presentation2012merge/src/modules/weapons/RocketController.cc

@@ -53 +53 @@
         this->rocket_ = new SimpleRocket(this);
         this->rocket_->setController(this);
-        this->setControllableEntity(dynamic_cast<ControllableEntity*> (this->rocket_));
+        this->setControllableEntity(orxonox_cast<ControllableEntity*>(this->rocket_));
     }
 

code/branches/presentation2012merge/src/orxonox/controllers/NewHumanController.cc

@@ -298 +298 @@
         //Used in HumanController for formationFlight
         HumanController::hit(originator,contactpoint,damage);
-        
+
         if (this->showDamageOverlay_ && !this->controlPaused_ && this->controllableEntity_ && !this->controllableEntity_->isInMouseLook())
         {
@@ -397 +397 @@
                 try
                 {
-                    wePtr = dynamic_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny()));
+                    wePtr = orxonox_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny()));
                 }
                 catch (...)

code/branches/presentation2012merge/src/orxonox/gamestates/GSRoot.cc

@@ -76 +76 @@
         for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it; ++it)
         {
-            if (dynamic_cast<Synchronisable*>(*it))
-                orxout(debug_output) << "object: " << it->getIdentifier()->getName() << " id: " << dynamic_cast<Synchronisable*>(*it)->getObjectID() << endl;
+            Synchronisable* synchronisable = orxonox_cast<Synchronisable*>(*it);
+            if (synchronisable)
+                orxout(debug_output) << "object: " << it->getIdentifier()->getName() << " id: " << synchronisable->getObjectID() << endl;
             else
                 orxout(debug_output) << "object: " << it->getIdentifier()->getName() << endl;

code/branches/presentation2012merge/src/orxonox/gametypes/Dynamicmatch.cc

@@ -151 +151 @@
 
                 //Give new pig boost
-                SpaceShip* spaceship = dynamic_cast<SpaceShip*>(victim);
+                SpaceShip* spaceship = orxonox_cast<SpaceShip*>(victim);
                 this->grantPigBoost(spaceship);
             }
@@ -245 +245 @@
                 }
                 //Give new pig boost
-                SpaceShip* spaceship = dynamic_cast<SpaceShip*>(victim);
+                SpaceShip* spaceship = orxonox_cast<SpaceShip*>(victim);
                 this->grantPigBoost(spaceship);
             }
@@ -426 +426 @@
     {
         std::map<PlayerInfo*, int>::const_iterator it_player = this->playerParty_.find(player);
-        Pawn* pawn = dynamic_cast<Pawn*>(player->getControllableEntity());
+        Pawn* pawn = orxonox_cast<Pawn*>(player->getControllableEntity());
             if (pawn)
             {

code/branches/presentation2012merge/src/orxonox/gametypes/LastManStanding.cc

@@ -211 +211 @@
             if(!player->getControllableEntity())
                 return;
-            Pawn* pawn = dynamic_cast<Pawn*>(player->getControllableEntity());
+            Pawn* pawn = orxonox_cast<Pawn*>(player->getControllableEntity());
             if(!pawn)
                 return;

code/branches/presentation2012merge/src/orxonox/gametypes/LastTeamStanding.cc

@@ -283 +283 @@
             if(!player->getControllableEntity())
                 return;
-            Pawn* pawn = dynamic_cast<Pawn*>(player->getControllableEntity());
+            Pawn* pawn = orxonox_cast<Pawn*>(player->getControllableEntity());
             if(!pawn)
                 return;

code/branches/presentation2012merge/src/orxonox/interfaces/Pickupable.cc

@@ -338 +338 @@
         this->clone(item);
 
-        Pickupable* pickup = dynamic_cast<Pickupable*>(item);
+        Pickupable* pickup = orxonox_cast<Pickupable*>(item);
 
         orxout(verbose, context::pickups) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << endl;

code/branches/presentation2012merge/src/orxonox/worldentities/ControllableEntity.cc

@@ -266 +266 @@
                 this->cameraPositionRootNode_->_update(true, false); // update the camera node because otherwise the camera will drag back in position which looks strange
 
-                NewHumanController* controller = dynamic_cast<NewHumanController*>(this->getController());
+                NewHumanController* controller = orxonox_cast<NewHumanController*>(this->getController());
                 if (controller)
                     controller->centerCursor();