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

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-03-13 10:56:03 +0000 (Fri, 13 Mar 2009)
New Revision: 2782

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:
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.

Modified: trunk/src/orxonox/objects/items/MultiStateEngine.cc
===================================================================
--- trunk/src/orxonox/objects/items/MultiStateEngine.cc	2009-03-12 21:42:56 UTC (rev 2781)
+++ trunk/src/orxonox/objects/items/MultiStateEngine.cc	2009-03-13 10:56:03 UTC (rev 2782)
@@ -135,7 +135,7 @@
             }
         }
 
-        SUPER(MultiStateEngine, tick, dt);
+        Engine::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-12 21:42:56 UTC (rev 2781)
+++ trunk/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc	2009-03-13 10:56:03 UTC (rev 2782)
@@ -81,7 +81,7 @@
 
     void Projectile::tick(float dt)
     {
-        SUPER(Projectile, tick, dt);
+        MovableEntity::tick(dt);
 
         if (!this->isActive())
             return;

Modified: trunk/src/orxonox/objects/worldentities/Backlight.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/Backlight.cc	2009-03-12 21:42:56 UTC (rev 2781)
+++ trunk/src/orxonox/objects/worldentities/Backlight.cc	2009-03-13 10:56:03 UTC (rev 2782)
@@ -217,7 +217,7 @@
             }
         }
 
-        SUPER(Backlight, tick, dt);
+        FadingBillboard::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-12 21:42:56 UTC (rev 2781)
+++ trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc	2009-03-13 10:56:03 UTC (rev 2782)
@@ -114,7 +114,7 @@
 
     void Pawn::tick(float dt)
     {
-        SUPER(Pawn, tick, dt);
+        ControllableEntity::tick(dt);
 
         if (this->weaponSystem_)
         {

Modified: trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc	2009-03-12 21:42:56 UTC (rev 2781)
+++ trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc	2009-03-13 10:56:03 UTC (rev 2782)
@@ -116,7 +116,7 @@
 
     void SpaceShip::tick(float dt)
     {
-        SUPER(SpaceShip, tick, dt);
+        ControllableEntity::tick(dt);
 
         if (this->hasLocalController())
         {