Changeset 926 for code/branches/network/src/orxonox/Orxonox.h
- Timestamp:
- Mar 26, 2008, 1:44:51 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network/src/orxonox/Orxonox.h
r922 r926 9 9 10 10 #include <string> 11 #include <deque>12 11 13 12 #include <OgrePrerequisites.h> 14 #include <OIS/OISPrereqs.h>13 //#include <OIS/OISPrereqs.h> 15 14 16 15 #include "OrxonoxPrereqs.h" … … 43 42 inline GraphicsEngine* getOgrePointer() { return ogre_; }; 44 43 inline audio::AudioManager* getAudioManagerPointer() { return auMan_; }; 45 //inline OIS::Keyboard* getKeyboard() { return this->keyboard_; }46 //inline OIS::Mouse* getMouse() { return this->mouse_; }47 44 inline BulletManager* getBulletMgr() { return this->bulletMgr_; } 48 45 … … 58 55 void clientStart(); 59 56 void standaloneStart(); 60 void defineResources(); 61 void setupRenderSystem(); 62 void createRenderWindow(); 63 void initializeResourceGroups(); 57 64 58 void createScene(void); 65 void setupScene();66 59 void setupInputSystem(); 67 60 void startRenderLoop(); 68 void updateTimers(float);69 61 float calculateEventTime(unsigned long, std::deque<unsigned long>&); 70 62 … … 74 66 GraphicsEngine* ogre_; //!< our dearest graphics engine <3 75 67 std::string dataPath_; //!< path to data 76 // loader::LevelLoader* loader_; //!< level loader builds the scene77 68 audio::AudioManager* auMan_; //!< audio manager 78 69 BulletManager* bulletMgr_; //!< Keeps track of the thrown bullets 79 static Orxonox* singletonRef_;80 70 InputHandler* inputHandler_; 81 //OIS::Keyboard* keyboard_;82 //OIS::Mouse* mouse_;83 //OIS::InputManager* inputManager_;84 OrxListener* frameListener_;85 71 Ogre::Root* root_; 86 72 // TODO: make this a config-value by creating a config class for orxonox … … 88 74 // little hack to actually show something dynamic in the HUD 89 75 HUD* orxonoxHUD_; 90 bool bAbort_; 76 bool bAbort_; //!< aborts the render loop if true 91 77 92 78 // this is used to identify the mode (server/client/...) we're in
Note: See TracChangeset
for help on using the changeset viewer.