caio/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-01-11 23:33:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed constness of joystick data.

Browse Source
This commit is contained in:
Camilla Berglund
2013-06-04 18:20:38 +02:00
parent 179d90956a
commit 180a4ee640
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/GLFW/glfw3.h
View File

@@ -1973,7 +1973,7 @@ GLFWAPI int glfwJoystickPresent(int joy);
*
* @ingroup input
*/
GLFWAPI float* glfwGetJoystickAxes(int joy, int* count);
GLFWAPI const float* glfwGetJoystickAxes(int joy, int* count);
/*! @brief Returns the values of all buttons of the specified joystick.
* @param[in] joy The joystick to query.
@@ -1985,7 +1985,7 @@ GLFWAPI float* glfwGetJoystickAxes(int joy, int* count);
*
* @ingroup input
*/
GLFWAPI unsigned char* glfwGetJoystickButtons(int joy, int* count);
GLFWAPI const unsigned char* glfwGetJoystickButtons(int joy, int* count);
/*! @brief Returns the name of the specified joystick.
*

4
src/cocoa_joystick.m
View File

@@ -463,7 +463,7 @@ int _glfwPlatformJoystickPresent(int joy)
return _glfw.ns.joysticks[joy].present;
}
float* _glfwPlatformGetJoystickAxes(int joy, int* count)
const float* _glfwPlatformGetJoystickAxes(int joy, int* count)
{
_GLFWjoy* joystick = _glfw.ns.joysticks + joy;
@@ -476,7 +476,7 @@ float* _glfwPlatformGetJoystickAxes(int joy, int* count)
return joystick->axes;
}
unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count)
const unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count)
{
_GLFWjoy* joystick = _glfw.ns.joysticks + joy;

4
src/internal.h
View File

@@ -418,12 +418,12 @@ int _glfwPlatformJoystickPresent(int joy);
/*! @copydoc glfwGetJoystickAxes
* @ingroup platform
*/
float* _glfwPlatformGetJoystickAxes(int joy, int* count);
const float* _glfwPlatformGetJoystickAxes(int joy, int* count);
/*! @copydoc glfwGetJoystickButtons
* @ingroup platform
*/
unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count);
const unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count);
/*! @copydoc glfwGetJoystickName
* @ingroup platform

4
src/joystick.c
View File

@@ -48,7 +48,7 @@ GLFWAPI int glfwJoystickPresent(int joy)
return _glfwPlatformJoystickPresent(joy);
}
GLFWAPI float* glfwGetJoystickAxes(int joy, int* count)
GLFWAPI const float* glfwGetJoystickAxes(int joy, int* count)
{
*count = 0;
@@ -63,7 +63,7 @@ GLFWAPI float* glfwGetJoystickAxes(int joy, int* count)
return _glfwPlatformGetJoystickAxes(joy, count);
}
GLFWAPI unsigned char* glfwGetJoystickButtons(int joy, int* count)
GLFWAPI const unsigned char* glfwGetJoystickButtons(int joy, int* count)
{
*count = 0;

4
src/win32_joystick.c
View File

@@ -84,7 +84,7 @@ int _glfwPlatformJoystickPresent(int joy)
return GL_TRUE;
}
float* _glfwPlatformGetJoystickAxes(int joy, int* count)
const float* _glfwPlatformGetJoystickAxes(int joy, int* count)
{
JOYCAPS jc;
JOYINFOEX ji;
@@ -117,7 +117,7 @@ float* _glfwPlatformGetJoystickAxes(int joy, int* count)
return axes;
}
unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count)
const unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count)
{
JOYCAPS jc;
JOYINFOEX ji;

4
src/x11_joystick.c
View File

@@ -241,7 +241,7 @@ int _glfwPlatformJoystickPresent(int joy)
return _glfw.x11.joystick[joy].present;
}
float* _glfwPlatformGetJoystickAxes(int joy, int* count)
const float* _glfwPlatformGetJoystickAxes(int joy, int* count)
{
pollJoystickEvents();
@@ -252,7 +252,7 @@ float* _glfwPlatformGetJoystickAxes(int joy, int* count)
return _glfw.x11.joystick[joy].axes;
}
unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count)
const unsigned char* _glfwPlatformGetJoystickButtons(int joy, int* count)
{
pollJoystickEvents();

4
tests/joysticks.c
View File

@@ -138,8 +138,8 @@ static void refresh_joysticks(void)
if (glfwJoystickPresent(GLFW_JOYSTICK_1 + i))
{
float* axes;
unsigned char* buttons;
const float* axes;
const unsigned char* buttons;
int axis_count, button_count;
free(j->name);