[Orxonox-commit 116] r2809 - in trunk/src/orxonox/objects: items weaponSystem/projectiles worldentities worldentities/pawns

[landauf at orxonox.net]

Author: landauf
Date: 2009-03-21 14:14:46 +0000 (Sat, 21 Mar 2009)
New Revision: 2809

Modified:
   trunk/src/orxonox/objects/items/MultiStateEngine.cc
   trunk/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc
   trunk/src/orxonox/objects/worldentities/Backlight.cc
   trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc
   trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc
Log:
reverted commit 2782 which was:
> Another 15% performance boost in dedicated mode, 30 bots, no clients.
> I hope this is not such a big problem if the 5 most important ticks don't use SUPER.

There are two reasons for the reverting:
1) We can't just remove SUPER in the currently most important classes, this will change over time and we need a general solution for the (indeed noticeable) performance problem. Until then we keep is as consistent as possible.

2) SpaceShip inherits from Pawn and not from ControllableEntity... that's why shooting didn't worked after r2782. In fact that's exactly why we use SUPER.


Modified: trunk/src/orxonox/objects/items/MultiStateEngine.cc
===================================================================
--- trunk/src/orxonox/objects/items/MultiStateEngine.cc	2009-03-21 00:07:53 UTC (rev 2808)
+++ trunk/src/orxonox/objects/items/MultiStateEngine.cc	2009-03-21 14:14:46 UTC (rev 2809)
@@ -135,7 +135,7 @@
             }
         }
 
-        Engine::tick(dt);
+        SUPER(MultiStateEngine, tick, dt);
     }
 
     void MultiStateEngine::addToSpaceShip(SpaceShip* ship)

Modified: trunk/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc
===================================================================
--- trunk/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc	2009-03-21 00:07:53 UTC (rev 2808)
+++ trunk/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc	2009-03-21 14:14:46 UTC (rev 2809)
@@ -81,7 +81,7 @@
 
     void Projectile::tick(float dt)
     {
-        MovableEntity::tick(dt);
+        SUPER(Projectile, tick, dt);
 
         if (!this->isActive())
             return;

Modified: trunk/src/orxonox/objects/worldentities/Backlight.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/Backlight.cc	2009-03-21 00:07:53 UTC (rev 2808)
+++ trunk/src/orxonox/objects/worldentities/Backlight.cc	2009-03-21 14:14:46 UTC (rev 2809)
@@ -217,7 +217,7 @@
             }
         }
 
-        FadingBillboard::tick(dt);
+        SUPER(Backlight, tick, dt);
 
         if (this->ribbonTrail_ && this->changedirection_ != 0)
         {

Modified: trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc	2009-03-21 00:07:53 UTC (rev 2808)
+++ trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc	2009-03-21 14:14:46 UTC (rev 2809)
@@ -114,7 +114,7 @@
 
     void Pawn::tick(float dt)
     {
-        ControllableEntity::tick(dt);
+        SUPER(Pawn, tick, dt);
 
         if (this->weaponSystem_)
         {

Modified: trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc	2009-03-21 00:07:53 UTC (rev 2808)
+++ trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc	2009-03-21 14:14:46 UTC (rev 2809)
@@ -116,7 +116,7 @@
 
     void SpaceShip::tick(float dt)
     {
-        ControllableEntity::tick(dt);
+        SUPER(SpaceShip, tick, dt);
 
         if (this->hasLocalController())
         {