Changeset 9667 for code/trunk/src/libraries/core/input

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/input/Button.cc (modified) (1 diff)
• src/libraries/core/input/InputBuffer.cc (modified) (2 diffs)
• src/libraries/core/input/InputBuffer.h (modified) (2 diffs)
• src/libraries/core/input/InputManager.cc (modified) (4 diffs)
• src/libraries/core/input/JoyStick.cc (modified) (2 diffs)
• src/libraries/core/input/JoyStick.h (modified) (2 diffs)
• src/libraries/core/input/JoyStickQuantityListener.cc (modified) (1 diff)
• src/libraries/core/input/JoyStickQuantityListener.h (modified) (1 diff)
• src/libraries/core/input/KeyBinder.cc (modified) (2 diffs)
• src/libraries/core/input/KeyBinderManager.cc (modified) (1 diff)
• src/libraries/core/input/KeyBinderManager.h (modified) (2 diffs)
• src/libraries/core/input/Mouse.cc (modified) (1 diff)

code/trunk/src/libraries/core/input/Button.cc

@@ -42 +42 @@
 #include "core/command/CommandEvaluation.h"
 #include "core/command/CommandExecutor.h"
-#include "core/ConfigFileManager.h"
+#include "core/config/ConfigFile.h"
 
 namespace orxonox

code/trunk/src/libraries/core/input/InputBuffer.cc

@@ -31 +31 @@
 #include "util/Clipboard.h"
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 
 namespace orxonox
 {
+    RegisterClassNoArgs(InputBuffer);
+
     InputBuffer::InputBuffer()
     {
-        RegisterRootObject(InputBuffer);
+        RegisterObject(InputBuffer);
 
         this->cursor_ = 0;
@@ -57 +59 @@
     InputBuffer::InputBuffer(const std::string& allowedChars)
     {
-        RegisterRootObject(InputBuffer);
+        RegisterObject(InputBuffer);
 
         this->maxLength_ = 1024;

code/trunk/src/libraries/core/input/InputBuffer.h

@@ -34 +34 @@
 #include <list>
 #include <string>
-#include "core/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 #include "InputHandler.h"
 
@@ -74 +74 @@
     };
 
-    class _CoreExport InputBuffer : public InputHandler, public OrxonoxClass
+    class _CoreExport InputBuffer : public InputHandler, public Configurable
     {
         public:

code/trunk/src/libraries/core/input/InputManager.cc

@@ -46 +46 @@
 #include "util/Exception.h"
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
-#include "core/CommandLineParser.h"
 #include "core/GraphicsManager.h"
+#include "core/config/ConfigValueIncludes.h"
+#include "core/config/CommandLineParser.h"
 #include "core/command/ConsoleCommand.h"
 #include "core/command/Functor.h"
@@ -98 +98 @@
         , calibratorCallbackHandler_(0)
     {
-        RegisterRootObject(InputManager);
+        RegisterObject(InputManager);
 
         orxout(internal_status, context::input) << "InputManager: Constructing..." << endl;
@@ -280 +280 @@
         this->destroyState("calibrator");
         // Destroy KeyDetector and state
-        calibratorCallbackHandler_->destroy();
+        delete calibratorCallbackHandler_;
         // Destroy the empty InputState
         this->destroyStateInternal(this->emptyState_);
@@ -642 +642 @@
         assert(state && this->activeStates_.find(state->getPriority()) == this->activeStates_.end());
         statesByName_.erase(state->getName());
-        state->destroy();
+        delete state;
     }
 

code/trunk/src/libraries/core/input/JoyStick.cc

@@ -34 +34 @@
 
 #include "util/StringUtils.h"
-#include "core/ConfigFileManager.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigFile.h"
+#include "core/config/ConfigFileManager.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
 #include "util/Convert.h"
@@ -50 +51 @@
         : super(id, oisInputManager)
     {
-        RegisterRootObject(JoyStick);
+        RegisterObject(JoyStick);
         this->setConfigValues();
         // Initialise POV and Slider states

code/trunk/src/libraries/core/input/JoyStick.h

@@ -36 +36 @@
 #include <ois/OISJoyStick.h>
 #include "InputDevice.h"
+#include "core/config/Configurable.h"
 
 namespace orxonox
@@ -58 +59 @@
     */
     class _CoreExport JoyStick
-        : public OrxonoxClass
+        : public Configurable
         , public InputDeviceTemplated<JoyStickTraits>
         , public OIS::JoyStickListener

code/trunk/src/libraries/core/input/JoyStickQuantityListener.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/ObjectList.h"
+#include "core/object/ObjectList.h"
 
 namespace orxonox

code/trunk/src/libraries/core/input/JoyStickQuantityListener.h

@@ -38 +38 @@
 
 #include <vector>
-#include "core/OrxonoxClass.h"
+#include "core/object/Listable.h"
 
 namespace orxonox
 {
     //! Derive from this class to get informed when joy sticks get added/removed
-    class _CoreExport JoyStickQuantityListener : virtual public OrxonoxClass
+    class _CoreExport JoyStickQuantityListener : virtual public Listable
     {
         friend class InputManager;

code/trunk/src/libraries/core/input/KeyBinder.cc

@@ -34 +34 @@
 #include "util/Output.h"
 #include "util/Exception.h"
-#include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
-#include "core/ConfigFileManager.h"
+#include "core/config/ConfigValueIncludes.h"
+#include "core/config/ConfigFile.h"
 #include "core/PathConfig.h"
 #include "InputCommands.h"
@@ -58 +58 @@
         mousePosition_[1] = 0.0;
 
-        RegisterRootObject(KeyBinder);
+        RegisterObject(KeyBinder);
 
         // initialise all buttons and half axes to avoid creating everything with 'new'

code/trunk/src/libraries/core/input/KeyBinderManager.cc

@@ -32 +32 @@
 #include "util/Exception.h"
 #include "util/ScopedSingletonManager.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
 #include "core/LuaState.h"

code/trunk/src/libraries/core/input/KeyBinderManager.h

@@ -36 +36 @@
 
 #include "util/Singleton.h"
-#include "core/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 
 namespace orxonox //tolua_export
@@ -53 +53 @@
     */
     class _CoreExport KeyBinderManager //tolua_export
-        : public Singleton<KeyBinderManager>, public OrxonoxClass
+        : public Singleton<KeyBinderManager>, public Configurable
     { //tolua_export
         friend class Singleton<KeyBinderManager>;

code/trunk/src/libraries/core/input/Mouse.cc

@@ -54 +54 @@
         : super(id, oisInputManager)
     {
-        RegisterRootObject(Mouse);
+        RegisterObject(Mouse);
         this->windowResized(this->getWindowWidth(), this->getWindowHeight());