Update for SDL3 coding style (#6717)
I updated .clang-format and ran clang-format 14 over the src and test directories to standardize the code base. In general I let clang-format have it's way, and added markup to prevent formatting of code that would break or be completely unreadable if formatted. The script I ran for the src directory is added as build-scripts/clang-format-src.sh This fixes: #6592 #6593 #6594
This commit is contained in:
Sam Lantinga
GitHub
parent
14b902faca
commit
5750bcb174
781 changed files with 51659 additions and 55763 deletions
|
|
@ -53,25 +53,21 @@ static SDL_bool SDL_updating_sensor = SDL_FALSE;
|
|||
static SDL_mutex *SDL_sensor_lock = NULL; /* This needs to support recursive locks */
|
||||
static SDL_atomic_t SDL_next_sensor_instance_id;
|
||||
|
||||
void
|
||||
SDL_LockSensors(void)
|
||||
void SDL_LockSensors(void)
|
||||
{
|
||||
if (SDL_sensor_lock) {
|
||||
SDL_LockMutex(SDL_sensor_lock);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
SDL_UnlockSensors(void)
|
||||
void SDL_UnlockSensors(void)
|
||||
{
|
||||
if (SDL_sensor_lock) {
|
||||
SDL_UnlockMutex(SDL_sensor_lock);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
SDL_SensorInit(void)
|
||||
int SDL_SensorInit(void)
|
||||
{
|
||||
int i, status;
|
||||
|
||||
|
|
@ -98,8 +94,7 @@ SDL_SensorInit(void)
|
|||
/*
|
||||
* Count the number of sensors attached to the system
|
||||
*/
|
||||
int
|
||||
SDL_NumSensors(void)
|
||||
int SDL_NumSensors(void)
|
||||
{
|
||||
int i, total_sensors = 0;
|
||||
SDL_LockSensors();
|
||||
|
|
@ -123,8 +118,7 @@ SDL_SensorID SDL_GetNextSensorInstanceID()
|
|||
* Get the driver and device index for an API device index
|
||||
* This should be called while the sensor lock is held, to prevent another thread from updating the list
|
||||
*/
|
||||
static SDL_bool
|
||||
SDL_GetDriverAndSensorIndex(int device_index, SDL_SensorDriver **driver, int *driver_index)
|
||||
static SDL_bool SDL_GetDriverAndSensorIndex(int device_index, SDL_SensorDriver **driver, int *driver_index)
|
||||
{
|
||||
int i, num_sensors, total_sensors = 0;
|
||||
|
||||
|
|
@ -179,8 +173,7 @@ SDL_SensorGetDeviceType(int device_index)
|
|||
return type;
|
||||
}
|
||||
|
||||
int
|
||||
SDL_SensorGetDeviceNonPortableType(int device_index)
|
||||
int SDL_SensorGetDeviceNonPortableType(int device_index)
|
||||
{
|
||||
SDL_SensorDriver *driver;
|
||||
int type = -1;
|
||||
|
|
@ -239,16 +232,16 @@ SDL_SensorOpen(int device_index)
|
|||
instance_id = driver->GetDeviceInstanceID(device_index);
|
||||
while (sensorlist) {
|
||||
if (instance_id == sensorlist->instance_id) {
|
||||
sensor = sensorlist;
|
||||
++sensor->ref_count;
|
||||
SDL_UnlockSensors();
|
||||
return sensor;
|
||||
sensor = sensorlist;
|
||||
++sensor->ref_count;
|
||||
SDL_UnlockSensors();
|
||||
return sensor;
|
||||
}
|
||||
sensorlist = sensorlist->next;
|
||||
}
|
||||
|
||||
/* Create and initialize the sensor */
|
||||
sensor = (SDL_Sensor *) SDL_calloc(sizeof(*sensor), 1);
|
||||
sensor = (SDL_Sensor *)SDL_calloc(sizeof(*sensor), 1);
|
||||
if (sensor == NULL) {
|
||||
SDL_OutOfMemory();
|
||||
SDL_UnlockSensors();
|
||||
|
|
@ -306,8 +299,7 @@ SDL_SensorFromInstanceID(SDL_SensorID instance_id)
|
|||
/*
|
||||
* Checks to make sure the sensor is valid.
|
||||
*/
|
||||
static int
|
||||
SDL_PrivateSensorValid(SDL_Sensor *sensor)
|
||||
static int SDL_PrivateSensorValid(SDL_Sensor *sensor)
|
||||
{
|
||||
int valid;
|
||||
|
||||
|
|
@ -350,8 +342,7 @@ SDL_SensorGetType(SDL_Sensor *sensor)
|
|||
/*
|
||||
* Get the platform dependent type of this sensor
|
||||
*/
|
||||
int
|
||||
SDL_SensorGetNonPortableType(SDL_Sensor *sensor)
|
||||
int SDL_SensorGetNonPortableType(SDL_Sensor *sensor)
|
||||
{
|
||||
if (!SDL_PrivateSensorValid(sensor)) {
|
||||
return -1;
|
||||
|
|
@ -376,8 +367,7 @@ SDL_SensorGetInstanceID(SDL_Sensor *sensor)
|
|||
/*
|
||||
* Get the current state of this sensor
|
||||
*/
|
||||
int
|
||||
SDL_SensorGetData(SDL_Sensor *sensor, float *data, int num_values)
|
||||
int SDL_SensorGetData(SDL_Sensor *sensor, float *data, int num_values)
|
||||
{
|
||||
return SDL_SensorGetDataWithTimestamp(sensor, NULL, data, num_values);
|
||||
}
|
||||
|
|
@ -385,15 +375,14 @@ SDL_SensorGetData(SDL_Sensor *sensor, float *data, int num_values)
|
|||
/*
|
||||
* Get the current state of this sensor
|
||||
*/
|
||||
int
|
||||
SDL_SensorGetDataWithTimestamp(SDL_Sensor *sensor, Uint64 *timestamp, float *data, int num_values)
|
||||
int SDL_SensorGetDataWithTimestamp(SDL_Sensor *sensor, Uint64 *timestamp, float *data, int num_values)
|
||||
{
|
||||
if (!SDL_PrivateSensorValid(sensor)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
num_values = SDL_min(num_values, SDL_arraysize(sensor->data));
|
||||
SDL_memcpy(data, sensor->data, num_values*sizeof(*data));
|
||||
SDL_memcpy(data, sensor->data, num_values * sizeof(*data));
|
||||
if (timestamp) {
|
||||
*timestamp = sensor->timestamp_us;
|
||||
}
|
||||
|
|
@ -403,8 +392,7 @@ SDL_SensorGetDataWithTimestamp(SDL_Sensor *sensor, Uint64 *timestamp, float *dat
|
|||
/*
|
||||
* Close a sensor previously opened with SDL_SensorOpen()
|
||||
*/
|
||||
void
|
||||
SDL_SensorClose(SDL_Sensor *sensor)
|
||||
void SDL_SensorClose(SDL_Sensor *sensor)
|
||||
{
|
||||
SDL_Sensor *sensorlist;
|
||||
SDL_Sensor *sensorlistprev;
|
||||
|
|
@ -453,8 +441,7 @@ SDL_SensorClose(SDL_Sensor *sensor)
|
|||
SDL_UnlockSensors();
|
||||
}
|
||||
|
||||
void
|
||||
SDL_SensorQuit(void)
|
||||
void SDL_SensorQuit(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -471,7 +458,7 @@ SDL_SensorQuit(void)
|
|||
|
||||
/* Quit the sensor setup */
|
||||
for (i = 0; i < SDL_arraysize(SDL_sensor_drivers); ++i) {
|
||||
SDL_sensor_drivers[i]->Quit();
|
||||
SDL_sensor_drivers[i]->Quit();
|
||||
}
|
||||
|
||||
SDL_UnlockSensors();
|
||||
|
|
@ -486,11 +473,9 @@ SDL_SensorQuit(void)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/* These are global for SDL_syssensor.c and SDL_events.c */
|
||||
|
||||
int
|
||||
SDL_PrivateSensorUpdate(SDL_Sensor *sensor, Uint64 timestamp_us, float *data, int num_values)
|
||||
int SDL_PrivateSensorUpdate(SDL_Sensor *sensor, Uint64 timestamp_us, float *data, int num_values)
|
||||
{
|
||||
int posted;
|
||||
|
||||
|
|
@ -498,7 +483,7 @@ SDL_PrivateSensorUpdate(SDL_Sensor *sensor, Uint64 timestamp_us, float *data, in
|
|||
|
||||
/* Update internal sensor state */
|
||||
num_values = SDL_min(num_values, SDL_arraysize(sensor->data));
|
||||
SDL_memcpy(sensor->data, data, num_values*sizeof(*data));
|
||||
SDL_memcpy(sensor->data, data, num_values * sizeof(*data));
|
||||
sensor->timestamp_us = timestamp_us;
|
||||
|
||||
/* Post the event, if desired */
|
||||
|
|
@ -510,7 +495,7 @@ SDL_PrivateSensorUpdate(SDL_Sensor *sensor, Uint64 timestamp_us, float *data, in
|
|||
event.sensor.which = sensor->instance_id;
|
||||
num_values = SDL_min(num_values, SDL_arraysize(event.sensor.data));
|
||||
SDL_memset(event.sensor.data, 0, sizeof(event.sensor.data));
|
||||
SDL_memcpy(event.sensor.data, data, num_values*sizeof(*data));
|
||||
SDL_memcpy(event.sensor.data, data, num_values * sizeof(*data));
|
||||
event.sensor.timestamp_us = timestamp_us;
|
||||
posted = SDL_PushEvent(&event) == 1;
|
||||
}
|
||||
|
|
@ -518,8 +503,7 @@ SDL_PrivateSensorUpdate(SDL_Sensor *sensor, Uint64 timestamp_us, float *data, in
|
|||
return posted;
|
||||
}
|
||||
|
||||
void
|
||||
SDL_SensorUpdate(void)
|
||||
void SDL_SensorUpdate(void)
|
||||
{
|
||||
int i;
|
||||
SDL_Sensor *sensor, *next;
|
||||
|
|
|
|||
|
|
@ -30,21 +30,21 @@
|
|||
/* The SDL sensor structure */
|
||||
struct _SDL_Sensor
|
||||
{
|
||||
SDL_SensorID instance_id; /* Device instance, monotonically increasing from 0 */
|
||||
char *name; /* Sensor name - system dependent */
|
||||
SDL_SensorType type; /* Type of the sensor */
|
||||
int non_portable_type; /* Platform dependent type of the sensor */
|
||||
SDL_SensorID instance_id; /* Device instance, monotonically increasing from 0 */
|
||||
char *name; /* Sensor name - system dependent */
|
||||
SDL_SensorType type; /* Type of the sensor */
|
||||
int non_portable_type; /* Platform dependent type of the sensor */
|
||||
|
||||
Uint64 timestamp_us; /* The timestamp of the last sensor update */
|
||||
float data[16]; /* The current state of the sensor */
|
||||
Uint64 timestamp_us; /* The timestamp of the last sensor update */
|
||||
float data[16]; /* The current state of the sensor */
|
||||
|
||||
struct _SDL_SensorDriver *driver;
|
||||
|
||||
struct sensor_hwdata *hwdata; /* Driver dependent information */
|
||||
struct sensor_hwdata *hwdata; /* Driver dependent information */
|
||||
|
||||
int ref_count; /* Reference count for multiple opens */
|
||||
int ref_count; /* Reference count for multiple opens */
|
||||
|
||||
struct _SDL_Sensor *next; /* pointer to next sensor we have allocated */
|
||||
struct _SDL_Sensor *next; /* pointer to next sensor we have allocated */
|
||||
};
|
||||
|
||||
typedef struct _SDL_SensorDriver
|
||||
|
|
@ -77,17 +77,17 @@ typedef struct _SDL_SensorDriver
|
|||
The sensor to open is specified by the device index.
|
||||
It returns 0, or -1 if there is an error.
|
||||
*/
|
||||
int (*Open)(SDL_Sensor * sensor, int device_index);
|
||||
int (*Open)(SDL_Sensor *sensor, int device_index);
|
||||
|
||||
/* Function to update the state of a sensor - called as a device poll.
|
||||
* This function shouldn't update the sensor structure directly,
|
||||
* but instead should call SDL_PrivateSensorUpdate() to deliver events
|
||||
* and update sensor device state.
|
||||
*/
|
||||
void (*Update)(SDL_Sensor * sensor);
|
||||
void (*Update)(SDL_Sensor *sensor);
|
||||
|
||||
/* Function to close a sensor after use */
|
||||
void (*Close)(SDL_Sensor * sensor);
|
||||
void (*Close)(SDL_Sensor *sensor);
|
||||
|
||||
/* Function to perform any system-specific sensor related cleanup */
|
||||
void (*Quit)(void);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
//#include "../../core/android/SDL_android.h"
|
||||
|
||||
#ifndef LOOPER_ID_USER
|
||||
#define LOOPER_ID_USER 3
|
||||
#define LOOPER_ID_USER 3
|
||||
#endif
|
||||
|
||||
typedef struct
|
||||
|
|
@ -40,13 +40,12 @@ typedef struct
|
|||
SDL_SensorID instance_id;
|
||||
} SDL_AndroidSensor;
|
||||
|
||||
static ASensorManager* SDL_sensor_manager;
|
||||
static ALooper* SDL_sensor_looper;
|
||||
static ASensorManager *SDL_sensor_manager;
|
||||
static ALooper *SDL_sensor_looper;
|
||||
static SDL_AndroidSensor *SDL_sensors;
|
||||
static int SDL_sensors_count;
|
||||
|
||||
static int
|
||||
SDL_ANDROID_SensorInit(void)
|
||||
static int SDL_ANDROID_SensorInit(void)
|
||||
{
|
||||
int i, sensors_count;
|
||||
ASensorList sensors;
|
||||
|
|
@ -81,25 +80,21 @@ SDL_ANDROID_SensorInit(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_ANDROID_SensorGetCount(void)
|
||||
static int SDL_ANDROID_SensorGetCount(void)
|
||||
{
|
||||
return SDL_sensors_count;
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_ANDROID_SensorDetect(void)
|
||||
static void SDL_ANDROID_SensorDetect(void)
|
||||
{
|
||||
}
|
||||
|
||||
static const char *
|
||||
SDL_ANDROID_SensorGetDeviceName(int device_index)
|
||||
static const char *SDL_ANDROID_SensorGetDeviceName(int device_index)
|
||||
{
|
||||
return ASensor_getName(SDL_sensors[device_index].asensor);
|
||||
}
|
||||
|
||||
static SDL_SensorType
|
||||
SDL_ANDROID_SensorGetDeviceType(int device_index)
|
||||
static SDL_SensorType SDL_ANDROID_SensorGetDeviceType(int device_index)
|
||||
{
|
||||
switch (ASensor_getType(SDL_sensors[device_index].asensor)) {
|
||||
case 0x00000001:
|
||||
|
|
@ -111,20 +106,17 @@ SDL_ANDROID_SensorGetDeviceType(int device_index)
|
|||
}
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_ANDROID_SensorGetDeviceNonPortableType(int device_index)
|
||||
static int SDL_ANDROID_SensorGetDeviceNonPortableType(int device_index)
|
||||
{
|
||||
return ASensor_getType(SDL_sensors[device_index].asensor);
|
||||
}
|
||||
|
||||
static SDL_SensorID
|
||||
SDL_ANDROID_SensorGetDeviceInstanceID(int device_index)
|
||||
static SDL_SensorID SDL_ANDROID_SensorGetDeviceInstanceID(int device_index)
|
||||
{
|
||||
return SDL_sensors[device_index].instance_id;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_ANDROID_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static int SDL_ANDROID_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
struct sensor_hwdata *hwdata;
|
||||
int delay_us, min_delay_us;
|
||||
|
|
@ -159,15 +151,14 @@ SDL_ANDROID_SensorOpen(SDL_Sensor *sensor, int device_index)
|
|||
sensor->hwdata = hwdata;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_ANDROID_SensorUpdate(SDL_Sensor *sensor)
|
||||
|
||||
static void SDL_ANDROID_SensorUpdate(SDL_Sensor *sensor)
|
||||
{
|
||||
int events;
|
||||
ASensorEvent event;
|
||||
struct android_poll_source* source;
|
||||
struct android_poll_source *source;
|
||||
|
||||
if (ALooper_pollAll(0, NULL, &events, (void**)&source) == LOOPER_ID_USER) {
|
||||
if (ALooper_pollAll(0, NULL, &events, (void **)&source) == LOOPER_ID_USER) {
|
||||
SDL_zero(event);
|
||||
while (ASensorEventQueue_getEvents(sensor->hwdata->eventqueue, &event, 1) > 0) {
|
||||
SDL_PrivateSensorUpdate(sensor, 0, event.data, SDL_arraysize(event.data));
|
||||
|
|
@ -175,8 +166,7 @@ SDL_ANDROID_SensorUpdate(SDL_Sensor *sensor)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_ANDROID_SensorClose(SDL_Sensor *sensor)
|
||||
static void SDL_ANDROID_SensorClose(SDL_Sensor *sensor)
|
||||
{
|
||||
if (sensor->hwdata) {
|
||||
ASensorEventQueue_disableSensor(sensor->hwdata->eventqueue, sensor->hwdata->asensor);
|
||||
|
|
@ -186,8 +176,7 @@ SDL_ANDROID_SensorClose(SDL_Sensor *sensor)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_ANDROID_SensorQuit(void)
|
||||
static void SDL_ANDROID_SensorQuit(void)
|
||||
{
|
||||
if (SDL_sensors) {
|
||||
SDL_free(SDL_sensors);
|
||||
|
|
@ -196,8 +185,7 @@ SDL_ANDROID_SensorQuit(void)
|
|||
}
|
||||
}
|
||||
|
||||
SDL_SensorDriver SDL_ANDROID_SensorDriver =
|
||||
{
|
||||
SDL_SensorDriver SDL_ANDROID_SensorDriver = {
|
||||
SDL_ANDROID_SensorInit,
|
||||
SDL_ANDROID_SensorGetCount,
|
||||
SDL_ANDROID_SensorDetect,
|
||||
|
|
|
|||
|
|
@ -27,5 +27,4 @@ struct sensor_hwdata
|
|||
ASensorEventQueue *eventqueue;
|
||||
};
|
||||
|
||||
|
||||
/* vi: set ts=4 sw=4 expandtab: */
|
||||
|
|
|
|||
|
|
@ -26,5 +26,4 @@ struct sensor_hwdata
|
|||
float data[3];
|
||||
};
|
||||
|
||||
|
||||
/* vi: set ts=4 sw=4 expandtab: */
|
||||
|
|
|
|||
|
|
@ -39,8 +39,7 @@ static CMMotionManager *SDL_motion_manager;
|
|||
static SDL_CoreMotionSensor *SDL_sensors;
|
||||
static int SDL_sensors_count;
|
||||
|
||||
static int
|
||||
SDL_COREMOTION_SensorInit(void)
|
||||
static int SDL_COREMOTION_SensorInit(void)
|
||||
{
|
||||
int i, sensors_count = 0;
|
||||
|
||||
|
|
@ -77,19 +76,16 @@ SDL_COREMOTION_SensorInit(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_COREMOTION_SensorGetCount(void)
|
||||
static int SDL_COREMOTION_SensorGetCount(void)
|
||||
{
|
||||
return SDL_sensors_count;
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_COREMOTION_SensorDetect(void)
|
||||
static void SDL_COREMOTION_SensorDetect(void)
|
||||
{
|
||||
}
|
||||
|
||||
static const char *
|
||||
SDL_COREMOTION_SensorGetDeviceName(int device_index)
|
||||
static const char *SDL_COREMOTION_SensorGetDeviceName(int device_index)
|
||||
{
|
||||
switch (SDL_sensors[device_index].type) {
|
||||
case SDL_SENSOR_ACCEL:
|
||||
|
|
@ -101,26 +97,22 @@ SDL_COREMOTION_SensorGetDeviceName(int device_index)
|
|||
}
|
||||
}
|
||||
|
||||
static SDL_SensorType
|
||||
SDL_COREMOTION_SensorGetDeviceType(int device_index)
|
||||
static SDL_SensorType SDL_COREMOTION_SensorGetDeviceType(int device_index)
|
||||
{
|
||||
return SDL_sensors[device_index].type;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_COREMOTION_SensorGetDeviceNonPortableType(int device_index)
|
||||
static int SDL_COREMOTION_SensorGetDeviceNonPortableType(int device_index)
|
||||
{
|
||||
return SDL_sensors[device_index].type;
|
||||
}
|
||||
|
||||
static SDL_SensorID
|
||||
SDL_COREMOTION_SensorGetDeviceInstanceID(int device_index)
|
||||
static SDL_SensorID SDL_COREMOTION_SensorGetDeviceInstanceID(int device_index)
|
||||
{
|
||||
return SDL_sensors[device_index].instance_id;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_COREMOTION_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static int SDL_COREMOTION_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
struct sensor_hwdata *hwdata;
|
||||
|
||||
|
|
@ -130,8 +122,7 @@ SDL_COREMOTION_SensorOpen(SDL_Sensor *sensor, int device_index)
|
|||
}
|
||||
sensor->hwdata = hwdata;
|
||||
|
||||
switch (sensor->type)
|
||||
{
|
||||
switch (sensor->type) {
|
||||
case SDL_SENSOR_ACCEL:
|
||||
[SDL_motion_manager startAccelerometerUpdates];
|
||||
break;
|
||||
|
|
@ -143,55 +134,49 @@ SDL_COREMOTION_SensorOpen(SDL_Sensor *sensor, int device_index)
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_COREMOTION_SensorUpdate(SDL_Sensor *sensor)
|
||||
|
||||
static void SDL_COREMOTION_SensorUpdate(SDL_Sensor *sensor)
|
||||
{
|
||||
switch (sensor->type)
|
||||
{
|
||||
switch (sensor->type) {
|
||||
case SDL_SENSOR_ACCEL:
|
||||
{
|
||||
CMAccelerometerData *accelerometerData = SDL_motion_manager.accelerometerData;
|
||||
if (accelerometerData) {
|
||||
CMAcceleration acceleration = accelerometerData.acceleration;
|
||||
float data[3];
|
||||
data[0] = -acceleration.x * SDL_STANDARD_GRAVITY;
|
||||
data[1] = -acceleration.y * SDL_STANDARD_GRAVITY;
|
||||
data[2] = -acceleration.z * SDL_STANDARD_GRAVITY;
|
||||
if (SDL_memcmp(data, sensor->hwdata->data, sizeof(data)) != 0) {
|
||||
SDL_PrivateSensorUpdate(sensor, 0, data, SDL_arraysize(data));
|
||||
SDL_memcpy(sensor->hwdata->data, data, sizeof(data));
|
||||
}
|
||||
{
|
||||
CMAccelerometerData *accelerometerData = SDL_motion_manager.accelerometerData;
|
||||
if (accelerometerData) {
|
||||
CMAcceleration acceleration = accelerometerData.acceleration;
|
||||
float data[3];
|
||||
data[0] = -acceleration.x * SDL_STANDARD_GRAVITY;
|
||||
data[1] = -acceleration.y * SDL_STANDARD_GRAVITY;
|
||||
data[2] = -acceleration.z * SDL_STANDARD_GRAVITY;
|
||||
if (SDL_memcmp(data, sensor->hwdata->data, sizeof(data)) != 0) {
|
||||
SDL_PrivateSensorUpdate(sensor, 0, data, SDL_arraysize(data));
|
||||
SDL_memcpy(sensor->hwdata->data, data, sizeof(data));
|
||||
}
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
case SDL_SENSOR_GYRO:
|
||||
{
|
||||
CMGyroData *gyroData = SDL_motion_manager.gyroData;
|
||||
if (gyroData) {
|
||||
CMRotationRate rotationRate = gyroData.rotationRate;
|
||||
float data[3];
|
||||
data[0] = rotationRate.x;
|
||||
data[1] = rotationRate.y;
|
||||
data[2] = rotationRate.z;
|
||||
if (SDL_memcmp(data, sensor->hwdata->data, sizeof(data)) != 0) {
|
||||
SDL_PrivateSensorUpdate(sensor, 0, data, SDL_arraysize(data));
|
||||
SDL_memcpy(sensor->hwdata->data, data, sizeof(data));
|
||||
}
|
||||
{
|
||||
CMGyroData *gyroData = SDL_motion_manager.gyroData;
|
||||
if (gyroData) {
|
||||
CMRotationRate rotationRate = gyroData.rotationRate;
|
||||
float data[3];
|
||||
data[0] = rotationRate.x;
|
||||
data[1] = rotationRate.y;
|
||||
data[2] = rotationRate.z;
|
||||
if (SDL_memcmp(data, sensor->hwdata->data, sizeof(data)) != 0) {
|
||||
SDL_PrivateSensorUpdate(sensor, 0, data, SDL_arraysize(data));
|
||||
SDL_memcpy(sensor->hwdata->data, data, sizeof(data));
|
||||
}
|
||||
}
|
||||
break;
|
||||
} break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_COREMOTION_SensorClose(SDL_Sensor *sensor)
|
||||
static void SDL_COREMOTION_SensorClose(SDL_Sensor *sensor)
|
||||
{
|
||||
if (sensor->hwdata) {
|
||||
switch (sensor->type)
|
||||
{
|
||||
switch (sensor->type) {
|
||||
case SDL_SENSOR_ACCEL:
|
||||
[SDL_motion_manager stopAccelerometerUpdates];
|
||||
break;
|
||||
|
|
@ -206,13 +191,11 @@ SDL_COREMOTION_SensorClose(SDL_Sensor *sensor)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_COREMOTION_SensorQuit(void)
|
||||
static void SDL_COREMOTION_SensorQuit(void)
|
||||
{
|
||||
}
|
||||
|
||||
SDL_SensorDriver SDL_COREMOTION_SensorDriver =
|
||||
{
|
||||
SDL_SensorDriver SDL_COREMOTION_SensorDriver = {
|
||||
SDL_COREMOTION_SensorInit,
|
||||
SDL_COREMOTION_SensorGetCount,
|
||||
SDL_COREMOTION_SensorDetect,
|
||||
|
|
|
|||
|
|
@ -25,70 +25,58 @@
|
|||
#include "SDL_dummysensor.h"
|
||||
#include "../SDL_syssensor.h"
|
||||
|
||||
static int
|
||||
SDL_DUMMY_SensorInit(void)
|
||||
static int SDL_DUMMY_SensorInit(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_DUMMY_SensorGetCount(void)
|
||||
static int SDL_DUMMY_SensorGetCount(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_DUMMY_SensorDetect(void)
|
||||
static void SDL_DUMMY_SensorDetect(void)
|
||||
{
|
||||
}
|
||||
|
||||
static const char *
|
||||
SDL_DUMMY_SensorGetDeviceName(int device_index)
|
||||
static const char *SDL_DUMMY_SensorGetDeviceName(int device_index)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static SDL_SensorType
|
||||
SDL_DUMMY_SensorGetDeviceType(int device_index)
|
||||
static SDL_SensorType SDL_DUMMY_SensorGetDeviceType(int device_index)
|
||||
{
|
||||
return SDL_SENSOR_INVALID;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_DUMMY_SensorGetDeviceNonPortableType(int device_index)
|
||||
static int SDL_DUMMY_SensorGetDeviceNonPortableType(int device_index)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
static SDL_SensorID
|
||||
SDL_DUMMY_SensorGetDeviceInstanceID(int device_index)
|
||||
static SDL_SensorID SDL_DUMMY_SensorGetDeviceInstanceID(int device_index)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_DUMMY_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static int SDL_DUMMY_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
return SDL_Unsupported();
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_DUMMY_SensorUpdate(SDL_Sensor *sensor)
|
||||
|
||||
static void SDL_DUMMY_SensorUpdate(SDL_Sensor *sensor)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_DUMMY_SensorClose(SDL_Sensor *sensor)
|
||||
static void SDL_DUMMY_SensorClose(SDL_Sensor *sensor)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_DUMMY_SensorQuit(void)
|
||||
static void SDL_DUMMY_SensorQuit(void)
|
||||
{
|
||||
}
|
||||
|
||||
SDL_SensorDriver SDL_DUMMY_SensorDriver =
|
||||
{
|
||||
SDL_SensorDriver SDL_DUMMY_SensorDriver = {
|
||||
SDL_DUMMY_SensorInit,
|
||||
SDL_DUMMY_SensorGetCount,
|
||||
SDL_DUMMY_SensorDetect,
|
||||
|
|
|
|||
|
|
@ -48,8 +48,7 @@ IsDeviceIndexValid(int device_index)
|
|||
return device_index >= 0 && device_index < N3DS_SENSOR_COUNT;
|
||||
}
|
||||
|
||||
static int
|
||||
N3DS_SensorInit(void)
|
||||
static int N3DS_SensorInit(void)
|
||||
{
|
||||
if (InitN3DSServices() < 0) {
|
||||
return SDL_SetError("Failed to initialise N3DS services");
|
||||
|
|
@ -79,19 +78,16 @@ InitN3DSServices(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
N3DS_SensorGetCount(void)
|
||||
static int N3DS_SensorGetCount(void)
|
||||
{
|
||||
return N3DS_SENSOR_COUNT;
|
||||
}
|
||||
|
||||
static void
|
||||
N3DS_SensorDetect(void)
|
||||
static void N3DS_SensorDetect(void)
|
||||
{
|
||||
}
|
||||
|
||||
static const char *
|
||||
N3DS_SensorGetDeviceName(int device_index)
|
||||
static const char *N3DS_SensorGetDeviceName(int device_index)
|
||||
{
|
||||
if (IsDeviceIndexValid(device_index)) {
|
||||
switch (N3DS_sensors[device_index].type) {
|
||||
|
|
@ -107,8 +103,7 @@ N3DS_SensorGetDeviceName(int device_index)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static SDL_SensorType
|
||||
N3DS_SensorGetDeviceType(int device_index)
|
||||
static SDL_SensorType N3DS_SensorGetDeviceType(int device_index)
|
||||
{
|
||||
if (IsDeviceIndexValid(device_index)) {
|
||||
return N3DS_sensors[device_index].type;
|
||||
|
|
@ -116,14 +111,12 @@ N3DS_SensorGetDeviceType(int device_index)
|
|||
return SDL_SENSOR_INVALID;
|
||||
}
|
||||
|
||||
static int
|
||||
N3DS_SensorGetDeviceNonPortableType(int device_index)
|
||||
static int N3DS_SensorGetDeviceNonPortableType(int device_index)
|
||||
{
|
||||
return (int) N3DS_SensorGetDeviceType(device_index);
|
||||
return (int)N3DS_SensorGetDeviceType(device_index);
|
||||
}
|
||||
|
||||
static SDL_SensorID
|
||||
N3DS_SensorGetDeviceInstanceID(int device_index)
|
||||
static SDL_SensorID N3DS_SensorGetDeviceInstanceID(int device_index)
|
||||
{
|
||||
if (IsDeviceIndexValid(device_index)) {
|
||||
return N3DS_sensors[device_index].instance_id;
|
||||
|
|
@ -131,14 +124,12 @@ N3DS_SensorGetDeviceInstanceID(int device_index)
|
|||
return -1;
|
||||
}
|
||||
|
||||
static int
|
||||
N3DS_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static int N3DS_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
N3DS_SensorUpdate(SDL_Sensor *sensor)
|
||||
static void N3DS_SensorUpdate(SDL_Sensor *sensor)
|
||||
{
|
||||
switch (sensor->type) {
|
||||
case SDL_SENSOR_ACCEL:
|
||||
|
|
@ -162,9 +153,9 @@ UpdateN3DSAccelerometer(SDL_Sensor *sensor)
|
|||
hidAccelRead(¤t_state);
|
||||
if (SDL_memcmp(&previous_state, ¤t_state, sizeof(accelVector)) != 0) {
|
||||
SDL_memcpy(&previous_state, ¤t_state, sizeof(accelVector));
|
||||
data[0] = (float) current_state.x * SDL_STANDARD_GRAVITY;
|
||||
data[1] = (float) current_state.y * SDL_STANDARD_GRAVITY;
|
||||
data[2] = (float) current_state.z * SDL_STANDARD_GRAVITY;
|
||||
data[0] = (float)current_state.x * SDL_STANDARD_GRAVITY;
|
||||
data[1] = (float)current_state.y * SDL_STANDARD_GRAVITY;
|
||||
data[2] = (float)current_state.z * SDL_STANDARD_GRAVITY;
|
||||
SDL_PrivateSensorUpdate(sensor, 0, data, sizeof data);
|
||||
}
|
||||
}
|
||||
|
|
@ -179,20 +170,18 @@ UpdateN3DSGyroscope(SDL_Sensor *sensor)
|
|||
hidGyroRead(¤t_state);
|
||||
if (SDL_memcmp(&previous_state, ¤t_state, sizeof(angularRate)) != 0) {
|
||||
SDL_memcpy(&previous_state, ¤t_state, sizeof(angularRate));
|
||||
data[0] = (float) current_state.x;
|
||||
data[1] = (float) current_state.y;
|
||||
data[2] = (float) current_state.z;
|
||||
data[0] = (float)current_state.x;
|
||||
data[1] = (float)current_state.y;
|
||||
data[2] = (float)current_state.z;
|
||||
SDL_PrivateSensorUpdate(sensor, 0, data, sizeof data);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
N3DS_SensorClose(SDL_Sensor *sensor)
|
||||
static void N3DS_SensorClose(SDL_Sensor *sensor)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
N3DS_SensorQuit(void)
|
||||
static void N3DS_SensorQuit(void)
|
||||
{
|
||||
HIDUSER_DisableGyroscope();
|
||||
HIDUSER_DisableAccelerometer();
|
||||
|
|
|
|||
|
|
@ -39,8 +39,7 @@ typedef struct
|
|||
static SDL_VitaSensor *SDL_sensors;
|
||||
static int SDL_sensors_count;
|
||||
|
||||
static int
|
||||
SDL_VITA_SensorInit(void)
|
||||
static int SDL_VITA_SensorInit(void)
|
||||
{
|
||||
sceMotionReset();
|
||||
sceMotionStartSampling();
|
||||
|
|
@ -64,36 +63,32 @@ SDL_VITA_SensorInit(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_VITA_SensorGetCount(void)
|
||||
static int SDL_VITA_SensorGetCount(void)
|
||||
{
|
||||
return SDL_sensors_count;
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_VITA_SensorDetect(void)
|
||||
static void SDL_VITA_SensorDetect(void)
|
||||
{
|
||||
}
|
||||
|
||||
static const char *
|
||||
SDL_VITA_SensorGetDeviceName(int device_index)
|
||||
static const char *SDL_VITA_SensorGetDeviceName(int device_index)
|
||||
{
|
||||
if (device_index < SDL_sensors_count) {
|
||||
switch (SDL_sensors[device_index].type) {
|
||||
case SDL_SENSOR_ACCEL:
|
||||
return "Accelerometer";
|
||||
case SDL_SENSOR_GYRO:
|
||||
return "Gyro";
|
||||
default:
|
||||
return "Unknown";
|
||||
case SDL_SENSOR_ACCEL:
|
||||
return "Accelerometer";
|
||||
case SDL_SENSOR_GYRO:
|
||||
return "Gyro";
|
||||
default:
|
||||
return "Unknown";
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static SDL_SensorType
|
||||
SDL_VITA_SensorGetDeviceType(int device_index)
|
||||
static SDL_SensorType SDL_VITA_SensorGetDeviceType(int device_index)
|
||||
{
|
||||
if (device_index < SDL_sensors_count) {
|
||||
return SDL_sensors[device_index].type;
|
||||
|
|
@ -102,8 +97,7 @@ SDL_VITA_SensorGetDeviceType(int device_index)
|
|||
return SDL_SENSOR_INVALID;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_VITA_SensorGetDeviceNonPortableType(int device_index)
|
||||
static int SDL_VITA_SensorGetDeviceNonPortableType(int device_index)
|
||||
{
|
||||
if (device_index < SDL_sensors_count) {
|
||||
return SDL_sensors[device_index].type;
|
||||
|
|
@ -111,8 +105,7 @@ SDL_VITA_SensorGetDeviceNonPortableType(int device_index)
|
|||
return -1;
|
||||
}
|
||||
|
||||
static SDL_SensorID
|
||||
SDL_VITA_SensorGetDeviceInstanceID(int device_index)
|
||||
static SDL_SensorID SDL_VITA_SensorGetDeviceInstanceID(int device_index)
|
||||
{
|
||||
if (device_index < SDL_sensors_count) {
|
||||
return SDL_sensors[device_index].instance_id;
|
||||
|
|
@ -120,8 +113,7 @@ SDL_VITA_SensorGetDeviceInstanceID(int device_index)
|
|||
return -1;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_VITA_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static int SDL_VITA_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
struct sensor_hwdata *hwdata;
|
||||
|
||||
|
|
@ -134,8 +126,7 @@ SDL_VITA_SensorOpen(SDL_Sensor *sensor, int device_index)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_VITA_SensorUpdate(SDL_Sensor *sensor)
|
||||
static void SDL_VITA_SensorUpdate(SDL_Sensor *sensor)
|
||||
{
|
||||
int err = 0;
|
||||
SceMotionSensorState motionState[SCE_MOTION_MAX_NUM_STATES];
|
||||
|
|
@ -166,46 +157,40 @@ SDL_VITA_SensorUpdate(SDL_Sensor *sensor)
|
|||
}
|
||||
sensor->hwdata->last_timestamp = timestamp;
|
||||
|
||||
switch (sensor->type)
|
||||
switch (sensor->type) {
|
||||
case SDL_SENSOR_ACCEL:
|
||||
{
|
||||
case SDL_SENSOR_ACCEL:
|
||||
{
|
||||
float data[3];
|
||||
data[0] = motionState[i].accelerometer.x * SDL_STANDARD_GRAVITY;
|
||||
data[1] = motionState[i].accelerometer.y * SDL_STANDARD_GRAVITY;
|
||||
data[2] = motionState[i].accelerometer.z * SDL_STANDARD_GRAVITY;
|
||||
SDL_PrivateSensorUpdate(sensor, sensor->hwdata->timestamp_us, data, SDL_arraysize(data));
|
||||
}
|
||||
break;
|
||||
case SDL_SENSOR_GYRO:
|
||||
{
|
||||
float data[3];
|
||||
data[0] = motionState[i].gyro.x;
|
||||
data[1] = motionState[i].gyro.y;
|
||||
data[2] = motionState[i].gyro.z;
|
||||
SDL_PrivateSensorUpdate(sensor, sensor->hwdata->timestamp_us, data, SDL_arraysize(data));
|
||||
}
|
||||
break;
|
||||
default:
|
||||
float data[3];
|
||||
data[0] = motionState[i].accelerometer.x * SDL_STANDARD_GRAVITY;
|
||||
data[1] = motionState[i].accelerometer.y * SDL_STANDARD_GRAVITY;
|
||||
data[2] = motionState[i].accelerometer.z * SDL_STANDARD_GRAVITY;
|
||||
SDL_PrivateSensorUpdate(sensor, sensor->hwdata->timestamp_us, data, SDL_arraysize(data));
|
||||
} break;
|
||||
case SDL_SENSOR_GYRO:
|
||||
{
|
||||
float data[3];
|
||||
data[0] = motionState[i].gyro.x;
|
||||
data[1] = motionState[i].gyro.y;
|
||||
data[2] = motionState[i].gyro.z;
|
||||
SDL_PrivateSensorUpdate(sensor, sensor->hwdata->timestamp_us, data, SDL_arraysize(data));
|
||||
} break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_VITA_SensorClose(SDL_Sensor *sensor)
|
||||
static void SDL_VITA_SensorClose(SDL_Sensor *sensor)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_VITA_SensorQuit(void)
|
||||
static void SDL_VITA_SensorQuit(void)
|
||||
{
|
||||
sceMotionStopSampling();
|
||||
}
|
||||
|
||||
SDL_SensorDriver SDL_VITA_SensorDriver =
|
||||
{
|
||||
SDL_SensorDriver SDL_VITA_SensorDriver = {
|
||||
SDL_VITA_SensorInit,
|
||||
SDL_VITA_SensorGetCount,
|
||||
SDL_VITA_SensorDetect,
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ static SDL_Windows_Sensor *SDL_sensors;
|
|||
static int ConnectSensor(ISensor *sensor);
|
||||
static int DisconnectSensor(ISensor *sensor);
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorManagerEventsVtbl_QueryInterface(ISensorManagerEvents * This, REFIID riid, void **ppvObject)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorManagerEventsVtbl_QueryInterface(ISensorManagerEvents *This, REFIID riid, void **ppvObject)
|
||||
{
|
||||
if (ppvObject == NULL) {
|
||||
return E_INVALIDARG;
|
||||
|
|
@ -74,17 +74,17 @@ static HRESULT STDMETHODCALLTYPE ISensorManagerEventsVtbl_QueryInterface(ISensor
|
|||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
static ULONG STDMETHODCALLTYPE ISensorManagerEventsVtbl_AddRef(ISensorManagerEvents * This)
|
||||
static ULONG STDMETHODCALLTYPE ISensorManagerEventsVtbl_AddRef(ISensorManagerEvents *This)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static ULONG STDMETHODCALLTYPE ISensorManagerEventsVtbl_Release(ISensorManagerEvents * This)
|
||||
static ULONG STDMETHODCALLTYPE ISensorManagerEventsVtbl_Release(ISensorManagerEvents *This)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorManagerEventsVtbl_OnSensorEnter(ISensorManagerEvents * This, ISensor *pSensor, SensorState state)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorManagerEventsVtbl_OnSensorEnter(ISensorManagerEvents *This, ISensor *pSensor, SensorState state)
|
||||
{
|
||||
ConnectSensor(pSensor);
|
||||
return S_OK;
|
||||
|
|
@ -100,7 +100,7 @@ static ISensorManagerEvents sensor_manager_events = {
|
|||
&sensor_manager_events_vtbl
|
||||
};
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_QueryInterface(ISensorEvents * This, REFIID riid, void **ppvObject)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_QueryInterface(ISensorEvents *This, REFIID riid, void **ppvObject)
|
||||
{
|
||||
if (ppvObject == NULL) {
|
||||
return E_INVALIDARG;
|
||||
|
|
@ -114,17 +114,17 @@ static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_QueryInterface(ISensorEvents
|
|||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
static ULONG STDMETHODCALLTYPE ISensorEventsVtbl_AddRef(ISensorEvents * This)
|
||||
static ULONG STDMETHODCALLTYPE ISensorEventsVtbl_AddRef(ISensorEvents *This)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static ULONG STDMETHODCALLTYPE ISensorEventsVtbl_Release(ISensorEvents * This)
|
||||
static ULONG STDMETHODCALLTYPE ISensorEventsVtbl_Release(ISensorEvents *This)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnStateChanged(ISensorEvents * This, ISensor *pSensor, SensorState state)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnStateChanged(ISensorEvents *This, ISensor *pSensor, SensorState state)
|
||||
{
|
||||
#ifdef DEBUG_SENSORS
|
||||
int i;
|
||||
|
|
@ -140,7 +140,7 @@ static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnStateChanged(ISensorEvents
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnDataUpdated(ISensorEvents * This, ISensor *pSensor, ISensorDataReport *pNewData)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnDataUpdated(ISensorEvents *This, ISensor *pSensor, ISensorDataReport *pNewData)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -197,7 +197,7 @@ static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnDataUpdated(ISensorEvents *
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnEvent(ISensorEvents * This, ISensor *pSensor, REFGUID eventID, IPortableDeviceValues *pEventData)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnEvent(ISensorEvents *This, ISensor *pSensor, REFGUID eventID, IPortableDeviceValues *pEventData)
|
||||
{
|
||||
#ifdef DEBUG_SENSORS
|
||||
int i;
|
||||
|
|
@ -213,7 +213,7 @@ static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnEvent(ISensorEvents * This,
|
|||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnLeave(ISensorEvents * This, REFSENSOR_ID ID)
|
||||
static HRESULT STDMETHODCALLTYPE ISensorEventsVtbl_OnLeave(ISensorEvents *This, REFSENSOR_ID ID)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -338,8 +338,7 @@ static int DisconnectSensor(ISensor *sensor)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_WINDOWS_SensorInit(void)
|
||||
static int SDL_WINDOWS_SensorInit(void)
|
||||
{
|
||||
HRESULT hr;
|
||||
ISensorCollection *sensor_collection = NULL;
|
||||
|
|
@ -348,7 +347,7 @@ SDL_WINDOWS_SensorInit(void)
|
|||
SDL_windowscoinit = SDL_TRUE;
|
||||
}
|
||||
|
||||
hr = CoCreateInstance(&SDL_CLSID_SensorManager, NULL, CLSCTX_INPROC_SERVER, &SDL_IID_SensorManager, (LPVOID *) &SDL_sensor_manager);
|
||||
hr = CoCreateInstance(&SDL_CLSID_SensorManager, NULL, CLSCTX_INPROC_SERVER, &SDL_IID_SensorManager, (LPVOID *)&SDL_sensor_manager);
|
||||
if (FAILED(hr)) {
|
||||
/* If we can't create a sensor manager (i.e. on Wine), we won't have any sensors, but don't fail the init */
|
||||
return 0; /* WIN_SetErrorFromHRESULT("Couldn't create the sensor manager", hr); */
|
||||
|
|
@ -387,55 +386,46 @@ SDL_WINDOWS_SensorInit(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_WINDOWS_SensorGetCount(void)
|
||||
static int SDL_WINDOWS_SensorGetCount(void)
|
||||
{
|
||||
return SDL_num_sensors;
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_WINDOWS_SensorDetect(void)
|
||||
static void SDL_WINDOWS_SensorDetect(void)
|
||||
{
|
||||
}
|
||||
|
||||
static const char *
|
||||
SDL_WINDOWS_SensorGetDeviceName(int device_index)
|
||||
static const char *SDL_WINDOWS_SensorGetDeviceName(int device_index)
|
||||
{
|
||||
return SDL_sensors[device_index].name;
|
||||
}
|
||||
|
||||
static SDL_SensorType
|
||||
SDL_WINDOWS_SensorGetDeviceType(int device_index)
|
||||
static SDL_SensorType SDL_WINDOWS_SensorGetDeviceType(int device_index)
|
||||
{
|
||||
return SDL_sensors[device_index].type;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_WINDOWS_SensorGetDeviceNonPortableType(int device_index)
|
||||
static int SDL_WINDOWS_SensorGetDeviceNonPortableType(int device_index)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
static SDL_SensorID
|
||||
SDL_WINDOWS_SensorGetDeviceInstanceID(int device_index)
|
||||
static SDL_SensorID SDL_WINDOWS_SensorGetDeviceInstanceID(int device_index)
|
||||
{
|
||||
return SDL_sensors[device_index].id;
|
||||
}
|
||||
|
||||
static int
|
||||
SDL_WINDOWS_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
static int SDL_WINDOWS_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||
{
|
||||
SDL_sensors[device_index].sensor_opened = sensor;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_WINDOWS_SensorUpdate(SDL_Sensor *sensor)
|
||||
static void SDL_WINDOWS_SensorUpdate(SDL_Sensor *sensor)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_WINDOWS_SensorClose(SDL_Sensor *sensor)
|
||||
static void SDL_WINDOWS_SensorClose(SDL_Sensor *sensor)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -447,8 +437,7 @@ SDL_WINDOWS_SensorClose(SDL_Sensor *sensor)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
SDL_WINDOWS_SensorQuit(void)
|
||||
static void SDL_WINDOWS_SensorQuit(void)
|
||||
{
|
||||
while (SDL_num_sensors > 0) {
|
||||
DisconnectSensor(SDL_sensors[0].sensor);
|
||||
|
|
@ -465,8 +454,7 @@ SDL_WINDOWS_SensorQuit(void)
|
|||
}
|
||||
}
|
||||
|
||||
SDL_SensorDriver SDL_WINDOWS_SensorDriver =
|
||||
{
|
||||
SDL_SensorDriver SDL_WINDOWS_SensorDriver = {
|
||||
SDL_WINDOWS_SensorInit,
|
||||
SDL_WINDOWS_SensorGetCount,
|
||||
SDL_WINDOWS_SensorDetect,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue