Changeset 161 for code/branches/main_reto_vs05/include/ogre_control.h

Timestamp:

Nov 4, 2007, 5:00:41 PM (17 years ago)

Author:

rgrieder

Message:

• added namespace Orxonox to every file
  • removed all the "using namespace Ogre" in the header files
• cleaned up with the includes: attempt to include as little as possible to reduce compile time.
  • created a header file: orxonox_prerequisites.h
  • used OgrePrerequisites in the header files
  • avoided including "Ogre.h", using separate files instead
• created empty class: AmmunitionDump

File:

• code/branches/main_reto_vs05/include/ogre_control.h (modified) (1 diff)

code/branches/main_reto_vs05/include/ogre_control.h

@@ -30 +30 @@
 #define OGRE_CONTROL_H
 
-#include "Ogre.h"
-#include "OgreConfigFile.h"
+#include "OgrePrerequisites.h"
+
+#include "Orxonox_prerequisites.h"
 
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-#include <CoreFoundation/CoreFoundation.h>
-#endif
+namespace Orxonox {
 
-using namespace Ogre;
+  class OgreControl
+  {
+  public:
+          OgreControl();
 
-class OgreControl
-{
-public:
-        OgreControl();
+          virtual ~OgreControl();
 
-        virtual ~OgreControl();
+          /** Sets up the application - returns false if the user chooses to abandon configuration. */
+          virtual bool initialise();
 
-        /** Sets up the application - returns false if the user chooses to abandon configuration. */
-        virtual bool initialise();
+    virtual Ogre::Root* getRoot();
 
-        virtual Root* getRoot();
+          virtual Ogre::RenderWindow* getRenderWindow();
 
-        virtual RenderWindow* getRenderWindow();
+          virtual Ogre::String getResourcePath();
 
-        virtual Ogre::String getResourcePath();
+  protected:
+          /** Configures the application - returns false if the user chooses to abandon configuration. */
+          virtual bool configure(void);
 
-protected:
-        /** Configures the application - returns false if the user chooses to abandon configuration. */
-        virtual bool configure(void);
+          /// Method which will define the source of resources (other than current folder)
+          virtual void setupResources(void);
 
-        /// Method which will define the source of resources (other than current folder)
-        virtual void setupResources(void);
+  protected:
+          Ogre::Root         *root_;
+          Ogre::RenderWindow *window_;
+          Ogre::String  resourcePath_;
 
-protected:
-        Root         *root_;
-        RenderWindow *window_;
-        Ogre::String  resourcePath_;
+  };
 
-};
+}
 
 #endif /* OGRE_CONTROL_H */