Correct widget interaction system created into BP_MotionController / …

…New VR headsets added to Grab input https://www.youtube.com/watch?v=jC91FFkxgh4
DryreL · Jun 25, 2022 · 973fb9a · 973fb9a
1 parent b65eda2
commit 973fb9a
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 3 deletions.
diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini
@@ -152,7 +152,7 @@ DoubleClickTime=0.200000
 +ActionMappings=(ActionName="TeleportRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Right_A_Click)
 +ActionMappings=(ActionName="TeleportLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Left_A_Click)
 +ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Daydream_Left_Select_Click)
-+ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Trigger_Click)
 +ActionMappings=(ActionName="TeleportRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MagicLeap_Right_Bumper)
 +ActionMappings=(ActionName="TeleportLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MagicLeap_Left_Bumper)
 +ActionMappings=(ActionName="ShootWebLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
@@ -175,10 +175,22 @@ DoubleClickTime=0.200000
 +ActionMappings=(ActionName="ShootWebRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Daydream_Right_Trackpad_Click)
 +ActionMappings=(ActionName="ShootWebLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Left_Grip_Click)
 +ActionMappings=(ActionName="ShootWebRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Right_Grip_Click)
-+ActionMappings=(ActionName="ShootWebRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MagicLeap_Right_Trigger)
-+ActionMappings=(ActionName="ShootWebLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MagicLeap_Left_Trigger)
++ActionMappings=(ActionName="ShootWebRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MagicLeap_Right_Bumper)
++ActionMappings=(ActionName="ShootWebLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MagicLeap_Left_Bumper)
 +ActionMappings=(ActionName="ShootWebLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusHand_Left_MiddlePinch)
 +ActionMappings=(ActionName="ShootWebRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusHand_Right_MiddlePinch)
++ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Trigger_Click)
++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Daydream_Right_Select_Click)
++ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=HPMixedRealityController_Left_Trigger_Click)
++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=HPMixedRealityController_Right_Trigger_Click)
++ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Left_Trigger_Click)
++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Right_Trigger_Click)
++ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MagicLeap_Left_Trigger)
++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MagicLeap_Right_Trigger)
++ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusHand_Left_IndexPinch)
++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusHand_Right_IndexPinchStrength)
++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Two)
++ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=One)
 +AxisMappings=(AxisName="TeleportDirectionUp",Scale=1.000000,Key=Gamepad_LeftY)
 +AxisMappings=(AxisName="TeleportDirectionRight",Scale=1.000000,Key=Gamepad_LeftX)
 +AxisMappings=(AxisName="MotionControllerThumbLeft_Y",Scale=1.000000,Key=Vive_Left_Trackpad_Y)

diff --git a/Content/Blueprint/BP_Train.uasset b/Content/Blueprint/BP_Train.uasset
diff --git a/Content/Maps/HLOD/Level1_1_HLOD.uasset b/Content/Maps/HLOD/Level1_1_HLOD.uasset
diff --git a/Content/Maps/HLOD/Level1_2_HLOD.uasset b/Content/Maps/HLOD/Level1_2_HLOD.uasset
diff --git a/Content/Maps/Level1.umap b/Content/Maps/Level1.umap
diff --git a/Content/Maps/MainMenu3D.umap b/Content/Maps/MainMenu3D.umap
diff --git a/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset b/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset
diff --git a/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset b/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset
diff --git a/Content/Widgets/BP_Ending.uasset b/Content/Widgets/BP_Ending.uasset
diff --git a/Content/Widgets/BP_SpawnEndingWidget.uasset b/Content/Widgets/BP_SpawnEndingWidget.uasset