Skip to content

Commit

Permalink
Improvements and fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@r57zone
r57zone committed Feb 29, 2020
1 parent 0cb7ca3 commit 2e3bf41
Show file tree
Hide file tree
Showing 9 changed files with 2,616 additions and 981 deletions.
695 changes: 457 additions & 238 deletions OpenVR/headers/openvr.h
View file

Large diffs are not rendered by default.

1,308 changes: 1,087 additions & 221 deletions OpenVR/headers/openvr_api.cs
View file

Large diffs are not rendered by default.

607 changes: 424 additions & 183 deletions OpenVR/headers/openvr_api.json
View file

Large diffs are not rendered by default.

355 changes: 239 additions & 116 deletions OpenVR/headers/openvr_capi.h
View file

Large diffs are not rendered by default.

351 changes: 281 additions & 70 deletions OpenVR/headers/openvr_driver.h
View file

Large diffs are not rendered by default.

205 changes: 89 additions & 116 deletions OpenVR/samples/driver_sample/driver_sample.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,43 +211,6 @@ class CSampleDeviceDriver : public vr::ITrackedDeviceServerDriver, public vr::IV
DriverLog( "driver_null: Display Frequency: %f\n", m_flDisplayFrequency );
DriverLog( "driver_null: IPD: %f\n", m_flIPD );*/

CRegKey key;
TCHAR libPath[MAX_PATH];

LONG status = key.Open(HKEY_CURRENT_USER, _T("Software\\TrueOpenVR"));
if (status == ERROR_SUCCESS)
{
ULONG libPathSize = sizeof(libPath);

#ifdef _WIN64
status = key.QueryStringValue(_T("Library64"), libPath, &libPathSize);
#else
status = key.QueryStringValue(_T("Library"), libPath, &libPathSize);
#endif

if (status == ERROR_SUCCESS)
{

hDll = LoadLibrary(libPath);
GetHMDData = (_GetHMDData)GetProcAddress(hDll, "GetHMDData");
GetControllersData = (_GetControllersData)GetProcAddress(hDll, "GetControllersData");
SetControllerData = (_SetControllerData)GetProcAddress(hDll, "SetControllerData");
SetCentering = (_SetCentering)GetProcAddress(hDll, "SetCentering");

if (GetHMDData != NULL && GetHMDData(&MyHMD) == TOVR_SUCCESS)
HMDConnected = true;

if (GetControllersData != NULL && SetControllerData !=NULL && GetControllersData(&MyCtrl, &MyCtrl2) == TOVR_SUCCESS)
ctrlsConnected = true;

if (SetCentering == NULL) {
HMDConnected = false;
ctrlsConnected = false;
}
}
}

key.Close();
}

virtual ~CSampleDeviceDriver()
Expand Down Expand Up @@ -540,92 +503,68 @@ class CSampleControllerDriver : public vr::ITrackedDeviceServerDriver

virtual EVRInitError Activate( vr::TrackedDeviceIndex_t unObjectId )
{

switch (ControllerIndex)
{
case 1:
Ctrl1Index_t = unObjectId;
Ctrl1Index_t = vr::VRProperties()->TrackedDeviceToPropertyContainer(Ctrl1Index_t);
m_ulPropertyContainer = vr::VRProperties()->TrackedDeviceToPropertyContainer(Ctrl1Index_t);
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, Prop_SerialNumber_String, "CTRL1Serial");
vr::VRProperties()->SetInt32Property(m_ulPropertyContainer, Prop_ControllerRoleHint_Int32, TrackedControllerRole_LeftHand);
break;
case 2:
Ctrl2Index_t = unObjectId;
Ctrl2Index_t = vr::VRProperties()->TrackedDeviceToPropertyContainer(Ctrl2Index_t);
m_ulPropertyContainer = vr::VRProperties()->TrackedDeviceToPropertyContainer(Ctrl2Index_t);
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, Prop_SerialNumber_String, "CTRL2Serial");
vr::VRProperties()->SetInt32Property(m_ulPropertyContainer, Prop_ControllerRoleHint_Int32, TrackedControllerRole_RightHand);
break;
}

vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, vr::Prop_ControllerType_String, "vive_controller");
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, vr::Prop_LegacyInputProfile_String, "vive_controller");

vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, vr::Prop_ModelNumber_String, "ViveMV");
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, vr::Prop_ManufacturerName_String, "HTC");
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, vr::Prop_RenderModelName_String, "vr_controller_vive_1_5");

vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, Prop_TrackingSystemName_String, "VR Controller");
vr::VRProperties()->SetInt32Property(m_ulPropertyContainer, Prop_DeviceClass_Int32, TrackedDeviceClass_Controller);

switch (ControllerIndex)
{
case 1:
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, Prop_SerialNumber_String, "CTRL1Serial");
break;
case 2:
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, Prop_SerialNumber_String, "CTRL2Serial");
break;
}

uint64_t supportedButtons = 0xFFFFFFFFFFFFFFFFULL;
uint64_t supportedButtons = 0xA4;
vr::VRProperties()->SetUint64Property(m_ulPropertyContainer, vr::Prop_SupportedButtons_Uint64, supportedButtons);

// return a constant that's not 0 (invalid) or 1 (reserved for Oculus)
//vr::VRProperties()->SetUint64Property( m_ulPropertyContainer, Prop_CurrentUniverseId_Uint64, 2 );

// avoid "not fullscreen" warnings from vrmonitor
//vr::VRProperties()->SetBoolProperty( m_ulPropertyContainer, Prop_IsOnDesktop_Bool, false );

// our sample device isn't actually tracked, so set this property to avoid having the icon blink in the status window
//vr::VRProperties()->SetBoolProperty( m_ulPropertyContainer, Prop_NeverTracked_Bool, false );
vr::VRProperties()->SetBoolProperty(m_ulPropertyContainer, Prop_IsOnDesktop_Bool, false);

// even though we won't ever track we want to pretend to be the right hand so binding will work as expected
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, Prop_InputProfilePath_String, "{tovr}/input/controller_profile.json");

switch (ControllerIndex)
/*bool bSetupIconUsingExternalResourceFile = false;
if (!bSetupIconUsingExternalResourceFile)
{
case 1:
vr::VRProperties()->SetInt32Property(m_ulPropertyContainer, Prop_ControllerRoleHint_Int32, TrackedControllerRole_LeftHand);
break;
case 2:
vr::VRProperties()->SetInt32Property(m_ulPropertyContainer, Prop_ControllerRoleHint_Int32, TrackedControllerRole_RightHand);
break;
}

// Setup properties directly in code.
// Path values are of the form {drivername}\icons\some_icon_filename.png
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceOff_String, "{tovr}/icons/barebones_status_off.png");
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceReady_String, "{tovr}/icons/barebones_status_ready.png");
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceReadyAlert_String, "{tovr}/icons/barebones_status_ready_alert.png");
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceNotReady_String, "{tovr}/icons/barebones_status_error.png");
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceStandby_String, "{tovr}/icons/barebones_status_standby.png");
vr::VRProperties()->SetStringProperty(m_ulPropertyContainer, vr::Prop_NamedIconPathDeviceAlertLow_String, "{tovr}/icons/barebones_status_ready_low.png");
}*/

// this file tells the UI what to show the user for binding this controller as well as what default bindings should
// be for legacy or other apps
vr::VRProperties()->SetStringProperty( m_ulPropertyContainer, Prop_InputProfilePath_String, "{tovr}/input/mycontroller_profile.json" );
vr::VRDriverInput()->CreateScalarComponent( m_ulPropertyContainer, "/input/trackpad/x", &HAnalog[0], vr::VRScalarType_Absolute, vr::VRScalarUnits_NormalizedTwoSided);
vr::VRDriverInput()->CreateScalarComponent(m_ulPropertyContainer, "/input/trackpad/y", &HAnalog[1], vr::VRScalarType_Absolute, vr::VRScalarUnits_NormalizedTwoSided);
vr::VRDriverInput()->CreateScalarComponent(m_ulPropertyContainer, "/input/trigger/value", &HAnalog[2], vr::EVRScalarType::VRScalarType_Absolute, vr::EVRScalarUnits::VRScalarUnits_NormalizedOneSided);

// Buttons handles
vr::VRDriverInput()->CreateBooleanComponent(m_ulPropertyContainer, "/input/application_menu/click", &HButtons[0]);
vr::VRDriverInput()->CreateBooleanComponent(m_ulPropertyContainer, "/input/grip/click", &HButtons[1]);
vr::VRDriverInput()->CreateBooleanComponent(m_ulPropertyContainer, "/input/system/click", &HButtons[2]);

