Overhauled World Interaction

Overhauled World interaction adding * Pressable Button * Lever * Drawer * Cartridge * Slider Also modularised the Trace Interaction to make it easy to use in an existing project
mitchemmc · Jun 26, 2016 · ec943ab · ec943ab
1 parent 8991527
commit ec943ab
Show file tree

Hide file tree

Showing 74 changed files with 48 additions and 0 deletions.
diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini
@@ -0,0 +1,48 @@
+
+[/Script/Engine.InputSettings]
+-AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
+-AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
+-AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
++AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MouseWheelAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_LeftTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_RightTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MotionController_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MotionController_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MotionController_Left_TriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MotionController_Left_Grip1Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MotionController_Left_Grip2Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MotionController_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MotionController_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MotionController_Right_TriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MotionController_Right_Grip1Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="MotionController_Right_Grip2Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_Special_Left_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
++AxisConfig=(AxisKeyName="Gamepad_Special_Left_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
+bAltEnterTogglesFullscreen=True
+bUseMouseForTouch=False
+bEnableMouseSmoothing=True
+bEnableFOVScaling=True
+FOVScale=0.011110
+DoubleClickTime=0.200000
+bCaptureMouseOnLaunch=True
+DefaultViewportMouseCaptureMode=CapturePermanently_IncludingInitialMouseDown
+bDefaultViewportMouseLock=True
++ActionMappings=(ActionName="PickupLeft",Key=MotionController_Left_Grip1,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
++ActionMappings=(ActionName="PickupRight",Key=MotionController_Right_Grip1,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
+bAlwaysShowTouchInterface=False
+bShowConsoleOnFourFingerTap=True
+DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks
+ConsoleKey=None
+-ConsoleKeys=Tilde
++ConsoleKeys=Tilde
+
+
diff --git a/Content/Blueprints/BaseVRPawn.uasset b/Content/Blueprints/BaseVRPawn.uasset
diff --git a/Content/DemoRoom/BluePrint/BP_DemoTriggerManual.uasset b/Content/DemoRoom/BluePrint/BP_DemoTriggerManual.uasset
diff --git a/Content/DemoRoom/Materials/M_Button_Inst.uasset b/Content/DemoRoom/Materials/M_Button_Inst.uasset
diff --git a/Content/ExampleContent/VR_Head_IK/AnimBlueprint/HeadIKAnimBlueprint.uasset b/Content/ExampleContent/VR_Head_IK/AnimBlueprint/HeadIKAnimBlueprint.uasset
diff --git a/Content/ExampleContent/VR_Head_IK/Blueprints/HeadIKPawn.uasset b/Content/ExampleContent/VR_Head_IK/Blueprints/HeadIKPawn.uasset
diff --git a/Content/ExampleContent/VR_Simple_Teleportation/Blueprints/SimpleTelePawn.uasset b/Content/ExampleContent/VR_Simple_Teleportation/Blueprints/SimpleTelePawn.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/Components/TraceInteractor.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/Components/TraceInteractor.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/ExampleMenu_BP.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/ExampleMenu_BP.uasset
diff --git a/...xampleContent/VR_Trace_Interaction/Blueprints/Interfaces/TraceInteractionInterface.uasset b/...xampleContent/VR_Trace_Interaction/Blueprints/Interfaces/TraceInteractionInterface.uasset
diff --git a/...mpleContent/VR_Trace_Interaction/Blueprints/Interfaces/TraceMenuClickableInterface.uasset b/...mpleContent/VR_Trace_Interaction/Blueprints/Interfaces/TraceMenuClickableInterface.uasset
diff --git a/...leContent/VR_Trace_Interaction/Blueprints/Interfaces/TraceMenuInteractionInterface.uasset b/...leContent/VR_Trace_Interaction/Blueprints/Interfaces/TraceMenuInteractionInterface.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/Menus/Trace3DKeyboard.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/Menus/Trace3DKeyboard.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/Menus/Trace3DMenu.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/Menus/Trace3DMenu.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/TeleportArea.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/TeleportArea.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/TeleportVolume.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/TeleportVolume.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/TraceInteractionActor.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/TraceInteractionActor.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/TraceInteractionPawn.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/TraceInteractionPawn.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/TraceVisualiser.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/TraceVisualiser.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/WebBrowser.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/WebBrowser.uasset
diff --git a/...mpleContent/VR_Trace_Interaction/Blueprints/Widgets/BaseTraceWidgets/BasicKeyboard.uasset b/...mpleContent/VR_Trace_Interaction/Blueprints/Widgets/BaseTraceWidgets/BasicKeyboard.uasset
diff --git a/...mpleContent/VR_Trace_Interaction/Blueprints/Widgets/BaseTraceWidgets/TraceBaseMenu.uasset b/...mpleContent/VR_Trace_Interaction/Blueprints/Widgets/BaseTraceWidgets/TraceBaseMenu.uasset
diff --git a/...xampleContent/VR_Trace_Interaction/Blueprints/Widgets/BaseTraceWidgets/TraceButton.uasset b/...xampleContent/VR_Trace_Interaction/Blueprints/Widgets/BaseTraceWidgets/TraceButton.uasset
diff --git a/...ExampleContent/VR_Trace_Interaction/Blueprints/Widgets/BaseTraceWidgets/TraceTable.uasset b/...ExampleContent/VR_Trace_Interaction/Blueprints/Widgets/BaseTraceWidgets/TraceTable.uasset
diff --git a/...pleContent/VR_Trace_Interaction/Blueprints/Widgets/BaseTraceWidgets/TraceTableItem.uasset b/...pleContent/VR_Trace_Interaction/Blueprints/Widgets/BaseTraceWidgets/TraceTableItem.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/Widgets/CircleWidget.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/Widgets/CircleWidget.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/Widgets/MenuExample.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/Widgets/MenuExample.uasset
diff --git a/Content/ExampleContent/VR_Trace_Interaction/Blueprints/Widgets/WebBrowser.uasset b/Content/ExampleContent/VR_Trace_Interaction/Blueprints/Widgets/WebBrowser.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Blueprints/Components/Interactor.uasset b/Content/ExampleContent/VR_World_Interaction/Blueprints/Components/Interactor.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Blueprints/Components/Pickuper.uasset b/Content/ExampleContent/VR_World_Interaction/Blueprints/Components/Pickuper.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Blueprints/Components/WorldInteractor.uasset b/Content/ExampleContent/VR_World_Interaction/Blueprints/Components/WorldInteractor.uasset
diff --git a/...t/ExampleContent/VR_World_Interaction/Blueprints/FeedbackEffects/FeedbackIntensity.uasset b/...t/ExampleContent/VR_World_Interaction/Blueprints/FeedbackEffects/FeedbackIntensity.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Blueprints/FeedbackEffects/FeedbackType.uasset b/Content/ExampleContent/VR_World_Interaction/Blueprints/FeedbackEffects/FeedbackType.uasset
diff --git a/...mpleContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftHighIntensityBurst.uasset b/...mpleContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftHighIntensityBurst.uasset
diff --git a/...leContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftHighIntensityBurst_2.uasset b/...leContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftHighIntensityBurst_2.uasset
diff --git a/...mpleContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftHighIntensityShake.uasset b/...mpleContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftHighIntensityShake.uasset
diff --git a/...leContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftHighIntensityShake_2.uasset b/...leContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftHighIntensityShake_2.uasset
diff --git a/...ampleContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftLowIntensityBurst.uasset b/...ampleContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftLowIntensityBurst.uasset
diff --git a/...pleContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftLowIntensityBurst_2.uasset b/...pleContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftLowIntensityBurst_2.uasset
diff --git a/...ampleContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftLowIntensityShake.uasset b/...ampleContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftLowIntensityShake.uasset
diff --git a/...pleContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftLowIntensityShake_2.uasset b/...pleContent/VR_World_Interaction/Blueprints/FeedbackEffects/LeftLowIntensityShake_2.uasset
diff --git a/...mpleContent/VR_World_Interaction/Blueprints/FeedbackEffects/NewForceFeedbackEffect.uasset b/...mpleContent/VR_World_Interaction/Blueprints/FeedbackEffects/NewForceFeedbackEffect.uasset
diff --git a/...pleContent/VR_World_Interaction/Blueprints/FeedbackEffects/RightHighIntensityBurst.uasset b/...pleContent/VR_World_Interaction/Blueprints/FeedbackEffects/RightHighIntensityBurst.uasset
diff --git a/...pleContent/VR_World_Interaction/Blueprints/FeedbackEffects/RightHighIntensityShake.uasset b/...pleContent/VR_World_Interaction/Blueprints/FeedbackEffects/RightHighIntensityShake.uasset
diff --git a/...mpleContent/VR_World_Interaction/Blueprints/FeedbackEffects/RightLowIntensityBurst.uasset b/...mpleContent/VR_World_Interaction/Blueprints/FeedbackEffects/RightLowIntensityBurst.uasset
diff --git a/...mpleContent/VR_World_Interaction/Blueprints/FeedbackEffects/RightLowIntensityShake.uasset b/...mpleContent/VR_World_Interaction/Blueprints/FeedbackEffects/RightLowIntensityShake.uasset
diff --git a/...eContent/VR_World_Interaction/Blueprints/FunctionLibraries/FeedbackFunctionLibrary.uasset b/...eContent/VR_World_Interaction/Blueprints/FunctionLibraries/FeedbackFunctionLibrary.uasset
diff --git a/...leContent/VR_World_Interaction/Blueprints/FunctionLibraries/SegmentFunctionLibrary.uasset b/...leContent/VR_World_Interaction/Blueprints/FunctionLibraries/SegmentFunctionLibrary.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Blueprints/HelperObjects/InputConsumer.uasset b/Content/ExampleContent/VR_World_Interaction/Blueprints/HelperObjects/InputConsumer.uasset
diff --git a/...ampleContent/VR_World_Interaction/Blueprints/HelperObjects/LeftPickupInputConsumer.uasset b/...ampleContent/VR_World_Interaction/Blueprints/HelperObjects/LeftPickupInputConsumer.uasset
diff --git a/...mpleContent/VR_World_Interaction/Blueprints/HelperObjects/RightPickupInputConsumer.uasset b/...mpleContent/VR_World_Interaction/Blueprints/HelperObjects/RightPickupInputConsumer.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Blueprints/InteractableLever.uasset b/Content/ExampleContent/VR_World_Interaction/Blueprints/InteractableLever.uasset
diff --git a/...ExampleContent/VR_World_Interaction/Blueprints/InteractableObjects/CartridgeHolder.uasset b/...ExampleContent/VR_World_Interaction/Blueprints/InteractableObjects/CartridgeHolder.uasset
diff --git a/...mpleContent/VR_World_Interaction/Blueprints/InteractableObjects/InteractableButton.uasset b/...mpleContent/VR_World_Interaction/Blueprints/InteractableObjects/InteractableButton.uasset
diff --git a/...eContent/VR_World_Interaction/Blueprints/InteractableObjects/InteractableCartridge.uasset b/...eContent/VR_World_Interaction/Blueprints/InteractableObjects/InteractableCartridge.uasset
diff --git a/...mpleContent/VR_World_Interaction/Blueprints/InteractableObjects/InteractableDrawer.uasset b/...mpleContent/VR_World_Interaction/Blueprints/InteractableObjects/InteractableDrawer.uasset
diff --git a/...ampleContent/VR_World_Interaction/Blueprints/InteractableObjects/InteractableLever.uasset b/...ampleContent/VR_World_Interaction/Blueprints/InteractableObjects/InteractableLever.uasset
diff --git a/...mpleContent/VR_World_Interaction/Blueprints/InteractableObjects/InteractableSlider.uasset b/...mpleContent/VR_World_Interaction/Blueprints/InteractableObjects/InteractableSlider.uasset
diff --git a/...pleContent/VR_World_Interaction/Blueprints/InteractableObjects/InteractableTrigger.uasset b/...pleContent/VR_World_Interaction/Blueprints/InteractableObjects/InteractableTrigger.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Blueprints/InteractableTrigger.uasset b/Content/ExampleContent/VR_World_Interaction/Blueprints/InteractableTrigger.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Blueprints/Interfaces/PickupableInterface.uasset b/Content/ExampleContent/VR_World_Interaction/Blueprints/Interfaces/PickupableInterface.uasset
diff --git a/...ampleContent/VR_World_Interaction/Blueprints/Interfaces/WorldInteractableInterface.uasset b/...ampleContent/VR_World_Interaction/Blueprints/Interfaces/WorldInteractableInterface.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Blueprints/PhysicsStaticMeshActor.uasset b/Content/ExampleContent/VR_World_Interaction/Blueprints/PhysicsStaticMeshActor.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Blueprints/PickupableCube.uasset b/Content/ExampleContent/VR_World_Interaction/Blueprints/PickupableCube.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Blueprints/Structs/SegmentStruct.uasset b/Content/ExampleContent/VR_World_Interaction/Blueprints/Structs/SegmentStruct.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Blueprints/WorldInteractionPawn.uasset b/Content/ExampleContent/VR_World_Interaction/Blueprints/WorldInteractionPawn.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Materials/BasicCubeMaterial.uasset b/Content/ExampleContent/VR_World_Interaction/Materials/BasicCubeMaterial.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Materials/BasicHighlightMaterial.uasset b/Content/ExampleContent/VR_World_Interaction/Materials/BasicHighlightMaterial.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Sequences/DoorMatineeLevelSequence.uasset b/Content/ExampleContent/VR_World_Interaction/Sequences/DoorMatineeLevelSequence.uasset
diff --git a/Content/ExampleContent/VR_World_Interaction/Sequences/LeverPlatformLevelSequence.uasset b/Content/ExampleContent/VR_World_Interaction/Sequences/LeverPlatformLevelSequence.uasset
diff --git a/Content/Maps/VR_Examples_Introduction.umap b/Content/Maps/VR_Examples_Introduction.umap
diff --git a/Content/Maps/VR_Steam_VR_Introduction.umap b/Content/Maps/VR_Steam_VR_Introduction.umap
diff --git a/Content/Maps/VR_Trace_Interaction.umap b/Content/Maps/VR_Trace_Interaction.umap
diff --git a/Content/Maps/VR_World_Interaction.umap b/Content/Maps/VR_World_Interaction.umap