Changeset 608 for code/branches/FICN/src/orxonox/orxonox.h

Timestamp:

Dec 18, 2007, 2:23:12 AM (16 years ago)

Author:

landauf

Message:

added SpaceShip class

File:

• code/branches/FICN/src/orxonox/orxonox.h (modified) (5 diffs)

code/branches/FICN/src/orxonox/orxonox.h

@@ -10 +10 @@
 //#include <OgreSingleton.h>
 #include <OgreSceneManager.h>
-
 #include <OIS/OIS.h>
 
@@ -29 +28 @@
     PRESENTATION
   };
-  
+
   class OrxListener;
 
@@ -42 +41 @@
       inline SceneManager* getSceneManager() { return ogre_->getSceneManager(); };
       inline GraphicsEngine* getOgrePointer() { return ogre_; };
-      inline SpaceshipSteering* getSteeringPointer() { return steering_; };
       inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };
+      inline OIS::Keyboard* getKeyboard() { return this->keyboard_; }
+      inline OIS::Mouse* getMouse() { return this->mouse_; }
+
     private:
       Orxonox();
@@ -63 +64 @@
       void createFrameListener();
       void startRenderLoop();
+
     private:
-
       GraphicsEngine*       ogre_;      //!< our dearest graphics engine <3
       std::string           dataPath_;  //!< path to data
       loader::LevelLoader*  loader_;    //!< level loader builds the scene
       audio::AudioManager*  auMan_;     //!< audio manager
-      SpaceshipSteering*        steering_;
       static Orxonox*       singletonRef_;
       OIS::Keyboard*        keyboard_;
@@ -76 +76 @@
       OrxListener*          frameListener_;
       Ogre::Root*           root_;
-      
+
       // this is used to identify the mode (server/client/...) we're in
       gameMode              mode_;