Changeset 1024 for code/trunk/src/orxonox/Orxonox.cc

Timestamp:

Apr 10, 2008, 5:35:49 PM (16 years ago)

Author:

rgrieder

Message:

merged input back into trunk
note: I have created an asylum with obsolete code, please check the files

File:

• code/trunk/src/orxonox/Orxonox.cc (modified) (8 diffs)

code/trunk/src/orxonox/Orxonox.cc

@@ -50 +50 @@
 //misc
 //#include "util/Sleep.h"
+#include "util/ArgReader.h"
 
 // audio
@@ -61 +62 @@
 
 // objects
-#include "core/ArgReader.h"
 #include "core/Debug.h"
 #include "core/Factory.h"
@@ -70 +70 @@
 #include "objects/weapon/BulletManager.h"
 
-#include "InputHandler.h"
+#include "core/InputManager.h"
 
 #include "Orxonox.h"
@@ -108 +108 @@
       delete this->orxonoxHUD_;
     Loader::close();
-    InputHandler::destroy();
+    InputManager::destroySingleton();
     if (this->auMan_)
       delete this->auMan_;
@@ -147 +147 @@
       singletonRef_s = new Orxonox();
     return singletonRef_s;
-    //static Orxonox theOnlyInstance;
-    //return &theOnlyInstance;
   }
 
@@ -154 +152 @@
     @brief Destroys the Orxonox singleton.
   */
-  void Orxonox::destroy()
+  void Orxonox::destroySingleton()
   {
     if (singletonRef_s)
@@ -174 +172 @@
     std::string mode;
 
-    ArgReader ar = ArgReader(argc, argv);
+    ArgReader ar(argc, argv);
     ar.checkArgument("mode", mode, false);
     ar.checkArgument("data", this->dataPath_, false);
@@ -327 +325 @@
   void Orxonox::setupInputSystem()
   {
-    inputHandler_ = InputHandler::getSingleton();
+    inputHandler_ = InputManager::getSingleton();
     if (!inputHandler_->initialise(ogre_->getWindowHandle(),
           ogre_->getWindowWidth(), ogre_->getWindowHeight()))
       abortImmediate();
+    inputHandler_->setInputMode(IM_INGAME);
   }