Changeset 321 for code/branches/merger/src/orxonox.cc

Timestamp:

Nov 28, 2007, 3:55:58 PM (17 years ago)

Author:

nicolasc

Message:

some better merge

File:

• code/branches/merger/src/orxonox.cc (modified) (3 diffs)

code/branches/merger/src/orxonox.cc

@@ -76 +76 @@
 }
 #endif
-
 
 using namespace Ogre;
@@ -311 +310 @@
 
 
-      void setupScene()
-      {
-// <<<<<<< .working
-//         Ogre::SceneManager *mgr = mRoot->createSceneManager(Ogre::ST_GENERIC, "Default SceneManager");
-//         Ogre::Camera *cam = mgr->createCamera("Camera");
-//         Ogre::Viewport *vp = mRoot->getAutoCreatedWindow()->addViewport(cam);
-// =======
-        mKeyboard = static_cast<OIS::Keyboard*>(mInputManager->createInputObject(OIS::OISKeyboard, false));
-        mMouse = static_cast<OIS::Mouse*>(mInputManager->createInputObject(OIS::OISMouse, true));
-
-      }
-
       void setupInputSystem()
       {
@@ -384 +371 @@
   try
   {
-    orxonox::OrxApplication orxonox;
+    OrxApplication orxonox;
     orxonox.go();
   }