lpnf/lovr
1
0
Fork 0
mirror of https://github.com/bjornbytes/lovr.git synced 2024-07-02 20:43:35 +00:00
Code Issues Projects Releases Wiki Activity

Controller:isPresent;

Browse source
This commit is contained in:
bjorn 2016-10-03 11:12:06 -07:00
parent dbc1037d4c
commit b594b218b2
4 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/headset/headset.c
View file

@ -55,6 +55,10 @@ Controller* lovrHeadsetGetController(ControllerHand hand) {
return headset->interface->getController(headset, hand); return headset->interface->getController(headset, hand);
} }
char lovrHeadsetIsControllerPresent(Controller* controller) {
return headset->interface->isControllerPresent(headset, controller);
}
void lovrHeadsetRenderTo(headsetRenderCallback callback, void* userdata) { void lovrHeadsetRenderTo(headsetRenderCallback callback, void* userdata) {
headset->interface->renderTo(headset, callback, userdata); headset->interface->renderTo(headset, callback, userdata);
} }

2
src/headset/headset.h
View file

@ -24,6 +24,7 @@ typedef struct {
void (*getVelocity)(void* headset, float* x, float* y, float* z); void (*getVelocity)(void* headset, float* x, float* y, float* z);
void (*getAngularVelocity)(void* headset, float* x, float* y, float* z); void (*getAngularVelocity)(void* headset, float* x, float* y, float* z);
Controller* (*getController)(void* headset, ControllerHand hand); Controller* (*getController)(void* headset, ControllerHand hand);
char (*isControllerPresent)(void* headset, Controller* controller);
void (*renderTo)(void* headset, headsetRenderCallback callback, void* userdata); void (*renderTo)(void* headset, headsetRenderCallback callback, void* userdata);
} HeadsetInterface; } HeadsetInterface;
@ -46,4 +47,5 @@ void lovrHeadsetGetOrientation(float* x, float* y, float* z, float* w);
void lovrHeadsetGetVelocity(float* x, float* y, float* z); void lovrHeadsetGetVelocity(float* x, float* y, float* z);
void lovrHeadsetGetAngularVelocity(float* x, float* y, float* z); void lovrHeadsetGetAngularVelocity(float* x, float* y, float* z);
Controller* lovrHeadsetGetController(ControllerHand hand); Controller* lovrHeadsetGetController(ControllerHand hand);
char lovrHeadsetIsControllerPresent(Controller* controller);
void lovrHeadsetRenderTo(headsetRenderCallback callback, void* userdata); void lovrHeadsetRenderTo(headsetRenderCallback callback, void* userdata);

7
src/headset/vive.c
View file

@ -40,6 +40,7 @@ static HeadsetInterface interface = {
.getVelocity = viveGetVelocity, .getVelocity = viveGetVelocity,
.getAngularVelocity = viveGetAngularVelocity, .getAngularVelocity = viveGetAngularVelocity,
.getController = viveGetController, .getController = viveGetController,
.isControllerPresent = viveIsControllerPresent,
.renderTo = viveRenderTo .renderTo = viveRenderTo
}; };
@ -241,6 +242,12 @@ Controller* viveGetController(void* headset, ControllerHand hand) {
return state->controllers[hand]; return state->controllers[hand];
} }
char viveIsControllerPresent(void* headset, Controller* controller) {
Headset* this = headset;
ViveState* state = this->state;
return state->vrSystem->IsTrackedDeviceConnected(state->controllerIndex[controller->hand]);
}
void viveRenderTo(void* headset, headsetRenderCallback callback, void* userdata) { void viveRenderTo(void* headset, headsetRenderCallback callback, void* userdata) {
Headset* this = headset; Headset* this = headset;
ViveState* state = this->state; ViveState* state = this->state;

1
src/headset/vive.h
View file

@ -15,4 +15,5 @@ void viveGetOrientation(void* headset, float* x, float* y, float* z, float* w);
void viveGetVelocity(void* headset, float* x, float* y, float* z); void viveGetVelocity(void* headset, float* x, float* y, float* z);
void viveGetAngularVelocity(void* headset, float* x, float* y, float* z); void viveGetAngularVelocity(void* headset, float* x, float* y, float* z);
Controller* viveGetController(void* headset, ControllerHand hand); Controller* viveGetController(void* headset, ControllerHand hand);
char viveIsControllerPresent(void* headset, Controller* controller);
void viveRenderTo(void* headset, headsetRenderCallback callback, void* userdata); void viveRenderTo(void* headset, headsetRenderCallback callback, void* userdata);