Changeset 917 for code/branches/network/src/orxonox/Orxonox.h

Timestamp:

Mar 21, 2008, 6:14:31 PM (17 years ago)

Author:

rgrieder

Message:

• merged all changes in the input branch into this one
• moved Tickable to core (would have created circular library dependencies)
• exported OrxListener to a separate file, soon to be deleted

changed

, &&, XOR back to or, and, xor because I found the necessary include file for VC++

• created abortRequest() in Orxonox.cc to call for a smooth end of the game (an alternative would be to make tick() return a boolean, like it is with frameStarted())

File:

• code/branches/network/src/orxonox/Orxonox.h (modified) (4 diffs)

code/branches/network/src/orxonox/Orxonox.h

@@ -9 +9 @@
 
 #include <string>
+#include <deque>
 
 #include <OgrePrerequisites.h>
@@ -37 +38 @@
       // not sure if this should be private
       void die(/* some error code */);
+      void abortRequest();
       static Orxonox* getSingleton();
       inline Ogre::SceneManager* getSceneManager()         { return ogre_->getSceneManager(); };
@@ -65 +67 @@
       void createFrameListener();
       void startRenderLoop();
+      void mainLoop();
+      void updateTimers(float);
+      float calculateEventTime(unsigned long, std::deque<unsigned long>&);
 
     private:
@@ -78 +83 @@
       OrxListener*          frameListener_;
       Ogre::Root*           root_;
+      // TODO: make this a config-value by creating a config class for orxonox
+      float                 frameSmoothingTime_;
+      // little hack to actually show something dynamic in the HUD
+      HUD*                  orxonoxHUD_;
+      bool                  bAbort_;
 
       // this is used to identify the mode (server/client/...) we're in