@@ -118,6 +118,7 @@ void SlimeVRDriver::TrackerDevice::PositionMessage(messages::Position& position)
118118void SlimeVRDriver::TrackerDevice::ControllerInputMessage (messages::ControllerInput& controllerInput) {
119119 // Get inputs from protobuf
120120 GetDriver ()->GetInput ()->UpdateScalarComponent (trigger_component_, controllerInput.trigger (), 0 );
121+ GetDriver ()->GetInput ()->UpdateBooleanComponent (trigger_component_touch, controllerInput.trigger () > 0 .5f , 0 );
121122 GetDriver ()->GetInput ()->UpdateScalarComponent (grip_value_component_, controllerInput.grip (), 0 );
122123 GetDriver ()->GetInput ()->UpdateScalarComponent (stick_x_component_, controllerInput.thumbstick_x (), 0 );
123124 GetDriver ()->GetInput ()->UpdateScalarComponent (stick_y_component_, controllerInput.thumbstick_y (), 0 );
@@ -269,15 +270,15 @@ vr::EVRInitError SlimeVRDriver::TrackerDevice::Activate(uint32_t unObjectId) {
269270 GetDriver ()->GetInput ()->CreateBooleanComponent (props, " /input/b/click" , &this ->button_b_component_ );
270271 GetDriver ()->GetInput ()->CreateBooleanComponent (props, " /input/b/touch" , &this ->button_b_component_touch_ );
271272 GetDriver ()->GetInput ()->CreateBooleanComponent (props, " /input/system/click" , &this ->system_component );
272- GetDriver ()->GetInput ()->CreateBooleanComponent (props, " /input/system" , &this ->system_component );
273+ GetDriver ()->GetInput ()->CreateBooleanComponent (props, " /input/system" , &this ->system_component_chord );
273274 GetDriver ()->GetInput ()->CreateBooleanComponent (props, " /input/trackpad/click" , &this ->trackpad_click_component_ );
274275 GetDriver ()->GetInput ()->CreateBooleanComponent (props, " /input/trackpad/touch" , &this ->trackpad_touch_component_ );
275276 GetDriver ()->GetInput ()->CreateBooleanComponent (props, " /input/thumbstick/click" , &this ->stick_click_component_ );
276277 GetDriver ()->GetInput ()->CreateBooleanComponent (props, " /input/thumbstick/touch" , &this ->stick_click_component_touch_ );
277278
278279 // Scalar components
279280 GetDriver ()->GetInput ()->CreateScalarComponent (props, " /input/trigger/value" , &this ->trigger_component_ , vr::VRScalarType_Absolute, vr::VRScalarUnits_NormalizedOneSided);
280- GetDriver ()->GetInput ()->CreateBooleanComponent (props, " /input/trigger/touch " , &this ->trigger_component_touch_ );
281+ GetDriver ()->GetInput ()->CreateBooleanComponent (props, " /input/trigger/click " , &this ->trigger_component_touch_ );
281282 GetDriver ()->GetInput ()->CreateScalarComponent (props, " /input/grip/value" , &this ->grip_value_component_ , vr::VRScalarType_Absolute, vr::VRScalarUnits_NormalizedOneSided);
282283 GetDriver ()->GetInput ()->CreateBooleanComponent (props, " /input/grip/touch" , &this ->grip_value_component_touch_ );
283284 GetDriver ()->GetInput ()->CreateScalarComponent (props, " /input/trackpad/x" , &this ->trackpad_x_component_ , vr::VRScalarType_Absolute, vr::VRScalarUnits_NormalizedTwoSided);
0 commit comments