vr::VRDriverInput()->CreateBooleanComponent(m_ulPropertyContainer, "/input/grip/click", &HButtons[1]);
vr::VRDriverInput()->CreateBooleanComponent(m_ulPropertyContainer, "/input/trigger/click", &HButtons[5]);

vr::VRDriverInput()->CreateBooleanComponent(m_ulPropertyContainer, "/input/trackpad/click", &HButtons[3]);
vr::VRDriverInput()->CreateBooleanComponent(m_ulPropertyContainer, "/input/trackpad/touch", &HButtons[4]);

// Analog handles
vr::VRDriverInput()->CreateScalarComponent(
m_ulPropertyContainer, "/input/trackpad/x", &HAnalog[0],
vr::VRScalarType_Absolute, vr::VRScalarUnits_NormalizedTwoSided
);
vr::VRDriverInput()->CreateScalarComponent(
m_ulPropertyContainer, "/input/trackpad/y", &HAnalog[1],
vr::VRScalarType_Absolute, vr::VRScalarUnits_NormalizedTwoSided
);
vr::VRDriverInput()->CreateScalarComponent(
m_ulPropertyContainer, "/input/trigger/value", &HAnalog[2],
vr::EVRScalarType::VRScalarType_Absolute, vr::EVRScalarUnits::VRScalarUnits_NormalizedOneSided
);

vr::VRProperties()->SetInt32Property(m_ulPropertyContainer, vr::Prop_Axis0Type_Int32, vr::k_eControllerAxis_TrackPad);

// create our haptic component
vr::VRDriverInput()->CreateHapticComponent( m_ulPropertyContainer, "/output/haptic", &m_compHaptic);
vr::VRDriverInput()->CreateHapticComponent(m_ulPropertyContainer, "/output/haptic", &m_compHaptic);

return VRInitError_None;
}
Expand Down Expand Up @@ -707,7 +646,22 @@ class CSampleControllerDriver : public vr::ITrackedDeviceServerDriver

void RunFrame()
{
#if defined( _WINDOWS )
switch (ControllerIndex)
{
case 1:
if (Ctrl1Index_t != vr::k_unTrackedDeviceIndexInvalid)
{
vr::VRServerDriverHost()->TrackedDevicePoseUpdated(Ctrl1Index_t, GetPose(), sizeof(DriverPose_t));
}
break;
case 2:
if (Ctrl2Index_t != vr::k_unTrackedDeviceIndexInvalid)
{
vr::VRServerDriverHost()->TrackedDevicePoseUpdated(Ctrl2Index_t, GetPose(), sizeof(DriverPose_t));
}
break;
}

// Your driver would read whatever hardware state is associated with its input components and pass that
// in to UpdateBooleanComponent. This could happen in RunFrame or on a thread of your own that's reading USB
// state. There's no need to update input state unless it changes, but it doesn't do any harm to do so.
Expand Down Expand Up @@ -758,25 +712,6 @@ class CSampleControllerDriver : public vr::ITrackedDeviceServerDriver
SetCentering(2);
}

if (ControllerIndex == 1) {

if (Ctrl1Index_t != vr::k_unTrackedDeviceIndexInvalid)
{
vr::VRServerDriverHost()->TrackedDevicePoseUpdated(Ctrl1Index_t, GetPose(), sizeof(DriverPose_t));
}

}

if (ControllerIndex == 2) {

if (Ctrl2Index_t != vr::k_unTrackedDeviceIndexInvalid)
{
vr::VRServerDriverHost()->TrackedDevicePoseUpdated(Ctrl2Index_t, GetPose(), sizeof(DriverPose_t));
}

}

#endif
}

void ProcessEvent( const vr::VREvent_t & vrEvent )
Expand Down Expand Up @@ -818,7 +753,7 @@ class CSampleControllerDriver : public vr::ITrackedDeviceServerDriver
//vr::VRInputComponentHandle_t m_compC;
vr::VRInputComponentHandle_t m_compHaptic;

vr::VRInputComponentHandle_t HButtons[5], HAnalog[3];
vr::VRInputComponentHandle_t HButtons[6], HAnalog[3];
//std::string m_sSerialNumber;
//std::string m_sModelNumber;
};
Expand Down Expand Up @@ -851,11 +786,49 @@ EVRInitError CServerDriver_Sample::Init( vr::IVRDriverContext *pDriverContext )
VR_INIT_SERVER_DRIVER_CONTEXT( pDriverContext );
//InitDriverLog( vr::VRDriverLog() );

