mirror of https://github.com/encounter/SDL.git
Fixed Windows accelerometer data units
This commit is contained in:
Sam Lantinga
parent
3d942ccc15
commit
e9c94ac0b3
|
|
@ -47,12 +47,12 @@ DEFINE_PROPERTYKEY(SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Z_DEGREES_PER_SECOND, 0X3F8
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
SDL_SensorID id;
|
SDL_SensorID id;
|
||||||
ISensor *sensor;
|
ISensor *sensor;
|
||||||
SENSOR_ID sensor_id;
|
SENSOR_ID sensor_id;
|
||||||
char *name;
|
char *name;
|
||||||
SDL_SensorType type;
|
SDL_SensorType type;
|
||||||
SDL_Sensor *sensor_opened;
|
SDL_Sensor *sensor_opened;
|
||||||
|
|
||||||
} SDL_Windows_Sensor;
|
} SDL_Windows_Sensor;
|
||||||
|
|
||||||
|
|
@ -66,320 +66,322 @@ 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) {
|
if (!ppvObject) {
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
}
|
}
|
||||||
|
|
||||||
*ppvObject = NULL;
|
*ppvObject = NULL;
|
||||||
if (WIN_IsEqualIID(riid, &IID_IUnknown) || WIN_IsEqualIID(riid, &IID_SensorManagerEvents)) {
|
if (WIN_IsEqualIID(riid, &IID_IUnknown) || WIN_IsEqualIID(riid, &IID_SensorManagerEvents)) {
|
||||||
*ppvObject = This;
|
*ppvObject = This;
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
return E_NOINTERFACE;
|
return E_NOINTERFACE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG STDMETHODCALLTYPE ISensorManagerEventsVtbl_AddRef(ISensorManagerEvents * This)
|
static ULONG STDMETHODCALLTYPE ISensorManagerEventsVtbl_AddRef(ISensorManagerEvents * This)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG STDMETHODCALLTYPE ISensorManagerEventsVtbl_Release(ISensorManagerEvents * This)
|
static ULONG STDMETHODCALLTYPE ISensorManagerEventsVtbl_Release(ISensorManagerEvents * This)
|
||||||
{
|
{
|
||||||
return 1;
|
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);
|
ConnectSensor(pSensor);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ISensorManagerEventsVtbl sensor_manager_events_vtbl = {
|
static ISensorManagerEventsVtbl sensor_manager_events_vtbl = {
|
||||||
ISensorManagerEventsVtbl_QueryInterface,
|
ISensorManagerEventsVtbl_QueryInterface,
|
||||||
ISensorManagerEventsVtbl_AddRef,
|
ISensorManagerEventsVtbl_AddRef,
|
||||||
ISensorManagerEventsVtbl_Release,
|
ISensorManagerEventsVtbl_Release,
|
||||||
ISensorManagerEventsVtbl_OnSensorEnter
|
ISensorManagerEventsVtbl_OnSensorEnter
|
||||||
};
|
};
|
||||||
static ISensorManagerEvents sensor_manager_events = {
|
static ISensorManagerEvents sensor_manager_events = {
|
||||||
&sensor_manager_events_vtbl
|
&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) {
|
if (!ppvObject) {
|
||||||
return E_INVALIDARG;
|
return E_INVALIDARG;
|
||||||
}
|
}
|
||||||
|
|
||||||
*ppvObject = NULL;
|
*ppvObject = NULL;
|
||||||
if (WIN_IsEqualIID(riid, &IID_IUnknown) || WIN_IsEqualIID(riid, &IID_SensorEvents)) {
|
if (WIN_IsEqualIID(riid, &IID_IUnknown) || WIN_IsEqualIID(riid, &IID_SensorEvents)) {
|
||||||
*ppvObject = This;
|
*ppvObject = This;
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
return E_NOINTERFACE;
|
return E_NOINTERFACE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG STDMETHODCALLTYPE ISensorEventsVtbl_AddRef(ISensorEvents * This)
|
static ULONG STDMETHODCALLTYPE ISensorEventsVtbl_AddRef(ISensorEvents * This)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ULONG STDMETHODCALLTYPE ISensorEventsVtbl_Release(ISensorEvents * This)
|
static ULONG STDMETHODCALLTYPE ISensorEventsVtbl_Release(ISensorEvents * This)
|
||||||
{
|
{
|
||||||
return 1;
|
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
|
#ifdef DEBUG_SENSORS
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
SDL_LockSensors();
|
SDL_LockSensors();
|
||||||
for (i = 0; i < SDL_num_sensors; ++i) {
|
for (i = 0; i < SDL_num_sensors; ++i) {
|
||||||
if (pSensor == SDL_sensors[i].sensor) {
|
if (pSensor == SDL_sensors[i].sensor) {
|
||||||
SDL_Log("Sensor %s state changed to %d\n", SDL_sensors[i].name, state);
|
SDL_Log("Sensor %s state changed to %d\n", SDL_sensors[i].name, state);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SDL_UnlockSensors();
|
SDL_UnlockSensors();
|
||||||
#endif
|
#endif
|
||||||
return S_OK;
|
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;
|
int i;
|
||||||
|
|
||||||
SDL_LockSensors();
|
SDL_LockSensors();
|
||||||
for (i = 0; i < SDL_num_sensors; ++i) {
|
for (i = 0; i < SDL_num_sensors; ++i) {
|
||||||
if (pSensor == SDL_sensors[i].sensor) {
|
if (pSensor == SDL_sensors[i].sensor) {
|
||||||
if (SDL_sensors[i].sensor_opened) {
|
if (SDL_sensors[i].sensor_opened) {
|
||||||
HRESULT hrX, hrY, hrZ;
|
HRESULT hrX, hrY, hrZ;
|
||||||
PROPVARIANT valueX, valueY, valueZ;
|
PROPVARIANT valueX, valueY, valueZ;
|
||||||
|
|
||||||
#ifdef DEBUG_SENSORS
|
#ifdef DEBUG_SENSORS
|
||||||
SDL_Log("Sensor %s data updated\n", SDL_sensors[i].name);
|
SDL_Log("Sensor %s data updated\n", SDL_sensors[i].name);
|
||||||
#endif
|
#endif
|
||||||
switch (SDL_sensors[i].type) {
|
switch (SDL_sensors[i].type) {
|
||||||
case SDL_SENSOR_ACCEL:
|
case SDL_SENSOR_ACCEL:
|
||||||
hrX = ISensorDataReport_GetSensorValue(pNewData, &SENSOR_DATA_TYPE_ACCELERATION_X_G, &valueX);
|
hrX = ISensorDataReport_GetSensorValue(pNewData, &SENSOR_DATA_TYPE_ACCELERATION_X_G, &valueX);
|
||||||
hrY = ISensorDataReport_GetSensorValue(pNewData, &SENSOR_DATA_TYPE_ACCELERATION_Y_G, &valueY);
|
hrY = ISensorDataReport_GetSensorValue(pNewData, &SENSOR_DATA_TYPE_ACCELERATION_Y_G, &valueY);
|
||||||
hrZ = ISensorDataReport_GetSensorValue(pNewData, &SENSOR_DATA_TYPE_ACCELERATION_Z_G, &valueZ);
|
hrZ = ISensorDataReport_GetSensorValue(pNewData, &SENSOR_DATA_TYPE_ACCELERATION_Z_G, &valueZ);
|
||||||
if (SUCCEEDED(hrX) && SUCCEEDED(hrY) && SUCCEEDED(hrZ) &&
|
if (SUCCEEDED(hrX) && SUCCEEDED(hrY) && SUCCEEDED(hrZ) &&
|
||||||
valueX.vt == VT_R8 && valueY.vt == VT_R8 && valueZ.vt == VT_R8) {
|
valueX.vt == VT_R8 && valueY.vt == VT_R8 && valueZ.vt == VT_R8) {
|
||||||
float values[3];
|
float values[3];
|
||||||
|
|
||||||
values[0] = (float)valueX.dblVal;
|
values[0] = (float)valueX.dblVal * SDL_STANDARD_GRAVITY;
|
||||||
values[1] = (float)valueY.dblVal;
|
values[1] = (float)valueY.dblVal * SDL_STANDARD_GRAVITY;
|
||||||
values[2] = (float)valueZ.dblVal;
|
values[2] = (float)valueZ.dblVal * SDL_STANDARD_GRAVITY;
|
||||||
SDL_PrivateSensorUpdate(SDL_sensors[i].sensor_opened, values, 3);
|
SDL_PrivateSensorUpdate(SDL_sensors[i].sensor_opened, values, 3);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SDL_SENSOR_GYRO:
|
case SDL_SENSOR_GYRO:
|
||||||
hrX = ISensorDataReport_GetSensorValue(pNewData, &SENSOR_DATA_TYPE_ANGULAR_VELOCITY_X_DEGREES_PER_SECOND, &valueX);
|
hrX = ISensorDataReport_GetSensorValue(pNewData, &SENSOR_DATA_TYPE_ANGULAR_VELOCITY_X_DEGREES_PER_SECOND, &valueX);
|
||||||
hrY = ISensorDataReport_GetSensorValue(pNewData, &SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Y_DEGREES_PER_SECOND, &valueY);
|
hrY = ISensorDataReport_GetSensorValue(pNewData, &SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Y_DEGREES_PER_SECOND, &valueY);
|
||||||
hrZ = ISensorDataReport_GetSensorValue(pNewData, &SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Z_DEGREES_PER_SECOND, &valueZ);
|
hrZ = ISensorDataReport_GetSensorValue(pNewData, &SENSOR_DATA_TYPE_ANGULAR_VELOCITY_Z_DEGREES_PER_SECOND, &valueZ);
|
||||||
if (SUCCEEDED(hrX) && SUCCEEDED(hrY) && SUCCEEDED(hrZ) &&
|
if (SUCCEEDED(hrX) && SUCCEEDED(hrY) && SUCCEEDED(hrZ) &&
|
||||||
valueX.vt == VT_R8 && valueY.vt == VT_R8 && valueZ.vt == VT_R8) {
|
valueX.vt == VT_R8 && valueY.vt == VT_R8 && valueZ.vt == VT_R8) {
|
||||||
float values[3];
|
const float DEGREES_TO_RADIANS = (float)(M_PI / 180.0f);
|
||||||
|
float values[3];
|
||||||
|
|
||||||
values[0] = (float)(valueX.dblVal * (M_PI / 180.0));
|
values[0] = (float)valueX.dblVal * DEGREES_TO_RADIANS;
|
||||||
values[1] = (float)(valueY.dblVal * (M_PI / 180.0));
|
values[1] = (float)valueY.dblVal * DEGREES_TO_RADIANS;
|
||||||
values[2] = (float)(valueZ.dblVal * (M_PI / 180.0));
|
values[2] = (float)valueZ.dblVal * DEGREES_TO_RADIANS;
|
||||||
SDL_PrivateSensorUpdate(SDL_sensors[i].sensor_opened, values, 3);
|
SDL_PrivateSensorUpdate(SDL_sensors[i].sensor_opened, values, 3);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
/* FIXME: Need to know how to interpret the data for this sensor */
|
/* FIXME: Need to know how to interpret the data for this sensor */
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SDL_UnlockSensors();
|
SDL_UnlockSensors();
|
||||||
|
|
||||||
return S_OK;
|
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
|
#ifdef DEBUG_SENSORS
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
SDL_LockSensors();
|
SDL_LockSensors();
|
||||||
for (i = 0; i < SDL_num_sensors; ++i) {
|
for (i = 0; i < SDL_num_sensors; ++i) {
|
||||||
if (pSensor == SDL_sensors[i].sensor) {
|
if (pSensor == SDL_sensors[i].sensor) {
|
||||||
SDL_Log("Sensor %s event occurred\n", SDL_sensors[i].name);
|
SDL_Log("Sensor %s event occurred\n", SDL_sensors[i].name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SDL_UnlockSensors();
|
SDL_UnlockSensors();
|
||||||
#endif
|
#endif
|
||||||
return S_OK;
|
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;
|
int i;
|
||||||
|
|
||||||
SDL_LockSensors();
|
SDL_LockSensors();
|
||||||
for (i = 0; i < SDL_num_sensors; ++i) {
|
for (i = 0; i < SDL_num_sensors; ++i) {
|
||||||
if (WIN_IsEqualIID(ID, &SDL_sensors[i].sensor_id)) {
|
if (WIN_IsEqualIID(ID, &SDL_sensors[i].sensor_id)) {
|
||||||
#ifdef DEBUG_SENSORS
|
#ifdef DEBUG_SENSORS
|
||||||
SDL_Log("Sensor %s disconnected\n", SDL_sensors[i].name);
|
SDL_Log("Sensor %s disconnected\n", SDL_sensors[i].name);
|
||||||
#endif
|
#endif
|
||||||
DisconnectSensor(SDL_sensors[i].sensor);
|
DisconnectSensor(SDL_sensors[i].sensor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SDL_UnlockSensors();
|
SDL_UnlockSensors();
|
||||||
|
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ISensorEventsVtbl sensor_events_vtbl = {
|
static ISensorEventsVtbl sensor_events_vtbl = {
|
||||||
ISensorEventsVtbl_QueryInterface,
|
ISensorEventsVtbl_QueryInterface,
|
||||||
ISensorEventsVtbl_AddRef,
|
ISensorEventsVtbl_AddRef,
|
||||||
ISensorEventsVtbl_Release,
|
ISensorEventsVtbl_Release,
|
||||||
ISensorEventsVtbl_OnStateChanged,
|
ISensorEventsVtbl_OnStateChanged,
|
||||||
ISensorEventsVtbl_OnDataUpdated,
|
ISensorEventsVtbl_OnDataUpdated,
|
||||||
ISensorEventsVtbl_OnEvent,
|
ISensorEventsVtbl_OnEvent,
|
||||||
ISensorEventsVtbl_OnLeave
|
ISensorEventsVtbl_OnLeave
|
||||||
};
|
};
|
||||||
static ISensorEvents sensor_events = {
|
static ISensorEvents sensor_events = {
|
||||||
&sensor_events_vtbl
|
&sensor_events_vtbl
|
||||||
};
|
};
|
||||||
|
|
||||||
static int ConnectSensor(ISensor *sensor)
|
static int ConnectSensor(ISensor *sensor)
|
||||||
{
|
{
|
||||||
SDL_Windows_Sensor *new_sensor, *new_sensors;
|
SDL_Windows_Sensor *new_sensor, *new_sensors;
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
SENSOR_ID sensor_id;
|
SENSOR_ID sensor_id;
|
||||||
SENSOR_TYPE_ID type_id;
|
SENSOR_TYPE_ID type_id;
|
||||||
SDL_SensorType type;
|
SDL_SensorType type;
|
||||||
BSTR bstr_name = NULL;
|
BSTR bstr_name = NULL;
|
||||||
char *name;
|
char *name;
|
||||||
|
|
||||||
hr = ISensor_GetID(sensor, &sensor_id);
|
hr = ISensor_GetID(sensor, &sensor_id);
|
||||||
if (FAILED(hr)) {
|
if (FAILED(hr)) {
|
||||||
return SDL_SetError("Couldn't get sensor ID: 0x%.4x", hr);
|
return SDL_SetError("Couldn't get sensor ID: 0x%.4x", hr);
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = ISensor_GetType(sensor, &type_id);
|
hr = ISensor_GetType(sensor, &type_id);
|
||||||
if (FAILED(hr)) {
|
if (FAILED(hr)) {
|
||||||
return SDL_SetError("Couldn't get sensor type: 0x%.4x", hr);
|
return SDL_SetError("Couldn't get sensor type: 0x%.4x", hr);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (WIN_IsEqualIID(&type_id, &SENSOR_TYPE_ACCELEROMETER_3D)) {
|
if (WIN_IsEqualIID(&type_id, &SENSOR_TYPE_ACCELEROMETER_3D)) {
|
||||||
type = SDL_SENSOR_ACCEL;
|
type = SDL_SENSOR_ACCEL;
|
||||||
} else if (WIN_IsEqualIID(&type_id, &SENSOR_TYPE_GYROMETER_3D)) {
|
} else if (WIN_IsEqualIID(&type_id, &SENSOR_TYPE_GYROMETER_3D)) {
|
||||||
type = SDL_SENSOR_GYRO;
|
type = SDL_SENSOR_GYRO;
|
||||||
} else {
|
} else {
|
||||||
return SDL_SetError("Unknown sensor type");
|
return SDL_SetError("Unknown sensor type");
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = ISensor_GetFriendlyName(sensor, &bstr_name);
|
hr = ISensor_GetFriendlyName(sensor, &bstr_name);
|
||||||
if (SUCCEEDED(hr) && bstr_name) {
|
if (SUCCEEDED(hr) && bstr_name) {
|
||||||
name = WIN_StringToUTF8(bstr_name);
|
name = WIN_StringToUTF8(bstr_name);
|
||||||
} else {
|
} else {
|
||||||
name = SDL_strdup("Unknown Sensor");
|
name = SDL_strdup("Unknown Sensor");
|
||||||
}
|
}
|
||||||
if (bstr_name != NULL) {
|
if (bstr_name != NULL) {
|
||||||
SysFreeString(bstr_name);
|
SysFreeString(bstr_name);
|
||||||
}
|
}
|
||||||
if (!name) {
|
if (!name) {
|
||||||
return SDL_OutOfMemory();
|
return SDL_OutOfMemory();
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_LockSensors();
|
SDL_LockSensors();
|
||||||
new_sensors = (SDL_Windows_Sensor *)SDL_realloc(SDL_sensors, (SDL_num_sensors + 1) * sizeof(SDL_Windows_Sensor));
|
new_sensors = (SDL_Windows_Sensor *)SDL_realloc(SDL_sensors, (SDL_num_sensors + 1) * sizeof(SDL_Windows_Sensor));
|
||||||
if (new_sensors == NULL) {
|
if (new_sensors == NULL) {
|
||||||
SDL_UnlockSensors();
|
SDL_UnlockSensors();
|
||||||
return SDL_OutOfMemory();
|
return SDL_OutOfMemory();
|
||||||
}
|
}
|
||||||
|
|
||||||
ISensor_AddRef(sensor);
|
ISensor_AddRef(sensor);
|
||||||
ISensor_SetEventSink(sensor, &sensor_events);
|
ISensor_SetEventSink(sensor, &sensor_events);
|
||||||
|
|
||||||
SDL_sensors = new_sensors;
|
SDL_sensors = new_sensors;
|
||||||
new_sensor = &SDL_sensors[SDL_num_sensors];
|
new_sensor = &SDL_sensors[SDL_num_sensors];
|
||||||
++SDL_num_sensors;
|
++SDL_num_sensors;
|
||||||
|
|
||||||
new_sensor->id = SDL_GetNextSensorInstanceID();
|
SDL_zerop(new_sensor);
|
||||||
new_sensor->sensor = sensor;
|
new_sensor->id = SDL_GetNextSensorInstanceID();
|
||||||
new_sensor->type = type;
|
new_sensor->sensor = sensor;
|
||||||
new_sensor->name = name;
|
new_sensor->type = type;
|
||||||
|
new_sensor->name = name;
|
||||||
|
|
||||||
SDL_UnlockSensors();
|
SDL_UnlockSensors();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int DisconnectSensor(ISensor *sensor)
|
static int DisconnectSensor(ISensor *sensor)
|
||||||
{
|
{
|
||||||
SDL_Windows_Sensor *old_sensor;
|
SDL_Windows_Sensor *old_sensor;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
SDL_LockSensors();
|
SDL_LockSensors();
|
||||||
for (i = 0; i < SDL_num_sensors; ++i) {
|
for (i = 0; i < SDL_num_sensors; ++i) {
|
||||||
old_sensor = &SDL_sensors[i];
|
old_sensor = &SDL_sensors[i];
|
||||||
if (sensor == old_sensor->sensor) {
|
if (sensor == old_sensor->sensor) {
|
||||||
ISensor_SetEventSink(sensor, NULL);
|
ISensor_SetEventSink(sensor, NULL);
|
||||||
ISensor_Release(sensor);
|
ISensor_Release(sensor);
|
||||||
SDL_free(old_sensor->name);
|
SDL_free(old_sensor->name);
|
||||||
--SDL_num_sensors;
|
--SDL_num_sensors;
|
||||||
if (i < SDL_num_sensors) {
|
if (i < SDL_num_sensors) {
|
||||||
SDL_memmove(&SDL_sensors[i], &SDL_sensors[i + 1], (SDL_num_sensors - i) * sizeof(SDL_sensors[i]));
|
SDL_memmove(&SDL_sensors[i], &SDL_sensors[i + 1], (SDL_num_sensors - i) * sizeof(SDL_sensors[i]));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SDL_UnlockSensors();
|
SDL_UnlockSensors();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
SDL_WINDOWS_SensorInit(void)
|
SDL_WINDOWS_SensorInit(void)
|
||||||
{
|
{
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
ISensorCollection *sensor_collection = NULL;
|
ISensorCollection *sensor_collection = NULL;
|
||||||
|
|
||||||
if (WIN_CoInitialize() == S_OK) {
|
if (WIN_CoInitialize() == S_OK) {
|
||||||
SDL_windowscoinit = SDL_TRUE;
|
SDL_windowscoinit = SDL_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = CoCreateInstance(&CLSID_SensorManager, NULL, CLSCTX_INPROC_SERVER, &IID_SensorManager, &SDL_sensor_manager);
|
hr = CoCreateInstance(&CLSID_SensorManager, NULL, CLSCTX_INPROC_SERVER, &IID_SensorManager, &SDL_sensor_manager);
|
||||||
if (FAILED(hr)) {
|
if (FAILED(hr)) {
|
||||||
return SDL_SetError("Couldn't create the sensor manager: 0x%.4x", hr);
|
return SDL_SetError("Couldn't create the sensor manager: 0x%.4x", hr);
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = ISensorManager_SetEventSink(SDL_sensor_manager, &sensor_manager_events);
|
hr = ISensorManager_SetEventSink(SDL_sensor_manager, &sensor_manager_events);
|
||||||
if (FAILED(hr)) {
|
if (FAILED(hr)) {
|
||||||
ISensorManager_Release(SDL_sensor_manager);
|
ISensorManager_Release(SDL_sensor_manager);
|
||||||
return SDL_SetError("Couldn't set the sensor manager event sink: 0x%.4x", hr);
|
return SDL_SetError("Couldn't set the sensor manager event sink: 0x%.4x", hr);
|
||||||
}
|
}
|
||||||
|
|
||||||
hr = ISensorManager_GetSensorsByCategory(SDL_sensor_manager, &SENSOR_CATEGORY_ALL, &sensor_collection);
|
hr = ISensorManager_GetSensorsByCategory(SDL_sensor_manager, &SENSOR_CATEGORY_ALL, &sensor_collection);
|
||||||
if (SUCCEEDED(hr)) {
|
if (SUCCEEDED(hr)) {
|
||||||
ULONG i, count;
|
ULONG i, count;
|
||||||
|
|
||||||
hr = ISensorCollection_GetCount(sensor_collection, &count);
|
hr = ISensorCollection_GetCount(sensor_collection, &count);
|
||||||
if (SUCCEEDED(hr)) {
|
if (SUCCEEDED(hr)) {
|
||||||
for (i = 0; i < count; ++i) {
|
for (i = 0; i < count; ++i) {
|
||||||
ISensor *sensor;
|
ISensor *sensor;
|
||||||
|
|
||||||
hr = ISensorCollection_GetAt(sensor_collection, i, &sensor);
|
hr = ISensorCollection_GetAt(sensor_collection, i, &sensor);
|
||||||
if (SUCCEEDED(hr)) {
|
if (SUCCEEDED(hr)) {
|
||||||
SensorState state;
|
SensorState state;
|
||||||
|
|
||||||
hr = ISensor_GetState(sensor, &state);
|
hr = ISensor_GetState(sensor, &state);
|
||||||
if (SUCCEEDED(hr)) {
|
if (SUCCEEDED(hr)) {
|
||||||
ISensorManagerEventsVtbl_OnSensorEnter(&sensor_manager_events, sensor, state);
|
ISensorManagerEventsVtbl_OnSensorEnter(&sensor_manager_events, sensor, state);
|
||||||
}
|
}
|
||||||
ISensorManager_Release(sensor);
|
ISensorManager_Release(sensor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ISensorCollection_Release(sensor_collection);
|
ISensorCollection_Release(sensor_collection);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -403,7 +405,7 @@ SDL_WINDOWS_SensorGetDeviceName(int device_index)
|
||||||
static SDL_SensorType
|
static SDL_SensorType
|
||||||
SDL_WINDOWS_SensorGetDeviceType(int device_index)
|
SDL_WINDOWS_SensorGetDeviceType(int device_index)
|
||||||
{
|
{
|
||||||
return SDL_sensors[device_index].type;
|
return SDL_sensors[device_index].type;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
|
@ -421,7 +423,7 @@ SDL_WINDOWS_SensorGetDeviceInstanceID(int device_index)
|
||||||
static int
|
static int
|
||||||
SDL_WINDOWS_SensorOpen(SDL_Sensor *sensor, int device_index)
|
SDL_WINDOWS_SensorOpen(SDL_Sensor *sensor, int device_index)
|
||||||
{
|
{
|
||||||
SDL_sensors[device_index].sensor_opened = sensor;
|
SDL_sensors[device_index].sensor_opened = sensor;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -433,32 +435,32 @@ SDL_WINDOWS_SensorUpdate(SDL_Sensor *sensor)
|
||||||
static void
|
static void
|
||||||
SDL_WINDOWS_SensorClose(SDL_Sensor *sensor)
|
SDL_WINDOWS_SensorClose(SDL_Sensor *sensor)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < SDL_num_sensors; ++i) {
|
for (i = 0; i < SDL_num_sensors; ++i) {
|
||||||
if (sensor == SDL_sensors[i].sensor_opened) {
|
if (sensor == SDL_sensors[i].sensor_opened) {
|
||||||
SDL_sensors[i].sensor_opened = NULL;
|
SDL_sensors[i].sensor_opened = NULL;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
SDL_WINDOWS_SensorQuit(void)
|
SDL_WINDOWS_SensorQuit(void)
|
||||||
{
|
{
|
||||||
while (SDL_num_sensors > 0) {
|
while (SDL_num_sensors > 0) {
|
||||||
DisconnectSensor(SDL_sensors[0].sensor);
|
DisconnectSensor(SDL_sensors[0].sensor);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SDL_sensor_manager) {
|
if (SDL_sensor_manager) {
|
||||||
ISensorManager_SetEventSink(SDL_sensor_manager, NULL);
|
ISensorManager_SetEventSink(SDL_sensor_manager, NULL);
|
||||||
ISensorManager_Release(SDL_sensor_manager);
|
ISensorManager_Release(SDL_sensor_manager);
|
||||||
SDL_sensor_manager = NULL;
|
SDL_sensor_manager = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (SDL_windowscoinit) {
|
if (SDL_windowscoinit) {
|
||||||
WIN_CoUninitialize();
|
WIN_CoUninitialize();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_SensorDriver SDL_WINDOWS_SensorDriver =
|
SDL_SensorDriver SDL_WINDOWS_SensorDriver =
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue