Changeset 3286 for code/branches/core4/src/core/input/JoyStick.h

Timestamp:

Jul 13, 2009, 8:54:43 PM (15 years ago)

Author:

rgrieder

Message:

Added and adjusted documentation for the devices.
Also removed one last ugliness where the InputManager was called from within a device (which should not even know about the InputManager).

File:

• code/branches/core4/src/core/input/JoyStick.h (modified) (4 diffs)

code/branches/core4/src/core/input/JoyStick.h

@@ -38 +38 @@
 namespace orxonox
 {
+    //! Template parameter collection for the base class
     struct JoyStickTraits
     {
@@ -66 +67 @@
     public:
         //! Assigns a generated ID string and loads the calibration (if present)
-        JoyStick(unsigned int id);
+        JoyStick(unsigned int id, OIS::InputManager* oisInputManager);
         ~JoyStick() { }
         void setConfigValues();
 
-        //! Returns the generated (from the number of knobs and the device name) ID string
+        //! Returns the ID string generated from the number of knobs and the device name
         const std::string& getIDString() const { return this->idString_; }
 
@@ -99 +100 @@
         bool sliderMoved   (const OIS::JoyStickEvent &arg, int id);
         bool povMoved      (const OIS::JoyStickEvent &arg, int id);
-        //!< OIS event handler (don't remove that because of OIS version issues!)
+        //! OIS event handler (don't remove that because of OIS version issues!)
         bool vector3Moved  (const OIS::JoyStickEvent &arg, int id) { return true; }
 
+        //! Returns the class name as string
         static std::string getClassNameImpl() { return "JoyStick"; }
 
@@ -120 +122 @@
         std::string calibrationFilename_;     //!< Joy stick calibration ini filename
 
+        //! Contains a list of all ID strings to avoid duplicates
+        static std::vector<std::string> idStrings_s;
+
         //!< Maximum number of slider axes
         static const unsigned int sliderAxes_s = 8;