Changeset 266 for code/branches/objecthierarchy/src

Timestamp:

Nov 26, 2007, 5:26:36 PM (17 years ago)

Author:

landauf

Message:

spacing in oh-branch

File:

• code/branches/objecthierarchy/src/orxonox/orxonox.cc (modified) (2 diffs)

code/branches/objecthierarchy/src/orxonox/orxonox.cc

@@ -83 +83 @@
 namespace orxonox
 {
-    class OrxExitListener : public Ogre::FrameListener
-    {
-      public:
-        OrxExitListener(OIS::Keyboard *keyboard)
-      : mKeyboard(keyboard)
-        {
-        }
-
-        bool frameStarted(const Ogre::FrameEvent& evt)
-        {
-          mKeyboard->capture();
-          return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);
-        }
-
-      private:
-        OIS::Keyboard *mKeyboard;
-    };
-
-    class OrxApplication
-    {
-      public:
-        void go()
-        {
-/*
-          createRoot();
-          defineResources();
-          setupRenderSystem();
-          createRenderWindow();
-          initializeResourceGroups();
-          createScene();
-          setupScene();
-          setupInputSystem();
-          setupCEGUI();
-          createFrameListener();
-          startRenderLoop();
+  class OrxExitListener : public Ogre::FrameListener
+  {
+    public:
+      OrxExitListener(OIS::Keyboard *keyboard)
+    : mKeyboard(keyboard)
+      {
+      }
+
+      bool frameStarted(const Ogre::FrameEvent& evt)
+      {
+        mKeyboard->capture();
+        return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);
+      }
+
+    private:
+      OIS::Keyboard *mKeyboard;
+  };
+
+  class OrxApplication
+  {
+    public:
+      void go()
+      {
+/*
+        createRoot();
+        defineResources();
+        setupRenderSystem();
+        createRenderWindow();
+        initializeResourceGroups();
+        createScene();
+        setupScene();
+        setupInputSystem();
+        setupCEGUI();
+        createFrameListener();
+        startRenderLoop();
 */
 
@@ -583 +583 @@
         std::cout << "13\n";
 
-        }
-
-        ~OrxApplication()
+      }
+
+      ~OrxApplication()
+      {
+        mInputManager->destroyInputObject(mKeyboard);
+        OIS::InputManager::destroyInputSystem(mInputManager);
+
+//        delete mRenderer;
+//        delete mSystem;
+
+        delete mListener;
+        delete mRoot;
+      }
+
+    private:
+      Ogre::Root *mRoot;
+      OIS::Keyboard *mKeyboard;
+      OIS::Mouse *mMouse;
+      OIS::InputManager *mInputManager;
+      CEGUI::OgreCEGUIRenderer *mRenderer;
+      CEGUI::System *mSystem;
+      OrxExitListener *mListener;
+
+      void createRoot()
+      {
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+        mRoot = new Ogre::Root(macBundlePath() + "/Contents/Resources/plugins.cfg");
+#else
+        mRoot = new Ogre::Root();
+#endif
+      }
+
+      void defineResources()
+      {
+        Ogre::String secName, typeName, archName;
+        Ogre::ConfigFile cf;
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+        cf.load(macBundlePath() + "/Contents/Resources/resources.cfg");
+#else
+        cf.load("resources.cfg");
+#endif
+
+        Ogre::ConfigFile::SectionIterator seci = cf.getSectionIterator();
+        while (seci.hasMoreElements())
         {
-          mInputManager->destroyInputObject(mKeyboard);
-          OIS::InputManager::destroyInputSystem(mInputManager);
-
-    //       delete mRenderer;
-    //       delete mSystem;
-
-          delete mListener;
-          delete mRoot;
-        }
-
-      private:
-        Ogre::Root *mRoot;
-        OIS::Keyboard *mKeyboard;
-        OIS::Mouse *mMouse;
-        OIS::InputManager *mInputManager;
-        CEGUI::OgreCEGUIRenderer *mRenderer;
-        CEGUI::System *mSystem;
-        OrxExitListener *mListener;
-
-        void createRoot()
-        {
-    #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-          mRoot = new Ogre::Root(macBundlePath() + "/Contents/Resources/plugins.cfg");
-    #else
-          mRoot = new Ogre::Root();
-    #endif
-        }
-
-        void defineResources()
-        {
-          Ogre::String secName, typeName, archName;
-          Ogre::ConfigFile cf;
-    #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-          cf.load(macBundlePath() + "/Contents/Resources/resources.cfg");
-    #else
-          cf.load("resources.cfg");
-    #endif
-
-          Ogre::ConfigFile::SectionIterator seci = cf.getSectionIterator();
-          while (seci.hasMoreElements())
+          secName = seci.peekNextKey();
+          Ogre::ConfigFile::SettingsMultiMap *settings = seci.getNext();
+          Ogre::ConfigFile::SettingsMultiMap::iterator i;
+          for (i = settings->begin(); i != settings->end(); ++i)
           {
-            secName = seci.peekNextKey();
-            Ogre::ConfigFile::SettingsMultiMap *settings = seci.getNext();
-            Ogre::ConfigFile::SettingsMultiMap::iterator i;
-            for (i = settings->begin(); i != settings->end(); ++i)
-            {
-              typeName = i->first;
-              archName = i->second;
-    #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
-              Ogre::ResourceGroupManager::getSingleton().addResourceLocation( String(macBundlePath() + "/" + archName), typeName, secName);
-    #else
-              Ogre::ResourceGroupManager::getSingleton().addResourceLocation( archName, typeName, secName);
-    #endif
-            }
+            typeName = i->first;
+            archName = i->second;
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+            Ogre::ResourceGroupManager::getSingleton().addResourceLocation( String(macBundlePath() + "/" + archName), typeName, secName);
+#else
+            Ogre::ResourceGroupManager::getSingleton().addResourceLocation( archName, typeName, secName);
+#endif
           }
         }
-
-        void setupRenderSystem()
+      }
+
+      void setupRenderSystem()
+      {
+        if (!mRoot->restoreConfig() && !mRoot->showConfigDialog())
+          throw Ogre::Exception(52, "User canceled the config dialog!", "OrxApplication::setupRenderSystem()");
+      }
+
+      void createRenderWindow()
+      {
+        mRoot->initialise(true, "Ogre Render Window");
+      }
+
+      void initializeResourceGroups()
+      {
+        Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
+        Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+      }
+
+      void createScene(void)
+      {
+
+        string levelFile = "sp_level_moonstation.oxw";
+        loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
+      }
+
+      void setupScene()
+      {
+        Ogre::SceneManager *mgr = mRoot->createSceneManager(Ogre::ST_GENERIC, "Default SceneManager");
+        Ogre::Camera *cam = mgr->createCamera("Camera");
+        Ogre::Viewport *vp = mRoot->getAutoCreatedWindow()->addViewport(cam);
+      }
+
+      void setupInputSystem()
+      {
+        size_t windowHnd = 0;
+        std::ostringstream windowHndStr;
+        OIS::ParamList pl;
+        Ogre::RenderWindow *win = mRoot->getAutoCreatedWindow();
+
+        win->getCustomAttribute("WINDOW", &windowHnd);
+        windowHndStr << windowHnd;
+        pl.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
+        mInputManager = OIS::InputManager::createInputSystem(pl);
+
+        try
         {
-          if (!mRoot->restoreConfig() && !mRoot->showConfigDialog())
-            throw Ogre::Exception(52, "User canceled the config dialog!", "OrxApplication::setupRenderSystem()");
+          mKeyboard = static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard, false));
+          mMouse = static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, false));
         }
