From 0c099eb951a5bde19b85e255cb6a5dd762b8e474 Mon Sep 17 00:00:00 2001 From: HSellis Date: Sat, 13 Apr 2024 12:26:36 +0300 Subject: [PATCH] Ballista prototype --- Config/DefaultEngine.ini | 2 +- Config/DefaultInput.ini | 84 ++++++++++++++++++++++ Content/Blueprints/BP_Ballista.uasset | 3 + Content/Blueprints/BP_Ballista_v2.uasset | 3 + Content/Materials/M_Wood.uasset | 3 + Content/Models/BP_Ballista.uasset | 3 + Content/Models/Ballista_bolt.uasset | 3 + Content/Models/Ballista_bow.uasset | 3 + Content/Models/Ballista_frame.uasset | 3 + Content/VRTemplate/Input/IMC_Weapon.uasset | 4 +- Content/VRTemplate/Maps/VRTemplateMap.umap | 4 +- VRTowerDefense.uproject | 3 +- 12 files changed, 111 insertions(+), 7 deletions(-) create mode 100644 Content/Blueprints/BP_Ballista.uasset create mode 100644 Content/Blueprints/BP_Ballista_v2.uasset create mode 100644 Content/Materials/M_Wood.uasset create mode 100644 Content/Models/BP_Ballista.uasset create mode 100644 Content/Models/Ballista_bolt.uasset create mode 100644 Content/Models/Ballista_bow.uasset create mode 100644 Content/Models/Ballista_frame.uasset diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 8a0b455..7ca93eb 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -73,7 +73,7 @@ r.GPUCrashDebugging=False vr.InstancedStereo=True r.MobileHDR=False vr.MobileMultiView=True -r.Mobile.UseHWsRGBEncoding=False +r.Mobile.UseHWsRGBEncoding=True vr.RoundRobinOcclusion=False vr.ODSCapture=False r.MeshStreaming=False diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 70d5213..a52c5c1 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -92,7 +92,9 @@ bCaptureMouseOnLaunch=True bEnableLegacyInputScales=True bEnableMotionControls=True bFilterInputByPlatformUser=False +bEnableInputDeviceSubsystem=True bShouldFlushPressedKeysOnViewportFocusLost=True +bEnableDynamicComponentInputBinding=True bAlwaysShowTouchInterface=False bShowConsoleOnFourFingerTap=True bEnableGestureRecognizer=False @@ -101,6 +103,88 @@ DefaultViewportMouseCaptureMode=CapturePermanently_IncludingInitialMouseDown DefaultViewportMouseLockMode=LockOnCapture FOVScale=0.011110 DoubleClickTime=0.200000 ++ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Left_Grip_Click) ++ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Grip_Click) ++ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Left_Grip_Axis) ++ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Left_Grip_Click) ++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Right_Grip_Click) ++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Grip_Click) ++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Right_Grip_Axis) ++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Grip_Click) ++ActionMappings=(ActionName="MenuToggleLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Left_Menu_Click) ++ActionMappings=(ActionName="MenuToggleLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Menu_Click) ++ActionMappings=(ActionName="MenuToggleLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Thumbstick_Click) ++ActionMappings=(ActionName="MenuToggleLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Left_Thumbstick_Click) ++ActionMappings=(ActionName="MenuToggleLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Left_Menu_Click) ++ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Right_Menu_Click) ++ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Thumbstick_Click) ++ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Right_Thumbstick_Click) ++ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Menu_Click) ++ActionMappings=(ActionName="SpectatorActiveToggle",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom) ++ActionMappings=(ActionName="SpectatorActiveToggle",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Tab) ++ActionMappings=(ActionName="SpectatorFadeToggle",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=F) ++ActionMappings=(ActionName="SpectatorFadeToggle",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Top) ++ActionMappings=(ActionName="SpectatorResetFOV",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MiddleMouseButton) ++ActionMappings=(ActionName="SpectatorResetRotation",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=R) ++ActionMappings=(ActionName="TriggerLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Left_Trigger_Click) ++ActionMappings=(ActionName="TriggerLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Trigger_Click) ++ActionMappings=(ActionName="TriggerLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Left_Trigger_Click) ++ActionMappings=(ActionName="TriggerLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Left_Trigger_Click) ++ActionMappings=(ActionName="TriggerRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Right_Trigger_Click) ++ActionMappings=(ActionName="TriggerRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Trigger_Click) ++ActionMappings=(ActionName="TriggerRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Right_Trigger_Click) ++ActionMappings=(ActionName="TriggerRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trigger_Click) ++AxisMappings=(AxisName="GrabAxisLeft",Scale=1.000000,Key=MixedReality_Left_Grip_Click) ++AxisMappings=(AxisName="GrabAxisLeft",Scale=1.000000,Key=OculusTouch_Left_Grip_Axis) ++AxisMappings=(AxisName="GrabAxisLeft",Scale=1.000000,Key=ValveIndex_Left_Grip_Axis) ++AxisMappings=(AxisName="GrabAxisLeft",Scale=1.000000,Key=Vive_Left_Grip_Click) ++AxisMappings=(AxisName="GrabAxisRight",Scale=1.000000,Key=MixedReality_Right_Grip_Click) ++AxisMappings=(AxisName="GrabAxisRight",Scale=1.000000,Key=OculusTouch_Right_Grip_Axis) ++AxisMappings=(AxisName="GrabAxisRight",Scale=1.000000,Key=ValveIndex_Right_Grip_Axis) ++AxisMappings=(AxisName="GrabAxisRight",Scale=1.000000,Key=Vive_Right_Grip_Click) ++AxisMappings=(AxisName="MovementAxisLeft_X",Scale=1.000000,Key=MixedReality_Left_Thumbstick_X) ++AxisMappings=(AxisName="MovementAxisLeft_X",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_X) ++AxisMappings=(AxisName="MovementAxisLeft_X",Scale=1.000000,Key=ValveIndex_Left_Thumbstick_X) ++AxisMappings=(AxisName="MovementAxisLeft_X",Scale=1.000000,Key=Vive_Left_Trackpad_X) ++AxisMappings=(AxisName="MovementAxisLeft_Y",Scale=1.000000,Key=MixedReality_Left_Thumbstick_Y) ++AxisMappings=(AxisName="MovementAxisLeft_Y",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_Y) ++AxisMappings=(AxisName="MovementAxisLeft_Y",Scale=1.000000,Key=ValveIndex_Left_Thumbstick_Y) ++AxisMappings=(AxisName="MovementAxisLeft_Y",Scale=1.000000,Key=Vive_Left_Trackpad_Y) ++AxisMappings=(AxisName="MovementAxisRight_X",Scale=1.000000,Key=MixedReality_Right_Thumbstick_X) ++AxisMappings=(AxisName="MovementAxisRight_X",Scale=1.000000,Key=OculusTouch_Right_Thumbstick_X) ++AxisMappings=(AxisName="MovementAxisRight_X",Scale=1.000000,Key=ValveIndex_Right_Thumbstick_X) ++AxisMappings=(AxisName="MovementAxisRight_X",Scale=1.000000,Key=Vive_Right_Trackpad_X) ++AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=MixedReality_Right_Thumbstick_Y) ++AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=OculusTouch_Right_A_Click) ++AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=OculusTouch_Right_Thumbstick_Y) ++AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=ValveIndex_Right_Thumbstick_Y) ++AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=Vive_Right_Trackpad_Y) ++AxisMappings=(AxisName="SpectatorFOV",Scale=-1.000000,Key=Gamepad_LeftTriggerAxis) ++AxisMappings=(AxisName="SpectatorFOV",Scale=1.000000,Key=Gamepad_RightTriggerAxis) ++AxisMappings=(AxisName="SpectatorFOV",Scale=1.000000,Key=MouseWheelAxis) ++AxisMappings=(AxisName="SpectatorMoveForward",Scale=1.000000,Key=Gamepad_LeftY) ++AxisMappings=(AxisName="SpectatorMoveForward",Scale=-1.000000,Key=S) ++AxisMappings=(AxisName="SpectatorMoveForward",Scale=1.000000,Key=W) ++AxisMappings=(AxisName="SpectatorMoveRight",Scale=-1.000000,Key=A) ++AxisMappings=(AxisName="SpectatorMoveRight",Scale=1.000000,Key=D) ++AxisMappings=(AxisName="SpectatorMoveRight",Scale=1.000000,Key=Gamepad_LeftX) ++AxisMappings=(AxisName="SpectatorMoveUp",Scale=1.000000,Key=E) ++AxisMappings=(AxisName="SpectatorMoveUp",Scale=-1.000000,Key=Gamepad_LeftShoulder) ++AxisMappings=(AxisName="SpectatorMoveUp",Scale=1.000000,Key=Gamepad_RightShoulder) ++AxisMappings=(AxisName="SpectatorMoveUp",Scale=-1.000000,Key=Q) ++AxisMappings=(AxisName="SpectatorMoveUp",Scale=1.000000,Key=SpaceBar) ++AxisMappings=(AxisName="SpectatorPitch",Scale=-1.000000,Key=Gamepad_RightY) ++AxisMappings=(AxisName="SpectatorPitch",Scale=1.000000,Key=MouseY) ++AxisMappings=(AxisName="SpectatorYaw",Scale=1.000000,Key=Gamepad_RightX) ++AxisMappings=(AxisName="SpectatorYaw",Scale=1.000000,Key=MouseX) ++AxisMappings=(AxisName="TriggerAxisLeft",Scale=1.000000,Key=MixedReality_Left_Trigger_Axis) ++AxisMappings=(AxisName="TriggerAxisLeft",Scale=1.000000,Key=OculusTouch_Left_Trigger_Axis) ++AxisMappings=(AxisName="TriggerAxisLeft",Scale=1.000000,Key=ValveIndex_Left_Trigger_Axis) ++AxisMappings=(AxisName="TriggerAxisLeft",Scale=1.000000,Key=Vive_Left_Trigger_Axis) ++AxisMappings=(AxisName="TriggerAxisRight",Scale=1.000000,Key=MixedReality_Right_Trigger_Axis) ++AxisMappings=(AxisName="TriggerAxisRight",Scale=1.000000,Key=OculusTouch_Right_Trigger_Axis) ++AxisMappings=(AxisName="TriggerAxisRight",Scale=1.000000,Key=ValveIndex_Right_Trigger_Axis) ++AxisMappings=(AxisName="TriggerAxisRight",Scale=1.000000,Key=Vive_Right_Trigger_Axis) DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent DefaultTouchInterface=None diff --git a/Content/Blueprints/BP_Ballista.uasset b/Content/Blueprints/BP_Ballista.uasset new file mode 100644 index 0000000..21b67c2 --- /dev/null +++ b/Content/Blueprints/BP_Ballista.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1125569055869c39aadcdccded042c7672b8c23bd7d61f40910ed778724cbdb2 +size 865 diff --git a/Content/Blueprints/BP_Ballista_v2.uasset b/Content/Blueprints/BP_Ballista_v2.uasset new file mode 100644 index 0000000..3240731 --- /dev/null +++ b/Content/Blueprints/BP_Ballista_v2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9117052cf5821aade2c2a52d0b66380785373dab862d9abac43f2a85df91c6a9 +size 33896 diff --git a/Content/Materials/M_Wood.uasset b/Content/Materials/M_Wood.uasset new file mode 100644 index 0000000..87cb087 --- /dev/null +++ b/Content/Materials/M_Wood.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad9e1dcb2278a8a594faa84ca0b87511007dfcca1179d14988ea65c1794da573 +size 9508 diff --git a/Content/Models/BP_Ballista.uasset b/Content/Models/BP_Ballista.uasset new file mode 100644 index 0000000..c495035 --- /dev/null +++ b/Content/Models/BP_Ballista.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b674e2d703bf16a40745bcde99f707fc6667b3bc316c9e8e0c51783b9e8ce7cb +size 857 diff --git a/Content/Models/Ballista_bolt.uasset b/Content/Models/Ballista_bolt.uasset new file mode 100644 index 0000000..82efe5a --- /dev/null +++ b/Content/Models/Ballista_bolt.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:598a4a191007c3d0a98ce30c59350212acc24d3e76f496a578a6e9d43b471aab +size 24325 diff --git a/Content/Models/Ballista_bow.uasset b/Content/Models/Ballista_bow.uasset new file mode 100644 index 0000000..d9b0908 --- /dev/null +++ b/Content/Models/Ballista_bow.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e2df8d98e928a9b0e268d0ff5c609ee65f7c1bce740737323b93288db9a348b +size 39317 diff --git a/Content/Models/Ballista_frame.uasset b/Content/Models/Ballista_frame.uasset new file mode 100644 index 0000000..3c0f780 --- /dev/null +++ b/Content/Models/Ballista_frame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:411ca9b6288d8f3ddf56d8b9740f16b4598d82496099decea2bbba8ec3be3760 +size 49334 diff --git a/Content/VRTemplate/Input/IMC_Weapon.uasset b/Content/VRTemplate/Input/IMC_Weapon.uasset index e691d8b..21c7701 100644 --- a/Content/VRTemplate/Input/IMC_Weapon.uasset +++ b/Content/VRTemplate/Input/IMC_Weapon.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba3fcd4b15d22fa48cd71bee28f612a13b9e694d28a7528fc08e37b684da45a1 -size 1473 +oid sha256:31b53ec46360dbf6a760e52d78bda8e2f2804b1b3fa47c54373021e45490793c +size 1524 diff --git a/Content/VRTemplate/Maps/VRTemplateMap.umap b/Content/VRTemplate/Maps/VRTemplateMap.umap index 0d76492..1fae273 100644 --- a/Content/VRTemplate/Maps/VRTemplateMap.umap +++ b/Content/VRTemplate/Maps/VRTemplateMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbbc7a996ebd0514fd9c32cbfba3a4c2c4685aaa1ae9d60548fe9c0d221a9092 -size 130081 +oid sha256:792c75d5ce2aa28bbc036dfc0466955617d65213412ffb7fff4f85aa7b012524 +size 133199 diff --git a/VRTowerDefense.uproject b/VRTowerDefense.uproject index f385753..448edb5 100644 --- a/VRTowerDefense.uproject +++ b/VRTowerDefense.uproject @@ -10,8 +10,7 @@ "SupportedTargetPlatforms": [ "Win64", "Linux", - "Android", - "HoloLens" + "Android" ] } ],