diff options
| -rw-r--r-- | src/rcamera.h | 10 | ||||
| -rw-r--r-- | src/rcore.c | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/rcamera.h b/src/rcamera.h index 22a468cf..c1b048e0 100644 --- a/src/rcamera.h +++ b/src/rcamera.h @@ -448,8 +448,9 @@ void UpdateCamera(Camera *camera, int mode) if (IsKeyDown(KEY_E)) CameraRoll(camera, CAMERA_ROTATION_SPEED); // Camera movement - - if (!IsGamepadAvailable(0)){ + if (!IsGamepadAvailable(0)) + { + // Mouse/Keyboard support CameraYaw(camera, -mousePositionDelta.x*CAMERA_MOUSE_MOVE_SENSITIVITY, rotateAroundTarget); CameraPitch(camera, -mousePositionDelta.y*CAMERA_MOUSE_MOVE_SENSITIVITY, lockView, rotateAroundTarget, rotateUp); @@ -458,8 +459,9 @@ void UpdateCamera(Camera *camera, int mode) if (IsKeyDown(KEY_S)) CameraMoveForward(camera, -CAMERA_MOVE_SPEED, moveInWorldPlane); if (IsKeyDown(KEY_D)) CameraMoveRight(camera, CAMERA_MOVE_SPEED, moveInWorldPlane); } - else { - // Simple Controller Support + else + { + // Gamepad controller support CameraYaw(camera, -(GetGamepadAxisMovement(0, GAMEPAD_AXIS_RIGHT_X) * 2)*CAMERA_MOUSE_MOVE_SENSITIVITY, rotateAroundTarget); CameraPitch(camera, -(GetGamepadAxisMovement(0, GAMEPAD_AXIS_RIGHT_Y) * 2)*CAMERA_MOUSE_MOVE_SENSITIVITY, lockView, rotateAroundTarget, rotateUp); diff --git a/src/rcore.c b/src/rcore.c index 881739c7..31a06f7c 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -1785,7 +1785,10 @@ int GetCurrentMonitor(void) monitor = monitors[i]; glfwGetMonitorWorkarea(monitor, &mx, &my, &width, &height); - if (x >= mx && x < (mx + width) && y >= my && y < (my + height)) + if ((x >= mx) && + (x < (mx + width)) && + (y >= my) && + (y < (my + height))) { index = i; break; |