Input: fix some warnings

Docs/AngelScriptAPI.h

@@ -13827,14 +13827,14 @@ class JoystickState
 public:
 // Methods:
 JoystickState&  operator=(const JoystickState&);
-float GetAxisPosition(uint) const;
-bool GetButtonDown(uint) const;
-bool GetButtonPress(uint) const;
-int GetHatPosition(uint) const;
-uint GetNumAxes() const;
-uint GetNumButtons() const;
-uint GetNumHats() const;
-void Initialize(uint, uint, uint);
+float GetAxisPosition(int) const;
+bool GetButtonDown(int) const;
+bool GetButtonPress(int) const;
+int GetHatPosition(int) const;
+int GetNumAxes() const;
+int GetNumButtons() const;
+int GetNumHats() const;
+void Initialize(int, int, int);
 bool IsController() const;
 void Reset();
 
@@ -13852,11 +13852,11 @@ Array<int> hatPosition;
 int joystickID;
 String name;
 /* readonly */
-uint numAxes;
+int numAxes;
 /* readonly */
-uint numButtons;
+int numButtons;
 /* readonly */
-uint numHats;
+int numHats;
 };
 
 class Light

Docs/ScriptAPI.dox

@@ -15868,14 +15868,14 @@ Constants:
 Methods:
 
 - JoystickState&  operator=(const JoystickState&)
-- float GetAxisPosition(uint) const
-- bool GetButtonDown(uint) const
-- bool GetButtonPress(uint) const
-- int GetHatPosition(uint) const
-- uint GetNumAxes() const
-- uint GetNumButtons() const
-- uint GetNumHats() const
-- void Initialize(uint, uint, uint)
+- float GetAxisPosition(int) const
+- bool GetButtonDown(int) const
+- bool GetButtonPress(int) const
+- int GetHatPosition(int) const
+- int GetNumAxes() const
+- int GetNumButtons() const
+- int GetNumHats() const
+- void Initialize(int, int, int)
 - bool IsController() const
 - void Reset()
 
@@ -15888,9 +15888,9 @@ Properties:
 - int[] hatPosition // readonly
 - int joystickID
 - String name
-- uint numAxes // readonly
-- uint numButtons // readonly
-- uint numHats // readonly
+- int numAxes // readonly
+- int numButtons // readonly
+- int numHats // readonly
 
 <a name="Class_Light"></a>
 

Source/Urho3D/AngelScript/Generated_Members.h

@@ -2388,36 +2388,36 @@ template <class T> void RegisterMembers_JSONValue(asIScriptEngine* engine, const
 // struct JoystickState | File: ../Input/Input.h
 template <class T> void RegisterMembers_JoystickState(asIScriptEngine* engine, const char* className)
 {
-    // float JoystickState::GetAxisPosition(unsigned index) const
-    engine->RegisterObjectMethod(className, "float GetAxisPosition(uint) const", AS_METHODPR(T, GetAxisPosition, (unsigned) const, float), AS_CALL_THISCALL);
-    engine->RegisterObjectMethod(className, "float get_axisPosition(uint) const", AS_METHODPR(T, GetAxisPosition, (unsigned) const, float), AS_CALL_THISCALL);
+    // float JoystickState::GetAxisPosition(i32 index) const
+    engine->RegisterObjectMethod(className, "float GetAxisPosition(int) const", AS_METHODPR(T, GetAxisPosition, (i32) const, float), AS_CALL_THISCALL);
+    engine->RegisterObjectMethod(className, "float get_axisPosition(int) const", AS_METHODPR(T, GetAxisPosition, (i32) const, float), AS_CALL_THISCALL);
 
-    // bool JoystickState::GetButtonDown(unsigned index) const
-    engine->RegisterObjectMethod(className, "bool GetButtonDown(uint) const", AS_METHODPR(T, GetButtonDown, (unsigned) const, bool), AS_CALL_THISCALL);
-    engine->RegisterObjectMethod(className, "bool get_buttonDown(uint) const", AS_METHODPR(T, GetButtonDown, (unsigned) const, bool), AS_CALL_THISCALL);
+    // bool JoystickState::GetButtonDown(i32 index) const
+    engine->RegisterObjectMethod(className, "bool GetButtonDown(int) const", AS_METHODPR(T, GetButtonDown, (i32) const, bool), AS_CALL_THISCALL);
+    engine->RegisterObjectMethod(className, "bool get_buttonDown(int) const", AS_METHODPR(T, GetButtonDown, (i32) const, bool), AS_CALL_THISCALL);
 
-    // bool JoystickState::GetButtonPress(unsigned index) const
-    engine->RegisterObjectMethod(className, "bool GetButtonPress(uint) const", AS_METHODPR(T, GetButtonPress, (unsigned) const, bool), AS_CALL_THISCALL);
-    engine->RegisterObjectMethod(className, "bool get_buttonPress(uint) const", AS_METHODPR(T, GetButtonPress, (unsigned) const, bool), AS_CALL_THISCALL);
+    // bool JoystickState::GetButtonPress(i32 index) const
+    engine->RegisterObjectMethod(className, "bool GetButtonPress(int) const", AS_METHODPR(T, GetButtonPress, (i32) const, bool), AS_CALL_THISCALL);
+    engine->RegisterObjectMethod(className, "bool get_buttonPress(int) const", AS_METHODPR(T, GetButtonPress, (i32) const, bool), AS_CALL_THISCALL);
 
-    // int JoystickState::GetHatPosition(unsigned index) const
-    engine->RegisterObjectMethod(className, "int GetHatPosition(uint) const", AS_METHODPR(T, GetHatPosition, (unsigned) const, int), AS_CALL_THISCALL);
-    engine->RegisterObjectMethod(className, "int get_hatPosition(uint) const", AS_METHODPR(T, GetHatPosition, (unsigned) const, int), AS_CALL_THISCALL);
+    // int JoystickState::GetHatPosition(i32 index) const
+    engine->RegisterObjectMethod(className, "int GetHatPosition(int) const", AS_METHODPR(T, GetHatPosition, (i32) const, int), AS_CALL_THISCALL);
+    engine->RegisterObjectMethod(className, "int get_hatPosition(int) const", AS_METHODPR(T, GetHatPosition, (i32) const, int), AS_CALL_THISCALL);
 
-    // unsigned JoystickState::GetNumAxes() const
-    engine->RegisterObjectMethod(className, "uint GetNumAxes() const", AS_METHODPR(T, GetNumAxes, () const, unsigned), AS_CALL_THISCALL);
-    engine->RegisterObjectMethod(className, "uint get_numAxes() const", AS_METHODPR(T, GetNumAxes, () const, unsigned), AS_CALL_THISCALL);
+    // i32 JoystickState::GetNumAxes() const
+    engine->RegisterObjectMethod(className, "int GetNumAxes() const", AS_METHODPR(T, GetNumAxes, () const, i32), AS_CALL_THISCALL);
+    engine->RegisterObjectMethod(className, "int get_numAxes() const", AS_METHODPR(T, GetNumAxes, () const, i32), AS_CALL_THISCALL);
 
-    // unsigned JoystickState::GetNumButtons() const
-    engine->RegisterObjectMethod(className, "uint GetNumButtons() const", AS_METHODPR(T, GetNumButtons, () const, unsigned), AS_CALL_THISCALL);
-    engine->RegisterObjectMethod(className, "uint get_numButtons() const", AS_METHODPR(T, GetNumButtons, () const, unsigned), AS_CALL_THISCALL);
+    // i32 JoystickState::GetNumButtons() const
+    engine->RegisterObjectMethod(className, "int GetNumButtons() const", AS_METHODPR(T, GetNumButtons, () const, i32), AS_CALL_THISCALL);
+    engine->RegisterObjectMethod(className, "int get_numButtons() const", AS_METHODPR(T, GetNumButtons, () const, i32), AS_CALL_THISCALL);
 
-    // unsigned JoystickState::GetNumHats() const
-    engine->RegisterObjectMethod(className, "uint GetNumHats() const", AS_METHODPR(T, GetNumHats, () const, unsigned), AS_CALL_THISCALL);
-    engine->RegisterObjectMethod(className, "uint get_numHats() const", AS_METHODPR(T, GetNumHats, () const, unsigned), AS_CALL_THISCALL);
+    // i32 JoystickState::GetNumHats() const
+    engine->RegisterObjectMethod(className, "int GetNumHats() const", AS_METHODPR(T, GetNumHats, () const, i32), AS_CALL_THISCALL);
+    engine->RegisterObjectMethod(className, "int get_numHats() const", AS_METHODPR(T, GetNumHats, () const, i32), AS_CALL_THISCALL);
 
-    // void JoystickState::Initialize(unsigned numButtons, unsigned numAxes, unsigned numHats)
-    engine->RegisterObjectMethod(className, "void Initialize(uint, uint, uint)", AS_METHODPR(T, Initialize, (unsigned, unsigned, unsigned), void), AS_CALL_THISCALL);
+    // void JoystickState::Initialize(i32 numButtons, i32 numAxes, i32 numHats)
+    engine->RegisterObjectMethod(className, "void Initialize(int, int, int)", AS_METHODPR(T, Initialize, (i32, i32, i32), void), AS_CALL_THISCALL);
 
     // bool JoystickState::IsController() const
     engine->RegisterObjectMethod(className, "bool IsController() const", AS_METHODPR(T, IsController, () const, bool), AS_CALL_THISCALL);

Source/Urho3D/Input/Input.cpp

@@ -309,7 +309,7 @@ int Win32_ResizingEventWatcher(void* data, SDL_Event* event)
 }
 #endif
 
-void JoystickState::Initialize(unsigned numButtons, unsigned numAxes, unsigned numHats)
+void JoystickState::Initialize(i32 numButtons, i32 numAxes, i32 numHats)
 {
     buttons_.Resize(numButtons);
     buttonPress_.Resize(numButtons);
@@ -321,14 +321,16 @@ void JoystickState::Initialize(unsigned numButtons, unsigned numAxes, unsigned n
 
 void JoystickState::Reset()
 {
-    for (unsigned i = 0; i < buttons_.Size(); ++i)
+    for (i32 i = 0; i < buttons_.Size(); ++i)
     {
         buttons_[i] = false;
         buttonPress_[i] = false;
     }
-    for (unsigned i = 0; i < axes_.Size(); ++i)
+
+    for (i32 i = 0; i < axes_.Size(); ++i)
         axes_[i] = 0.0f;
-    for (unsigned i = 0; i < hats_.Size(); ++i)
+
+    for (i32 i = 0; i < hats_.Size(); ++i)
         hats_[i] = HAT_CENTER;
 }
 

Source/Urho3D/Input/Input.h

@@ -61,7 +61,8 @@ struct TouchState
 struct JoystickState
 {
     /// Initialize the number of buttons, axes and hats and set them to neutral state.
-    void Initialize(unsigned numButtons, unsigned numAxes, unsigned numHats);
+    void Initialize(i32 numButtons, i32 numAxes, i32 numHats);
+    
     /// Reset button, axis and hat states to neutral.
     void Reset();
 
@@ -71,31 +72,47 @@ struct JoystickState
 
     /// Return number of buttons.
     /// @property
-    unsigned GetNumButtons() const { return buttons_.Size(); }
+    i32 GetNumButtons() const { return buttons_.Size(); }
 
     /// Return number of axes.
     /// @property
-    unsigned GetNumAxes() const { return axes_.Size(); }
+    i32 GetNumAxes() const { return axes_.Size(); }
 
     /// Return number of hats.
     /// @property
-    unsigned GetNumHats() const { return hats_.Size(); }
+    i32 GetNumHats() const { return hats_.Size(); }
 
     /// Check if a button is held down.
     /// @property
-    bool GetButtonDown(unsigned index) const { return index < buttons_.Size() ? buttons_[index] : false; }
+    bool GetButtonDown(i32 index) const
+    {
+        assert(index >= 0);
+        return index < buttons_.Size() ? buttons_[index] : false;
+    }
 
     /// Check if a button has been pressed on this frame.
     /// @property
-    bool GetButtonPress(unsigned index) const { return index < buttonPress_.Size() ? buttonPress_[index] : false; }
+    bool GetButtonPress(i32 index) const
+    {
+        assert(index >= 0);
+        return index < buttonPress_.Size() ? buttonPress_[index] : false;
+    }
 
     /// Return axis position.
     /// @property
-    float GetAxisPosition(unsigned index) const { return index < axes_.Size() ? axes_[index] : 0.0f; }
+    float GetAxisPosition(i32 index) const
+    {
+        assert(index >= 0);
+        return index < axes_.Size() ? axes_[index] : 0.0f;
+    }
 
     /// Return hat position.
     /// @property
-    int GetHatPosition(unsigned index) const { return index < hats_.Size() ? hats_[index] : int(HAT_CENTER); }
+    int GetHatPosition(i32 index) const
+    {
+        assert(index >= 0);
+        return index < hats_.Size() ? hats_[index] : int(HAT_CENTER);
+    }
 
     /// SDL joystick.
     SDL_Joystick* joystick_{};