mirror of
https://github.com/CrispyPin/sinpin-vr.git
synced 2024-11-10 04:20:25 +01:00
convert to steamvr input system & add binding to toggle all overlays
This commit is contained in:
parent
4bc69f2e53
commit
41f01e29a6
7 changed files with 186 additions and 42 deletions
2
Makefile
2
Makefile
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
|
|
||||||
build:
|
build:
|
||||||
CPATH=. g++ -Wall -lX11 -lXrandr -lglfw -lGL openvr/libopenvr_api.so src/*.cpp -o overlay
|
g++ -Wall -lX11 -lXrandr -lglfw -lGL openvr/libopenvr_api.so src/*.cpp -o overlay
|
||||||
|
|
||||||
run: build
|
run: build
|
||||||
./overlay
|
./overlay
|
||||||
|
|
40
bindings/action_manifest.json
Normal file
40
bindings/action_manifest.json
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
{
|
||||||
|
"default_bindings": [
|
||||||
|
{
|
||||||
|
"controller_type": "knuckles",
|
||||||
|
"binding_url": "index_controller.json"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"actions": [
|
||||||
|
{
|
||||||
|
"name": "/actions/main/in/ToggleAll",
|
||||||
|
"requirement": "mandatory",
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "/actions/main/in/Grab",
|
||||||
|
"requirement": "mandatory",
|
||||||
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "/actions/main/in/Distance",
|
||||||
|
"requirement": "suggested",
|
||||||
|
"type": "vector2"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"action_sets": [
|
||||||
|
{
|
||||||
|
"name": "/actions/main",
|
||||||
|
"usage": "leftright"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"localization": [
|
||||||
|
{
|
||||||
|
"language_tag": "en_us",
|
||||||
|
"/actions/main": "Overlay actions",
|
||||||
|
"/actions/main/in/ToggleAll": "Toggle all",
|
||||||
|
"/actions/main/in/Grab": "Grab panel",
|
||||||
|
"/actions/main/in/Distance": "Move away"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
33
bindings/index_controller.json
Normal file
33
bindings/index_controller.json
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
{
|
||||||
|
"/actions/main": {
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"path": "/user/hand/right/input/b",
|
||||||
|
"mode": "button",
|
||||||
|
"inputs": {
|
||||||
|
"long": {
|
||||||
|
"output": "/actions/main/in/toggleall"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "/user/hand/right/input/thumbstick",
|
||||||
|
"mode": "joystick",
|
||||||
|
"inputs": {
|
||||||
|
"position": {
|
||||||
|
"output": "/actions/main/in/distance"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "/user/hand/right/input/trigger",
|
||||||
|
"mode": "button",
|
||||||
|
"inputs": {
|
||||||
|
"click": {
|
||||||
|
"output": "/actions/main/in/grab"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
93
src/app.cpp
93
src/app.cpp
|
@ -7,6 +7,7 @@
|
||||||
App::App()
|
App::App()
|
||||||
{
|
{
|
||||||
_tracking_origin = vr::TrackingUniverseStanding;
|
_tracking_origin = vr::TrackingUniverseStanding;
|
||||||
|
// _hidden = false;
|
||||||
|
|
||||||
InitOVR();
|
InitOVR();
|
||||||
InitX11();
|
InitX11();
|
||||||
|
@ -34,6 +35,22 @@ App::App()
|
||||||
vr::HmdMatrix34_t start_pose = {{{1, 0, 0, pos_x}, {0, 1, 0, pos_y}, {0, 0, 1, 0}}};
|
vr::HmdMatrix34_t start_pose = {{{1, 0, 0, pos_x}, {0, 1, 0, pos_y}, {0, 0, 1, 0}}};
|
||||||
_panels.push_back(Panel(this, start_pose, i, mon.x, mon.y, mon.width, mon.height));
|
_panels.push_back(Panel(this, start_pose, i, mon.x, mon.y, mon.width, mon.height));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{ // initialize SteamVR input
|
||||||
|
auto exe_path = std::filesystem::read_symlink("/proc/self/exe");
|
||||||
|
_actions_path = exe_path.parent_path().string() + "/bindings/action_manifest.json";
|
||||||
|
printf("actions path: %s\n", _actions_path.c_str());
|
||||||
|
vr_input->SetActionManifestPath(_actions_path.c_str());
|
||||||
|
|
||||||
|
auto action_err = vr_input->GetActionHandle("/actions/main/in/Grab", &_input_handles.grab);
|
||||||
|
assert(action_err == 0);
|
||||||
|
action_err = vr_input->GetActionHandle("/actions/main/in/ToggleAll", &_input_handles.toggle);
|
||||||
|
assert(action_err == 0);
|
||||||
|
action_err = vr_input->GetActionHandle("/actions/main/in/Distance", &_input_handles.distance);
|
||||||
|
assert(action_err == 0);
|
||||||
|
action_err = vr_input->GetActionSetHandle("/actions/main", &_input_handles.set);
|
||||||
|
assert(action_err == 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
App::~App()
|
App::~App()
|
||||||
|
@ -72,6 +89,7 @@ void App::InitOVR()
|
||||||
}
|
}
|
||||||
printf("Initialized OpenVR\n");
|
printf("Initialized OpenVR\n");
|
||||||
vr_overlay = vr::VROverlay();
|
vr_overlay = vr::VROverlay();
|
||||||
|
vr_input = vr::VRInput();
|
||||||
}
|
}
|
||||||
|
|
||||||
void App::InitGLFW()
|
void App::InitGLFW()
|
||||||
|
@ -86,6 +104,42 @@ void App::InitGLFW()
|
||||||
}
|
}
|
||||||
|
|
||||||
void App::Update()
|
void App::Update()
|
||||||
|
{
|
||||||
|
UpdateInput();
|
||||||
|
if (!_hidden)
|
||||||
|
{
|
||||||
|
UpdateFramebuffer();
|
||||||
|
for (auto &panel : _panels)
|
||||||
|
{
|
||||||
|
panel.Update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void App::UpdateInput()
|
||||||
|
{
|
||||||
|
vr::VRActiveActionSet_t main;
|
||||||
|
main.ulActionSet = _input_handles.set;
|
||||||
|
main.ulRestrictedToDevice = 0;
|
||||||
|
vr_input->UpdateActionState(&main, sizeof(vr::VRActiveActionSet_t), 1);
|
||||||
|
|
||||||
|
vr_sys->GetDeviceToAbsoluteTrackingPose(_tracking_origin, 0, _tracker_poses, vr::k_unMaxTrackedDeviceCount);
|
||||||
|
|
||||||
|
for (unsigned int i = 0; i < vr::k_unMaxTrackedDeviceCount; i++)
|
||||||
|
{
|
||||||
|
if (IsInputJustPressed(i, _input_handles.toggle))
|
||||||
|
{
|
||||||
|
_hidden = !_hidden;
|
||||||
|
for (auto &panel : _panels)
|
||||||
|
{
|
||||||
|
panel.SetHidden(_hidden);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void App::UpdateFramebuffer()
|
||||||
{
|
{
|
||||||
auto frame = XGetImage(
|
auto frame = XGetImage(
|
||||||
_xdisplay,
|
_xdisplay,
|
||||||
|
@ -97,11 +151,6 @@ void App::Update()
|
||||||
glBindTexture(GL_TEXTURE_2D, _gl_frame);
|
glBindTexture(GL_TEXTURE_2D, _gl_frame);
|
||||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, _root_width, _root_height, 0, GL_BGRA, GL_UNSIGNED_BYTE, frame->data);
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, _root_width, _root_height, 0, GL_BGRA, GL_UNSIGNED_BYTE, frame->data);
|
||||||
XDestroyImage(frame);
|
XDestroyImage(frame);
|
||||||
|
|
||||||
for (auto &panel : _panels)
|
|
||||||
{
|
|
||||||
panel.Update();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<TrackerID> App::GetControllers()
|
std::vector<TrackerID> App::GetControllers()
|
||||||
|
@ -114,35 +163,27 @@ std::vector<TrackerID> App::GetControllers()
|
||||||
|
|
||||||
glm::mat4 App::GetTrackerPose(TrackerID tracker)
|
glm::mat4 App::GetTrackerPose(TrackerID tracker)
|
||||||
{
|
{
|
||||||
vr::VRControllerState_t state;
|
return ConvertMat(_tracker_poses[tracker].mDeviceToAbsoluteTracking);
|
||||||
vr::TrackedDevicePose_t tracked_pose;
|
|
||||||
vr_sys->GetControllerStateWithPose(
|
|
||||||
_tracking_origin,
|
|
||||||
tracker,
|
|
||||||
&state,
|
|
||||||
sizeof(vr::VRControllerState_t),
|
|
||||||
&tracked_pose);
|
|
||||||
return ConvertMat(tracked_pose.mDeviceToAbsoluteTracking);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
vr::VRControllerState_t App::GetControllerState(TrackerID controller)
|
vr::InputDigitalActionData_t App::GetControllerInputDigital(TrackerID controller, vr::VRActionHandle_t action)
|
||||||
{
|
{
|
||||||
vr::VRControllerState_t state;
|
vr::InputDigitalActionData_t state;
|
||||||
auto get_state_err = vr_sys->GetControllerState(controller, &state, sizeof(vr::VRControllerState_t));
|
vr_input->GetDigitalActionData(action, &state, sizeof(vr::InputDigitalActionData_t), 0);
|
||||||
if (get_state_err == false)
|
|
||||||
printf("failed to get state of controller %d\n", controller);
|
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool App::IsGrabActive(TrackerID controller)
|
vr::InputAnalogActionData_t App::GetControllerInputAnalog(TrackerID controller, vr::VRActionHandle_t action)
|
||||||
{
|
{
|
||||||
vr::VRControllerState_t state;
|
vr::InputAnalogActionData_t state;
|
||||||
auto get_state_err = vr_sys->GetControllerState(controller, &state, sizeof(vr::VRControllerState_t));
|
vr_input->GetAnalogActionData(action, &state, sizeof(vr::InputAnalogActionData_t), 0);
|
||||||
if (get_state_err == false)
|
return state;
|
||||||
return false;
|
}
|
||||||
|
|
||||||
auto trigger_mask = vr::ButtonMaskFromId(vr::k_EButton_SteamVR_Trigger);
|
bool App::IsInputJustPressed(TrackerID controller, vr::VRActionHandle_t action)
|
||||||
return state.ulButtonPressed & trigger_mask;
|
{
|
||||||
|
auto data = GetControllerInputDigital(controller, action);
|
||||||
|
return data.bState && data.bChanged;
|
||||||
}
|
}
|
||||||
|
|
||||||
CursorPos App::GetCursorPosition()
|
CursorPos App::GetCursorPosition()
|
||||||
|
|
23
src/app.h
23
src/app.h
|
@ -2,6 +2,7 @@
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include <GLFW/glfw3.h>
|
#include <GLFW/glfw3.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
|
#include <filesystem>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
class Panel;
|
class Panel;
|
||||||
|
@ -11,6 +12,14 @@ struct CursorPos
|
||||||
int x, y;
|
int x, y;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct InputHandles
|
||||||
|
{
|
||||||
|
vr::VRActionSetHandle_t set;
|
||||||
|
vr::VRActionHandle_t toggle;
|
||||||
|
vr::VRActionHandle_t distance;
|
||||||
|
vr::VRActionHandle_t grab;
|
||||||
|
};
|
||||||
|
|
||||||
class App
|
class App
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
@ -20,8 +29,9 @@ class App
|
||||||
|
|
||||||
std::vector<TrackerID> GetControllers();
|
std::vector<TrackerID> GetControllers();
|
||||||
glm::mat4 GetTrackerPose(TrackerID tracker);
|
glm::mat4 GetTrackerPose(TrackerID tracker);
|
||||||
vr::VRControllerState_t GetControllerState(TrackerID controller);
|
vr::InputDigitalActionData_t GetControllerInputDigital(TrackerID controller, vr::VRActionHandle_t action);
|
||||||
bool IsGrabActive(TrackerID controller);
|
vr::InputAnalogActionData_t GetControllerInputAnalog(TrackerID controller, vr::VRActionHandle_t action);
|
||||||
|
bool IsInputJustPressed(TrackerID controller, vr::VRActionHandle_t action);
|
||||||
CursorPos GetCursorPosition();
|
CursorPos GetCursorPosition();
|
||||||
|
|
||||||
Display *_xdisplay;
|
Display *_xdisplay;
|
||||||
|
@ -33,14 +43,23 @@ class App
|
||||||
int _root_height;
|
int _root_height;
|
||||||
|
|
||||||
vr::ETrackingUniverseOrigin _tracking_origin;
|
vr::ETrackingUniverseOrigin _tracking_origin;
|
||||||
|
std::filesystem::path _actions_path;
|
||||||
|
|
||||||
vr::IVRSystem *vr_sys;
|
vr::IVRSystem *vr_sys;
|
||||||
vr::IVROverlay *vr_overlay;
|
vr::IVROverlay *vr_overlay;
|
||||||
|
vr::IVRInput *vr_input;
|
||||||
|
|
||||||
|
InputHandles _input_handles;
|
||||||
|
vr::TrackedDevicePose_t _tracker_poses[vr::k_unMaxTrackedDeviceCount];
|
||||||
|
|
||||||
std::vector<Panel> _panels;
|
std::vector<Panel> _panels;
|
||||||
|
bool _hidden = false;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void InitX11();
|
void InitX11();
|
||||||
void InitOVR();
|
void InitOVR();
|
||||||
void InitGLFW();
|
void InitGLFW();
|
||||||
|
|
||||||
|
void UpdateFramebuffer();
|
||||||
|
void UpdateInput();
|
||||||
};
|
};
|
|
@ -55,7 +55,7 @@ void Panel::Update()
|
||||||
{
|
{
|
||||||
for (auto controller : _app->GetControllers())
|
for (auto controller : _app->GetControllers())
|
||||||
{
|
{
|
||||||
if (_app->IsGrabActive(controller))
|
if (_app->IsInputJustPressed(controller, _app->_input_handles.grab))
|
||||||
{
|
{
|
||||||
vr::HmdMatrix34_t overlay_pose;
|
vr::HmdMatrix34_t overlay_pose;
|
||||||
vr::ETrackingUniverseOrigin tracking_universe;
|
vr::ETrackingUniverseOrigin tracking_universe;
|
||||||
|
@ -79,19 +79,19 @@ void Panel::Update()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!_app->IsGrabActive(_active_hand))
|
if (!_app->GetControllerInputDigital(_active_hand, _app->_input_handles.grab).bState)
|
||||||
{
|
{
|
||||||
ControllerRelease();
|
ControllerRelease();
|
||||||
}
|
}
|
||||||
auto state = _app->GetControllerState(_active_hand);
|
// auto state = _app->GetControllerState(_active_hand);
|
||||||
auto touchpad = state.rAxis[0];
|
// auto touchpad = state.rAxis[0];
|
||||||
if (touchpad.x != 0.0f)
|
// if (touchpad.x != 0.0f)
|
||||||
{
|
// {
|
||||||
// TODO take into account the current framerate
|
// // TODO take into account the current framerate
|
||||||
_alpha += touchpad.x * 0.05;
|
// _alpha += touchpad.x * 0.05;
|
||||||
_alpha = glm::clamp(_alpha, 0.1f, 1.0f);
|
// _alpha = glm::clamp(_alpha, 0.1f, 1.0f);
|
||||||
_app->vr_overlay->SetOverlayAlpha(_id, _alpha);
|
// _app->vr_overlay->SetOverlayAlpha(_id, _alpha);
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -108,6 +108,15 @@ void Panel::Render()
|
||||||
assert(set_texture_err == 0);
|
assert(set_texture_err == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Panel::SetHidden(bool state)
|
||||||
|
{
|
||||||
|
_hidden = state;
|
||||||
|
if (state)
|
||||||
|
_app->vr_overlay->HideOverlay(_id);
|
||||||
|
else
|
||||||
|
_app->vr_overlay->ShowOverlay(_id);
|
||||||
|
}
|
||||||
|
|
||||||
void Panel::UpdateCursor()
|
void Panel::UpdateCursor()
|
||||||
{
|
{
|
||||||
auto global_pos = _app->GetCursorPosition();
|
auto global_pos = _app->GetCursorPosition();
|
||||||
|
@ -130,7 +139,7 @@ void Panel::UpdateCursor()
|
||||||
|
|
||||||
void Panel::ControllerGrab(TrackerID controller)
|
void Panel::ControllerGrab(TrackerID controller)
|
||||||
{
|
{
|
||||||
printf("Grabbed panel %d\n", _index);
|
// printf("Grabbed panel %d\n", _index);
|
||||||
_is_held = true;
|
_is_held = true;
|
||||||
_active_hand = controller;
|
_active_hand = controller;
|
||||||
|
|
||||||
|
@ -151,7 +160,7 @@ void Panel::ControllerGrab(TrackerID controller)
|
||||||
|
|
||||||
void Panel::ControllerRelease()
|
void Panel::ControllerRelease()
|
||||||
{
|
{
|
||||||
printf("Released panel %d\n", _index);
|
// printf("Released panel %d\n", _index);
|
||||||
_is_held = false;
|
_is_held = false;
|
||||||
|
|
||||||
_app->vr_overlay->SetOverlayColor(_id, 1.0f, 1.0f, 1.0f);
|
_app->vr_overlay->SetOverlayColor(_id, 1.0f, 1.0f, 1.0f);
|
||||||
|
|
|
@ -13,6 +13,7 @@ class Panel
|
||||||
Panel(App *app, vr::HmdMatrix34_t start_pose, int index, int xmin, int xmax, int ymin, int ymax);
|
Panel(App *app, vr::HmdMatrix34_t start_pose, int index, int xmin, int xmax, int ymin, int ymax);
|
||||||
|
|
||||||
void Update();
|
void Update();
|
||||||
|
void SetHidden(bool state);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void Render();
|
void Render();
|
||||||
|
@ -32,6 +33,7 @@ class Panel
|
||||||
int _width, _height;
|
int _width, _height;
|
||||||
float _meters;
|
float _meters;
|
||||||
float _alpha;
|
float _alpha;
|
||||||
|
bool _hidden;
|
||||||
|
|
||||||
vr::Texture_t _texture;
|
vr::Texture_t _texture;
|
||||||
GLuint _gl_texture;
|
GLuint _gl_texture;
|
||||||
|
|
Loading…
Reference in a new issue