Browse Source

Reviewed IsMouseButtonDown()

Ray 5 years ago
parent
commit
18a9982126
1 changed files with 5 additions and 3 deletions
  1. 5 3
      src/core.c

+ 5 - 3
src/core.c

@@ -2521,7 +2521,8 @@ bool IsMouseButtonDown(int button)
 #if defined(PLATFORM_ANDROID)
 #if defined(PLATFORM_ANDROID)
     if (IsGestureDetected(GESTURE_HOLD)) down = true;
     if (IsGestureDetected(GESTURE_HOLD)) down = true;
 #else
 #else
-    if (CORE.Input.Mouse.currentButtonState[button] == 1) down = true;
+    if (glfwGetMouseButton(CORE.Window.handle, button)) down = true;
+    //if (CORE.Input.Mouse.currentButtonState[button] == 1) down = true;
 
 
     // Map touches to mouse buttons checking
     // Map touches to mouse buttons checking
     if (CORE.Input.Touch.currentTouchState[button] == 1) down = true;
     if (CORE.Input.Touch.currentTouchState[button] == 1) down = true;
@@ -3612,6 +3613,7 @@ static void PollInputEvents(void)
     // Register previous mouse states
     // Register previous mouse states
     CORE.Input.Mouse.previousWheelMove = CORE.Input.Mouse.currentWheelMove;
     CORE.Input.Mouse.previousWheelMove = CORE.Input.Mouse.currentWheelMove;
     CORE.Input.Mouse.currentWheelMove = 0;
     CORE.Input.Mouse.currentWheelMove = 0;
+
     for (int i = 0; i < 3; i++) CORE.Input.Mouse.previousButtonState[i] = CORE.Input.Mouse.currentButtonState[i];
     for (int i = 0; i < 3; i++) CORE.Input.Mouse.previousButtonState[i] = CORE.Input.Mouse.currentButtonState[i];
 
 
     // Loop over pending messages
     // Loop over pending messages
@@ -4261,7 +4263,7 @@ static int32_t AndroidInputCallback(struct android_app *app, AInputEvent *event)
             int32_t keycode = AKeyEvent_getKeyCode(event);
             int32_t keycode = AKeyEvent_getKeyCode(event);
             if (AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_DOWN)
             if (AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_DOWN)
             {
             {
-                CORE.Input.Keyboard.currentKeyState[keycode] = 1;  // Key down
+                CORE.Input.Keyboard.currentKeyState[keycode] = 1;   // Key down
 
 
                 CORE.Input.Keyboard.keyPressedQueue[CORE.Input.Keyboard.keyPressedQueueCount] = keycode;
                 CORE.Input.Keyboard.keyPressedQueue[CORE.Input.Keyboard.keyPressedQueueCount] = keycode;
                 CORE.Input.Keyboard.keyPressedQueueCount++;
                 CORE.Input.Keyboard.keyPressedQueueCount++;
@@ -4627,7 +4629,7 @@ static void ProcessKeyboard(void)
 
 
     // Reset pressed keys array (it will be filled below)
     // Reset pressed keys array (it will be filled below)
     for (int i = 0; i < 512; i++) CORE.Input.Keyboard.currentKeyState[i] = 0;
     for (int i = 0; i < 512; i++) CORE.Input.Keyboard.currentKeyState[i] = 0;
-
+    
     // Check keys from event input workers (This is the new keyboard reading method)
     // Check keys from event input workers (This is the new keyboard reading method)
     //for (int i = 0; i < 512; i++) CORE.Input.Keyboard.currentKeyState[i] = CORE.Input.Keyboard.currentKeyStateEvdev[i];
     //for (int i = 0; i < 512; i++) CORE.Input.Keyboard.currentKeyState[i] = CORE.Input.Keyboard.currentKeyStateEvdev[i];