Changeset 971

Timestamp:

Apr 2, 2008, 9:44:33 PM (16 years ago)

Author:

rgrieder

Message:

• added some empty class files
• moved input stuff to core

Location:

code/branches/input

Files:

• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/OrxonoxPlatform.h (modified) (1 diff)
• src/orxonox/core/CMakeLists.txt (modified) (1 diff)
• src/orxonox/core/InputEvent.h (moved) (moved from code/branches/input/src/orxonox/InputEvent.h) (1 diff)
• src/orxonox/core/InputEventListener.cc (moved) (moved from code/branches/input/src/orxonox/InputEventListener.cc) (1 diff)
• src/orxonox/core/InputEventListener.h (moved) (moved from code/branches/input/src/orxonox/InputEventListener.h) (2 diffs)
• src/orxonox/core/InputHandler.cc (moved) (moved from code/branches/input/src/orxonox/InputHandler.cc) (6 diffs)
• src/orxonox/core/InputHandler.h (moved) (moved from code/branches/input/src/orxonox/InputHandler.h) (2 diffs)
• src/orxonox/core/InputHandlerBase.cc (added)
• src/orxonox/core/InputHandlerBase.h (added)
• visual_studio/vc8/core.vcproj (modified) (2 diffs)

code/branches/input/src/orxonox/CMakeLists.txt

@@ -1 +1 @@
 SET( ORXONOX_SRC_FILES
   GraphicsEngine.cc
-  InputEventListener.cc
-  InputHandler.cc
   Main.cc
   Orxonox.cc

code/branches/input/src/orxonox/OrxonoxPlatform.h

@@ -271 +271 @@
 
 // include visual leak detector to search for memory links
-// #include <vld.h>
+//#include <vld.h>
 
 #endif /* _OrxonoxPlatform_H__ */

code/branches/input/src/orxonox/core/CMakeLists.txt

@@ -5 +5 @@
   Identifier.cc
   IdentifierDistributor.cc
+  InputHandler.cc
+  InputManager.cc
   MetaObjectList.cc
   ConfigValueContainer.cc

code/branches/input/src/orxonox/core/InputEvent.h

@@ -34 +34 @@
 #define _InputEvent_H__
 
-#include "OrxonoxPrereqs.h"
+#include "CorePrereqs.h"
 
 namespace orxonox

code/branches/input/src/orxonox/core/InputEventListener.cc

@@ -31 +31 @@
  */
 
-#include "OrxonoxStableHeaders.h"
-
 #include "core/CoreIncludes.h"
 #include "InputEventListener.h"

code/branches/input/src/orxonox/core/InputEventListener.h

@@ -34 +34 @@
 #define _InputEventListener_H__
 
-#include "OrxonoxPrereqs.h"
+#include "CorePrereqs.h"
 
 #include "core/OrxonoxClass.h"
@@ -44 +44 @@
     @brief Interface that any class can use to get key independent input.
   */
-  class _OrxonoxExport InputEventListener : virtual public OrxonoxClass
+  class _CoreExport InputEventListener : virtual public OrxonoxClass
   {
     friend class InputHandler;

code/branches/input/src/orxonox/core/InputHandler.cc

@@ -32 +32 @@
  */
 
-#include "OrxonoxStableHeaders.h"
-
 #include "core/CoreIncludes.h"
 #include "core/Debug.h"
-#include "Orxonox.h"
 #include "InputEventListener.h"
 #include "InputHandler.h"
@@ -53 +50 @@
       mouse_(0), keyboard_(0), inputSystem_(0)
   {
-    //RegisterObject(InputHandler);
   }
 
@@ -61 +57 @@
   InputHandler::~InputHandler()
   {
+    this->destroyDevices();
   }
 
@@ -72 +69 @@
       singletonRef_s = new InputHandler();
     return singletonRef_s;
-    //static InputHandler theOnlyInstance;
-    //return &theOnlyInstance;
   }
 
@@ -103 +98 @@
         // Create inputsystem
         inputSystem_ = OIS::InputManager::createInputSystem(paramList);
-        //if (getSoftDebugLevel() >= ORX_DEBUG)
-        //  orxonox::OutputHandler::getOutStream().setOutputLevel(4) << "asdfblah" << std::endl;
         COUT(ORX_DEBUG) << "*** InputHandler: Created OIS input system" << std::endl;
 
@@ -130 +123 @@
 
     COUT(ORX_DEBUG) << "*** InputHandler: Loading key bindings..." << std::endl;
-    // temporary solution: create event list
-    //InputEvent[] list = this->createEventList();
     // load the key bindings
     InputEvent empty = {0, false, 0, 0, 0};

code/branches/input/src/orxonox/core/InputHandler.h

@@ -37 +37 @@
 #include <OIS/OIS.h>
 
-#include "OrxonoxPrereqs.h"
+#include "CorePrereqs.h"
 #include "core/Tickable.h"
 #include "InputEvent.h"
@@ -44 +44 @@
 {
   /**
+    @brief Designates the way input is handled currently.
+    IM_GUI:      All the OIS input events are passed to CEGUI
+    IM_KEYBOARD: Only keyboard input is captured and passed to the InputBuffer
+    IM_INGAME:   Normal game mode. Key bindings and mouse are active.
+  */
+  enum InputMode
+  {
+    IM_GUI      = 0;
+    IM_KEYBOARD = 1;
+    IM_INGAME   = 2;
+  };
+
+  /**
     @brief Captures and distributes mouse and keyboard input.
     It resolves the key bindings to InputEvents which can be heard by
     implementing the InputEventListener interface.
   */
-  class _OrxonoxExport InputHandler
+  class _CoreExport InputHandler
         : public Tickable, public OIS::KeyListener, public OIS::MouseListener
   {
-    //friend class ClassIdentifier<InputHandler>;
   public:
     bool initialise(size_t windowHnd, int windowWidth, int windowHeight);

code/branches/input/visual_studio/vc8/core.vcproj

@@ -309 +309 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\core\InputEventListener.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\core\InputHandler.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\core\InputHandlerBuffer.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\core\InputHandlerGame.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\core\InputHandlerGUI.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\core\Language.cc"
                                 >
@@ -407 +427 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\core\InputEvent.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\core\InputEventListener.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\core\InputHandler.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\core\InputHandlerBuffer.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\core\InputHandlerGame.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\core\InputHandlerGUI.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\orxonox\core\Iterator.h"
                                 >