//if (HMDConnected)
//{
CRegKey key;
TCHAR libPath[MAX_PATH];

LONG status = key.Open(HKEY_CURRENT_USER, _T("Software\\TrueOpenVR"));
if (status == ERROR_SUCCESS)
{
ULONG libPathSize = sizeof(libPath);

#ifdef _WIN64
status = key.QueryStringValue(_T("Library64"), libPath, &libPathSize);
#else
status = key.QueryStringValue(_T("Library"), libPath, &libPathSize);
#endif

if (status == ERROR_SUCCESS)
{

hDll = LoadLibrary(libPath);
GetHMDData = (_GetHMDData)GetProcAddress(hDll, "GetHMDData");
GetControllersData = (_GetControllersData)GetProcAddress(hDll, "GetControllersData");
SetControllerData = (_SetControllerData)GetProcAddress(hDll, "SetControllerData");
SetCentering = (_SetCentering)GetProcAddress(hDll, "SetCentering");

if (GetHMDData != NULL && GetHMDData(&MyHMD) == TOVR_SUCCESS)
HMDConnected = true;

if (GetControllersData != NULL && SetControllerData != NULL && GetControllersData(&MyCtrl, &MyCtrl2) == TOVR_SUCCESS)
ctrlsConnected = true;

if (SetCentering == NULL) {
HMDConnected = false;
ctrlsConnected = false;
}
}
}

key.Close();

if (HMDConnected)
{
m_pNullHmdLatest = new CSampleDeviceDriver();
vr::VRServerDriverHost()->TrackedDeviceAdded(m_pNullHmdLatest->GetSerialNumber().c_str(), vr::TrackedDeviceClass_HMD, m_pNullHmdLatest);
//}
}

if (ctrlsConnected) {
m_pController = new CSampleControllerDriver();
Expand All @@ -874,10 +847,10 @@ EVRInitError CServerDriver_Sample::Init( vr::IVRDriverContext *pDriverContext )
void CServerDriver_Sample::Cleanup()
{
//CleanupDriverLog();
//if (HMDConnected) {
if (HMDConnected) {
delete m_pNullHmdLatest;
m_pNullHmdLatest = NULL;
//}
}

if (ctrlsConnected) {
delete m_pController;
Expand Down
21 changes: 21 additions & 0 deletions TrueOpenVR SteamVR/OpenVR/default.vrsettings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"tovr" : {
"secondsFromVsyncToPhotons" : 0.004999999888241291,
"serialNumber" : "1000",
"renderWidth" : <RENDERWIDTH>,
"renderHeight" : <RENDERHEIGHT>,
"windowWidth" : <WINDOWWIDTH>,
"windowHeight" : <WINDOWHEIGHT>,
"windowX" : <WINDOWX>,
"windowY" : <WINDOWY>,
"displayFrequency" : 60,
"ipd" : <IPD>,
"DistortionK1" : <DISTORTIONK1>,
"DistortionK2" : <DISTORTIONK2>,
"ZoomWidth" : 0.8,
"ZoomHeight" : 0.8,
"DistanceBetweenEyes" : 0,
"ScreenOffsetX" : 0,
"DebugMode" : <DEBUGMODE>
}
}
19 changes: 0 additions & 19 deletions TrueOpenVR SteamVR/OpenVR/steamvr.vrsettings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,5 @@
"directMode" : false,
"enableHomeApp" : false,
"startMonitorFromAppLaunch" : false
},
"tovr" : {
"secondsFromVsyncToPhotons" : 0.004999999888241291,
"serialNumber" : "1000",
"renderWidth" : <RENDERWIDTH>,
"renderHeight" : <RENDERHEIGHT>,
"windowWidth" : <WINDOWWIDTH>,
"windowHeight" : <WINDOWHEIGHT>,
"windowX" : <WINDOWX>,
"windowY" : <WINDOWY>,
"displayFrequency" : 60,
"ipd" : <IPD>,
"DistortionK1" : <DISTORTIONK1>,
"DistortionK2" : <DISTORTIONK2>,
"ZoomWidth" : 0.8,
"ZoomHeight" : 0.8,
"DistanceBetweenEyes" : 0,
"ScreenOffsetX" : 0,
"DebugMode" : <DEBUGMODE>
}
}
Loading

0 comments on commit 2e3bf41

Please sign in to comment.