SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create DigitalAction and AnalogAction types

Browse Source 
This errors at compile time if the wrong action is being used, instead
of at runtime.
This commit is contained in:
Vasily
2019-03-16 14:07:26 +01:00
parent ab69d3180c
commit a70fade089
4 changed files with 69 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_scripts/qt/sources.pri
+1 -1
View File
@@ -39,7 +39,7 @@ HEADERS += src/overlaycontroller.h \
src/openvr/ivrinput_action.h \ src/openvr/ivrinput_action.h \
src/openvr/ivrinput_manifest.h \ src/openvr/ivrinput_manifest.h \
src/openvr/ivrinput_action_set.h \ src/openvr/ivrinput_action_set.h \
src/openvr/ivrinput_input_source.h \ src/openvr/ivrinput_input_source.h \
src/openvr/ivrinput.h \ src/openvr/ivrinput.h \
src/utils/setup.h src/utils/setup.h
src/openvr/ivrinput.cpp
+30 -70
View File
@@ -1,4 +1,5 @@
#include "ivrinput.h" #include "ivrinput.h"
#include "ivrinput_action.h"
#include <openvr.h> #include <openvr.h>
#include <iostream> #include <iostream>
#include <QStandardPaths> #include <QStandardPaths>
@@ -17,20 +18,8 @@ it isn't the struct will still need to be created somewhere, and with move
semantics it almost doesn't matter if the struct is created in the calling semantics it almost doesn't matter if the struct is created in the calling
function and passed as reference, or created in this function. function and passed as reference, or created in this function.
*/ */
vr::InputDigitalActionData_t getDigitalActionData( Action& action ) vr::InputDigitalActionData_t getDigitalActionData( DigitalAction& action )
{ {
if ( action.type() != ActionType::Digital )
{
LOG( ERROR )
<< "Action was passed to IVRInput getDigitalActionData without "
"being a digital type. Action: "
<< action.name();
throw std::runtime_error(
"Action was passed to IVRInput getDigitalActionData without being "
"a digital type. See log for details." );
}
vr::InputDigitalActionData_t handleData = {}; vr::InputDigitalActionData_t handleData = {};
const auto error = vr::VRInput()->GetDigitalActionData( const auto error = vr::VRInput()->GetDigitalActionData(
@@ -59,20 +48,8 @@ it isn't the struct will still need to be created somewhere, and with move
semantics it almost doesn't matter if the struct is created in the calling semantics it almost doesn't matter if the struct is created in the calling
function and passed as reference, or created in this function. function and passed as reference, or created in this function.
*/ */
vr::InputAnalogActionData_t getAnalogActionData( Action& action ) vr::InputAnalogActionData_t getAnalogActionData( AnalogAction& action )
{ {
if ( action.type() != ActionType::Analog )
{
LOG( ERROR )
<< "Action was passed to IVRInput getAnalogActionData without "
"being an analog type. Action: "
<< action.name();
throw std::runtime_error(
"Action was passed to IVRInput getAnalogActionData without being "
"an analog type. See log for details." );
}
vr::InputAnalogActionData_t handleData = {}; vr::InputAnalogActionData_t handleData = {};
const auto error const auto error
@@ -96,7 +73,7 @@ This will only return true the first time the button is released. It is
necessary to release the button and the push it again in order for this function necessary to release the button and the push it again in order for this function
to return true again. to return true again.
*/ */
bool isDigitalActionActivatedOnce( Action& action ) bool isDigitalActionActivatedOnce( DigitalAction& action )
{ {
const auto handleData = getDigitalActionData( action ); const auto handleData = getDigitalActionData( action );
@@ -107,7 +84,7 @@ bool isDigitalActionActivatedOnce( Action& action )
Gets the action state of an Action. Gets the action state of an Action.
This will continually return true while the button is held down. This will continually return true while the button is held down.
*/ */
bool isDigitalActionActivatedConstant( Action& action ) bool isDigitalActionActivatedConstant( DigitalAction& action )
{ {
const auto handleData = getDigitalActionData( action ); const auto handleData = getDigitalActionData( action );
@@ -124,54 +101,37 @@ mystically not working.
*/ */
SteamIVRInput::SteamIVRInput() SteamIVRInput::SteamIVRInput()
: m_manifest(), m_mainSet( action_sets::k_setMain ), : m_manifest(), m_mainSet( action_sets::k_setMain ),
m_nextTrack( action_keys::k_actionNextTrack, ActionType::Digital ), m_nextTrack( action_keys::k_actionNextTrack ),
m_previousTrack( action_keys::k_actionPreviousTrack, m_previousTrack( action_keys::k_actionPreviousTrack ),
ActionType::Digital ), m_pausePlayTrack( action_keys::k_actionPausePlayTrack ),
m_pausePlayTrack( action_keys::k_actionPausePlayTrack, m_stopTrack( action_keys::k_actionStopTrack ),
ActionType::Digital ), m_leftHandSpaceTurn( action_keys::k_actionLeftHandSpaceTurn ),
m_stopTrack( action_keys::k_actionStopTrack, ActionType::Digital ), m_rightHandSpaceTurn( action_keys::k_actionRightHandSpaceTurn ),
m_leftHandSpaceTurn( action_keys::k_actionLeftHandSpaceTurn, m_leftHandSpaceDrag( action_keys::k_actionLeftHandSpaceDrag ),
ActionType::Digital ), m_rightHandSpaceDrag( action_keys::k_actionRightHandSpaceDrag ),
m_rightHandSpaceTurn( action_keys::k_actionRightHandSpaceTurn,
ActionType::Digital ),
m_leftHandSpaceDrag( action_keys::k_actionLeftHandSpaceDrag,
ActionType::Digital ),
m_rightHandSpaceDrag( action_keys::k_actionRightHandSpaceDrag,
ActionType::Digital ),
m_optionalOverrideLeftHandSpaceTurn( m_optionalOverrideLeftHandSpaceTurn(
action_keys::k_actionOptionalOverrideLeftHandSpaceTurn, action_keys::k_actionOptionalOverrideLeftHandSpaceTurn ),
ActionType::Digital ),
m_optionalOverrideRightHandSpaceTurn( m_optionalOverrideRightHandSpaceTurn(
action_keys::k_actionOptionalOverrideRightHandSpaceTurn, action_keys::k_actionOptionalOverrideRightHandSpaceTurn ),
ActionType::Digital ),
m_optionalOverrideLeftHandSpaceDrag( m_optionalOverrideLeftHandSpaceDrag(
action_keys::k_actionOptionalOverrideLeftHandSpaceDrag, action_keys::k_actionOptionalOverrideLeftHandSpaceDrag ),
ActionType::Digital ),
m_optionalOverrideRightHandSpaceDrag( m_optionalOverrideRightHandSpaceDrag(
action_keys::k_actionOptionalOverrideRightHandSpaceDrag, action_keys::k_actionOptionalOverrideRightHandSpaceDrag ),
ActionType::Digital ),
m_swapSpaceDragToLeftHandOverride( m_swapSpaceDragToLeftHandOverride(
action_keys::k_actionSwapSpaceDragToLeftHandOverride, action_keys::k_actionSwapSpaceDragToLeftHandOverride ),
ActionType::Digital ),
m_swapSpaceDragToRightHandOverride( m_swapSpaceDragToRightHandOverride(
action_keys::k_actionSwapSpaceDragToRightHandOverride, action_keys::k_actionSwapSpaceDragToRightHandOverride ),
ActionType::Digital ), m_gravityToggle( action_keys::k_actionGravityToggle ),
m_gravityToggle( action_keys::k_actionGravityToggle, m_heightToggle( action_keys::k_actionHeightToggle ),
ActionType::Digital ), m_resetOffsets( action_keys::k_actionResetOffsets ),
m_heightToggle( action_keys::k_actionHeightToggle, ActionType::Digital ), m_snapTurnLeft( action_keys::k_actionSnapTurnLeft ),
m_resetOffsets( action_keys::k_actionResetOffsets, ActionType::Digital ), m_snapTurnRight( action_keys::k_actionSnapTurnRight ),
m_snapTurnLeft( action_keys::k_actionSnapTurnLeft, ActionType::Digital ), m_xAxisLockToggle( action_keys::k_actionXAxisLockToggle ),
m_snapTurnRight( action_keys::k_actionSnapTurnRight, m_yAxisLockToggle( action_keys::k_actionYAxisLockToggle ),
ActionType::Digital ), m_zAxisLockToggle( action_keys::k_actionZAxisLockToggle ),
m_xAxisLockToggle( action_keys::k_actionXAxisLockToggle, m_pushToTalk( action_keys::k_actionPushToTalk ),
ActionType::Digital ), m_leftHaptic( action_keys::k_actionHapticsLeft ),
m_yAxisLockToggle( action_keys::k_actionYAxisLockToggle, m_rightHaptic( action_keys::k_actionHapticsRight ),
ActionType::Digital ),
m_zAxisLockToggle( action_keys::k_actionZAxisLockToggle,
ActionType::Digital ),
m_pushToTalk( action_keys::k_actionPushToTalk, ActionType::Digital ),
m_leftHaptic( action_keys::k_actionHapticsLeft, ActionType::Haptic ),
m_rightHaptic( action_keys::k_actionHapticsRight, ActionType::Haptic ),
m_leftHand( input_keys::k_inputSourceLeft ), m_leftHand( input_keys::k_inputSourceLeft ),
m_rightHand( input_keys::k_inputSourceRight ) m_rightHand( input_keys::k_inputSourceRight )
{ {
src/openvr/ivrinput.h
+25 -25
View File
@@ -94,37 +94,37 @@ private:
vr::VRActiveActionSet_t m_activeActionSet = {}; vr::VRActiveActionSet_t m_activeActionSet = {};
// Music player bindings // Music player bindings
Action m_nextTrack; DigitalAction m_nextTrack;
Action m_previousTrack; DigitalAction m_previousTrack;
Action m_pausePlayTrack; DigitalAction m_pausePlayTrack;
Action m_stopTrack; DigitalAction m_stopTrack;
// Space bindings // Space bindings
Action m_leftHandSpaceTurn; DigitalAction m_leftHandSpaceTurn;
Action m_rightHandSpaceTurn; DigitalAction m_rightHandSpaceTurn;
Action m_leftHandSpaceDrag; DigitalAction m_leftHandSpaceDrag;
Action m_rightHandSpaceDrag; DigitalAction m_rightHandSpaceDrag;
Action m_optionalOverrideLeftHandSpaceTurn; DigitalAction m_optionalOverrideLeftHandSpaceTurn;
Action m_optionalOverrideRightHandSpaceTurn; DigitalAction m_optionalOverrideRightHandSpaceTurn;
Action m_optionalOverrideLeftHandSpaceDrag; DigitalAction m_optionalOverrideLeftHandSpaceDrag;
Action m_optionalOverrideRightHandSpaceDrag; DigitalAction m_optionalOverrideRightHandSpaceDrag;
Action m_swapSpaceDragToLeftHandOverride; DigitalAction m_swapSpaceDragToLeftHandOverride;
Action m_swapSpaceDragToRightHandOverride; DigitalAction m_swapSpaceDragToRightHandOverride;
Action m_gravityToggle; DigitalAction m_gravityToggle;
Action m_heightToggle; DigitalAction m_heightToggle;
Action m_resetOffsets; DigitalAction m_resetOffsets;
Action m_snapTurnLeft; DigitalAction m_snapTurnLeft;
Action m_snapTurnRight; DigitalAction m_snapTurnRight;
Action m_xAxisLockToggle; DigitalAction m_xAxisLockToggle;
Action m_yAxisLockToggle; DigitalAction m_yAxisLockToggle;
Action m_zAxisLockToggle; DigitalAction m_zAxisLockToggle;
// Push To Talk // Push To Talk
Action m_pushToTalk; DigitalAction m_pushToTalk;
// haptic bindings // haptic bindings
Action m_leftHaptic; DigitalAction m_leftHaptic;
Action m_rightHaptic; DigitalAction m_rightHaptic;
// input sources // input sources
InputSource m_leftHand; InputSource m_leftHand;
src/openvr/ivrinput_action.h
+13 -11
View File
@@ -24,8 +24,7 @@ with a name similar to that of the one in the actions manifest.
class Action class Action
{ {
public: public:
Action( const char* const actionName, const ActionType type ) Action( const char* const actionName ) : m_name( actionName )
: m_name( actionName ), m_type( type )
{ {
auto error = vr::VRInput()->GetActionHandle( actionName, &m_handle ); auto error = vr::VRInput()->GetActionHandle( actionName, &m_handle );
@@ -49,19 +48,22 @@ public:
{ {
return m_name; return m_name;
} }
/*!
The type of the action. Used for runtime checking that the wrong functions
aren't called.
*/
ActionType type() const noexcept
{
return m_type;
}
private: private:
vr::VRActionHandle_t m_handle = 0; vr::VRActionHandle_t m_handle = 0;
const std::string m_name; const std::string m_name;
const ActionType m_type = ActionType::Undefined; };
class DigitalAction : public Action
{
public:
DigitalAction( const char* const actionName ) : Action( actionName ) {}
};
class AnalogAction : public Action
{
public:
AnalogAction( const char* const actionName ) : Action( actionName ) {}
}; };
} // namespace input } // namespace input