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

Timestamp:

Mar 24, 2008, 1:12:31 PM (16 years ago)

Author:

rgrieder

Message:

• AudioManager is now Tickable
• NPC update moved to its tick-function
• corrected CMakeLists
• added a few window properties to GraphicsEngine
• OrxListener has been completely replaced

File:

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

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

@@ -42 +42 @@
       inline GraphicsEngine* getOgrePointer()              { return ogre_; };
       inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
-      inline OIS::Keyboard* getKeyboard()                  { return this->keyboard_; }
-      inline OIS::Mouse* getMouse()                        { return this->mouse_; }
+      //inline OIS::Keyboard* getKeyboard()                  { return this->keyboard_; }
+      //inline OIS::Mouse* getMouse()                        { return this->mouse_; }
       inline BulletManager* getBulletMgr()                 { return this->bulletMgr_; }
 
@@ -64 +64 @@
       void setupScene();
       void setupInputSystem();
-      void createFrameListener();
       void startRenderLoop();
-      void mainLoop();
       void updateTimers(float);
       float calculateEventTime(unsigned long, std::deque<unsigned long>&);
@@ -77 +75 @@
       BulletManager*        bulletMgr_;     //!< Keeps track of the thrown bullets
       static Orxonox*       singletonRef_;
-      OIS::Keyboard*        keyboard_;
-      OIS::Mouse*           mouse_;
-      OIS::InputManager*    inputManager_;
+      InputHandler*         inputHandler_;
+      //OIS::Keyboard*        keyboard_;
+      //OIS::Mouse*           mouse_;
+      //OIS::InputManager*    inputManager_;
       OrxListener*          frameListener_;
       Ogre::Root*           root_;