Changeset 1272 for code/branches/merge/src/orxonox/Orxonox.cc

Timestamp:

May 14, 2008, 11:44:17 AM (16 years ago)

Author:

rgrieder

Message:

merged input branch into merge branch

File:

• code/branches/merge/src/orxonox/Orxonox.cc (modified) (2 diffs)

code/branches/merge/src/orxonox/Orxonox.cc

@@ -290 +290 @@
     // The render window width and height are used to set up the mouse movement.
     if (!InputManager::initialise(ogre_->getWindowHandle(),
-          ogre_->getWindowWidth(), ogre_->getWindowHeight()))
+          ogre_->getWindowWidth(), ogre_->getWindowHeight(), true, true, true))
       return false;
 
@@ -495 +495 @@
       for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
         it->tick((float)evt.timeSinceLastFrame * this->timefactor_);
-      orxonoxConsole_->tick((float)evt.timeSinceLastFrame * this->timefactor_);
+      // Iterate through all TickableReals and call their tick(dt) function
+      for (Iterator<TickableReal> it = ObjectList<TickableReal>::start(); it; ++it)
+        it->tick((float)evt.timeSinceLastFrame);
+      orxonoxConsole_->tick((float)evt.timeSinceLastFrame);
 
       // don't forget to call _fireFrameStarted in ogre to make sure