Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-02 12:51:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove trailing whitespace

Browse Source
This commit is contained in:
Nikita Leonidov 2020-04-18 21:02:10 -04:00
parent da7d21c75a
commit 9bd85109d5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/GLFW/glfw3.h
View File

@ -5349,15 +5349,15 @@ GLFWAPI const char* glfwGetGamepadName(int jid);
GLFWAPI int glfwGetGamepadState(int jid, GLFWgamepadstate* state); GLFWAPI int glfwGetGamepadState(int jid, GLFWgamepadstate* state);
/*! @brief Sets the intensity of a joystick's rumble effect. /*! @brief Sets the intensity of a joystick's rumble effect.
* *
* This function sends vibration data to joysticks that implement haptic feedback * This function sends vibration data to joysticks that implement haptic feedback
* effects using two vibration motors: a low-frequency motor, and a * effects using two vibration motors: a low-frequency motor, and a
* high-frequency motor. * 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
* joystick's low frequency and high frequency rumble motors. * joystick's low frequency and high frequency rumble motors.
* *
* If the specified joystick is not present or does not support the rumble effect, * If the specified joystick is not present or does not support the rumble effect,
* this function will return `GLFW_FALSE` but will not generate an error. * this function will return `GLFW_FALSE` but will not generate an error.
* *
@ -5366,7 +5366,7 @@ GLFWAPI int glfwGetGamepadState(int jid, GLFWgamepadstate* state);
* @param[in] fastMotorIntensity The high frequency vibration intensity. * @param[in] fastMotorIntensity The high frequency vibration intensity.
* @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if no joystick is connected, * @return `GLFW_TRUE` if successful, or `GLFW_FALSE` if no joystick is connected,
* or the joystick does not support the rumble effect. * or the joystick does not support the rumble effect.
* *
* @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref * @errors Possible errors include @ref GLFW_NOT_INITIALIZED and @ref
* GLFW_INVALID_ENUM. * GLFW_INVALID_ENUM.
* *

2
src/win32_joystick.c
View File

@ -759,7 +759,7 @@ int _glfwPlatformSetJoystickRumble(_GLFWjoystick* js, float slowMotorIntensity,
if (js->win32.device) if (js->win32.device)
return GLFW_FALSE; return GLFW_FALSE;
ZeroMemory(&effect, sizeof(XINPUT_VIBRATION)); ZeroMemory(&effect, sizeof(XINPUT_VIBRATION));
effect.wLeftMotorSpeed = (WORD)(65535.0f * slowMotorIntensity); effect.wLeftMotorSpeed = (WORD)(65535.0f * slowMotorIntensity);

2
tests/joysticks.c
View File

@ -334,7 +334,7 @@ int main(void)
nk_layout_row_dynamic(nk, 30, 2); nk_layout_row_dynamic(nk, 30, 2);
nk_label(nk, "Slow rumble motor intensity", NK_TEXT_LEFT); nk_label(nk, "Slow rumble motor intensity", NK_TEXT_LEFT);
nk_label(nk, "Fast rumble motor intensity", NK_TEXT_LEFT); nk_label(nk, "Fast rumble motor intensity", NK_TEXT_LEFT);
nk_layout_row_dynamic(nk, 30, 2); nk_layout_row_dynamic(nk, 30, 2);
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);