Changeset 2809 for code/trunk/src/orxonox/objects

Timestamp:

Mar 21, 2009, 3:14:46 PM (16 years ago)

Author:

landauf

Message:

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.

Location:

code/trunk/src/orxonox/objects

Files:

• items/MultiStateEngine.cc (modified) (1 diff)
• weaponSystem/projectiles/Projectile.cc (modified) (1 diff)
• worldentities/Backlight.cc (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (1 diff)
• worldentities/pawns/SpaceShip.cc (modified) (1 diff)

code/trunk/src/orxonox/objects/items/MultiStateEngine.cc

@@ -136 +136 @@
         }
 
-        Engine::tick(dt);
+        SUPER(MultiStateEngine, tick, dt);
     }
 

code/trunk/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc

@@ -82 +82 @@
     void Projectile::tick(float dt)
     {
-        MovableEntity::tick(dt);
+        SUPER(Projectile, tick, dt);
 
         if (!this->isActive())

code/trunk/src/orxonox/objects/worldentities/Backlight.cc

@@ -218 +218 @@
         }
 
-        FadingBillboard::tick(dt);
+        SUPER(Backlight, tick, dt);
 
         if (this->ribbonTrail_ && this->changedirection_ != 0)

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -115 +115 @@
     void Pawn::tick(float dt)
     {
-        ControllableEntity::tick(dt);
+        SUPER(Pawn, tick, dt);
 
         if (this->weaponSystem_)

code/trunk/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

@@ -117 +117 @@
     void SpaceShip::tick(float dt)
     {
-        ControllableEntity::tick(dt);
+        SUPER(SpaceShip, tick, dt);
 
         if (this->hasLocalController())