[Orxonox-commit 1559] r6277 - in code/branches/presentation2/src: libraries/core libraries/util modules/weapons/projectiles

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-12-09 09:23:28 +0100 (Wed, 09 Dec 2009)
New Revision: 6277

Modified:
   code/branches/presentation2/src/libraries/core/Game.cc
   code/branches/presentation2/src/libraries/core/OrxonoxClass.cc
   code/branches/presentation2/src/libraries/util/OutputHandler.cc
   code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc
Log:
Small changes, optimisations and typos.

Modified: code/branches/presentation2/src/libraries/core/Game.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/Game.cc	2009-12-08 23:21:40 UTC (rev 6276)
+++ code/branches/presentation2/src/libraries/core/Game.cc	2009-12-09 08:23:28 UTC (rev 6277)
@@ -177,7 +177,7 @@
             // Update the GameState stack if required
             this->updateGameStateStack();
 
-            // Core preUpdate (doesn't throw)
+            // Core preUpdate
             try
                 { this->core_->preUpdate(*this->gameClock_); }
             catch (...)
@@ -191,7 +191,7 @@
             // Update the GameStates bottom up in the stack
             this->updateGameStates();
 
-            // Core postUpdate (doesn't throw)
+            // Core postUpdate
             try
                 { this->core_->postUpdate(*this->gameClock_); }
             catch (...)
@@ -205,7 +205,7 @@
             // Evaluate statistics
             this->updateStatistics();
 
-            // Limit framerate
+            // Limit frame rate
             this->updateFPSLimiter();
         }
 

Modified: code/branches/presentation2/src/libraries/core/OrxonoxClass.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/OrxonoxClass.cc	2009-12-08 23:21:40 UTC (rev 6276)
+++ code/branches/presentation2/src/libraries/core/OrxonoxClass.cc	2009-12-09 08:23:28 UTC (rev 6277)
@@ -48,6 +48,8 @@
         this->metaList_ = new MetaObjectList();
         this->referenceCount_ = 0;
         this->requestedDestruction_ = false;
+        // Optimisation
+        this->objectPointers_.reserve(6);
     }
 
     /** @brief Destructor: Deletes, if existing, the list of the parents. */

Modified: code/branches/presentation2/src/libraries/util/OutputHandler.cc
===================================================================
--- code/branches/presentation2/src/libraries/util/OutputHandler.cc	2009-12-08 23:21:40 UTC (rev 6276)
+++ code/branches/presentation2/src/libraries/util/OutputHandler.cc	2009-12-09 08:23:28 UTC (rev 6277)
@@ -38,6 +38,7 @@
 #include <ctime>
 #include <cstdlib>
 #include <fstream>
+#include <iostream>
 #include <sstream>
 
 #include "Debug.h"

Modified: code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc
===================================================================
--- code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc	2009-12-08 23:21:40 UTC (rev 6276)
+++ code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc	2009-12-09 08:23:28 UTC (rev 6277)
@@ -52,6 +52,7 @@
 
         if (GameMode::isMaster())
         {
+            this->setMass(1.0);
             this->enableCollisionCallback();
             this->setCollisionResponse(false);
             this->setCollisionType(Kinematic);