-
-        void createRenderWindow()
+        catch (const OIS::Exception &e)
         {
-          mRoot->initialise(true, "Ogre Render Window");
+          throw new Ogre::Exception(42, e.eText, "OrxApplication::setupInputSystem");
         }
-
-        void initializeResourceGroups()
-        {
-          Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
-          Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
-        }
-
-        void createScene(void)
-        {
-
-          string levelFile = "sp_level_moonstation.oxw";
-          loader::LevelLoader* loader = new loader::LevelLoader(levelFile);
-        }
-
-        void setupScene()
-        {
-          Ogre::SceneManager *mgr = mRoot->createSceneManager(Ogre::ST_GENERIC, "Default SceneManager");
-          Ogre::Camera *cam = mgr->createCamera("Camera");
-          Ogre::Viewport *vp = mRoot->getAutoCreatedWindow()->addViewport(cam);
-        }
-
-        void setupInputSystem()
-        {
-          size_t windowHnd = 0;
-          std::ostringstream windowHndStr;
-          OIS::ParamList pl;
-          Ogre::RenderWindow *win = mRoot->getAutoCreatedWindow();
-
-          win->getCustomAttribute("WINDOW", &windowHnd);
-          windowHndStr << windowHnd;
-          pl.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
-          mInputManager = OIS::InputManager::createInputSystem(pl);
-
-          try
-          {
-            mKeyboard = static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard, false));
-            mMouse = static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, false));
-          }
-          catch (const OIS::Exception &e)
-          {
-            throw new Ogre::Exception(42, e.eText, "OrxApplication::setupInputSystem");
-          }
-        }
-
-        void setupCEGUI()
-        {
-          Ogre::SceneManager *mgr = mRoot->getSceneManager("Default SceneManager");
-          Ogre::RenderWindow *win = mRoot->getAutoCreatedWindow();
-
-          // CEGUI setup
-    //       mRenderer = new CEGUI::OgreCEGUIRenderer(win, Ogre::RENDER_QUEUE_OVERLAY, false, 3000, mgr);
-    //       mSystem = new CEGUI::System(mRenderer);
-
-          // Other CEGUI setup here.
-        }
-
-        void createFrameListener()
-        {
-          mListener = new OrxExitListener(mKeyboard);
-          mRoot->addFrameListener(mListener);
-        }
-
-        void startRenderLoop()
-        {
-          mRoot->startRendering();
-        }
-    };
+      }
+
+      void setupCEGUI()
+      {
+        Ogre::SceneManager *mgr = mRoot->getSceneManager("Default SceneManager");
+        Ogre::RenderWindow *win = mRoot->getAutoCreatedWindow();
+
+        // CEGUI setup
+//        mRenderer = new CEGUI::OgreCEGUIRenderer(win, Ogre::RENDER_QUEUE_OVERLAY, false, 3000, mgr);
+//        mSystem = new CEGUI::System(mRenderer);
+
+        // Other CEGUI setup here.
+      }
+
+      void createFrameListener()
+      {
+        mListener = new OrxExitListener(mKeyboard);
+        mRoot->addFrameListener(mListener);
+      }
+
+      void startRenderLoop()
+      {
+        mRoot->startRendering();
+      }
+  };
 }