Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-03 13:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor refactoring, documentation tweaks

Browse Source
This commit is contained in:
Nikita Leonidov 2020-04-16 10:29:52 -04:00
parent b0840ad5bb
commit 6db3f00ffb
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/GLFW/glfw3.h
View File

@ -5348,9 +5348,11 @@ GLFWAPI const char* glfwGetGamepadName(int jid);
*/ */
GLFWAPI int glfwGetGamepadState(int jid, GLFWgamepadstate* state); GLFWAPI int glfwGetGamepadState(int jid, GLFWgamepadstate* state);
/*! @brief Sets the specified gamepad's vibration effect intensity. /*! @brief Sets the intensity of an Xbox-like gamepad's rumble effect.
* *
* This function sends vibration data to the specified Xbox-like gamepad. * This function sends vibration data to gamepads that implement haptic
* feedback effects using two vibration motors: a low-frequency motor, and
* a high-frequency motor.
* *
* Vibration intensity is a value between 0.0 and 1.0 inclusive, where 0.0 is no * Vibration intensity is a value between 0.0 and 1.0 inclusive, where 0.0 is no
* vibration, and 1.0 is maximum vibration. It is set separately for the * vibration, and 1.0 is maximum vibration. It is set separately for the
@ -5377,7 +5379,7 @@ GLFWAPI int glfwGetGamepadState(int jid, GLFWgamepadstate* state);
* *
* @ingroup input * @ingroup input
*/ */
GLFWAPI int glfwSetGamepadRumble(int jid, float slowMotorSpeed, float fastMotorSpeed); GLFWAPI int glfwSetJoystickRumble(int jid, float slowMotorSpeed, float fastMotorSpeed);
/*! @brief Sets the clipboard to the specified string. /*! @brief Sets the clipboard to the specified string.
* *

4
src/input.c
View File

@ -1312,7 +1312,7 @@ GLFWAPI int glfwGetGamepadState(int jid, GLFWgamepadstate* state)
return GLFW_TRUE; return GLFW_TRUE;
} }
GLFWAPI int glfwSetGamepadRumble(int jid, float slowMotorSpeed, float fastMotorSpeed) GLFWAPI int glfwSetJoystickRumble(int jid, float slowMotorSpeed, float fastMotorSpeed)
{ {
_GLFWjoystick* js; _GLFWjoystick* js;
@ -1337,7 +1337,7 @@ GLFWAPI int glfwSetGamepadRumble(int jid, float slowMotorSpeed, float fastMotorS
fastMotorSpeed = fastMotorSpeed < 0.0f ? 0.0f : fastMotorSpeed; fastMotorSpeed = fastMotorSpeed < 0.0f ? 0.0f : fastMotorSpeed;
fastMotorSpeed = fastMotorSpeed > 1.0f ? 1.0f : fastMotorSpeed; fastMotorSpeed = fastMotorSpeed > 1.0f ? 1.0f : fastMotorSpeed;
return _glfwPlatformSetGamepadRumble(js, slowMotorSpeed, fastMotorSpeed); return _glfwPlatformSetJoystickRumble(js, slowMotorSpeed, fastMotorSpeed);
} }
GLFWAPI void glfwSetClipboardString(GLFWwindow* handle, const char* string) GLFWAPI void glfwSetClipboardString(GLFWwindow* handle, const char* string)

2
src/internal.h
View File

@ -628,7 +628,7 @@ const char* _glfwPlatformGetClipboardString(void);
int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode); int _glfwPlatformPollJoystick(_GLFWjoystick* js, int mode);
void _glfwPlatformUpdateGamepadGUID(char* guid); void _glfwPlatformUpdateGamepadGUID(char* guid);
int _glfwPlatformSetGamepadRumble(_GLFWjoystick* js, float slowMotorSpeed, float fastMotorSpeed); int _glfwPlatformSetJoystickRumble(_GLFWjoystick* js, float slowMotorSpeed, float fastMotorSpeed);
uint64_t _glfwPlatformGetTimerValue(void); uint64_t _glfwPlatformGetTimerValue(void);
uint64_t _glfwPlatformGetTimerFrequency(void); uint64_t _glfwPlatformGetTimerFrequency(void);

2
src/linux_joystick.c
View File

@ -479,7 +479,7 @@ void _glfwPlatformUpdateGamepadGUID(char* guid)
} }
int _glfwPlatformSetGamepadRumble(_GLFWjoystick* js, float slowMotorSpeed, float fastMotorSpeed) int _glfwPlatformSetJoystickRumble(_GLFWjoystick* js, float slowMotorSpeed, float fastMotorSpeed)
{ {
_GLFWjoystickLinux *linjs = &js->linjs; _GLFWjoystickLinux *linjs = &js->linjs;

2
src/win32_joystick.c
View File

@ -753,7 +753,7 @@ void _glfwPlatformUpdateGamepadGUID(char* guid)
} }
} }
int _glfwPlatformSetGamepadRumble(_GLFWjoystick* js, float slowMotorSpeed, float fastMotorSpeed) int _glfwPlatformSetJoystickRumble(_GLFWjoystick* js, float slowMotorSpeed, float fastMotorSpeed)
{ {
if (js->win32.device) if (js->win32.device)
return GLFW_FALSE; return GLFW_FALSE;

2
tests/joysticks.c
View File

@ -242,7 +242,7 @@ int main(void)
slowRumble[i] = nk_slide_float(nk, 0.0f, slowRumble[i], 1.0f, 0.05f); slowRumble[i] = nk_slide_float(nk, 0.0f, slowRumble[i], 1.0f, 0.05f);
fastRumble[i] = nk_slide_float(nk, 0.0f, fastRumble[i], 1.0f, 0.05f); fastRumble[i] = nk_slide_float(nk, 0.0f, fastRumble[i], 1.0f, 0.05f);
glfwSetGamepadRumble(joysticks[i], slowRumble[i], fastRumble[i]); glfwSetJoystickRumble(joysticks[i], slowRumble[i], fastRumble[i]);
} }
} }
else else