From 4ae5f7f7384b0c722c95122a71f0e46dacc247e6 Mon Sep 17 00:00:00 2001 From: Giuseppe Modarelli Date: Mon, 17 Jul 2023 10:06:46 +0200 Subject: [PATCH] Upgrade to Unreal Engine 5.2.1 --- Config/DefaultInput.ini | 10 ++++++++-- .../Public/GeneratedMeshDeformersLibrary.h | 1 + .../Public/Tools/RuntimePolyEditTool.cpp | 2 +- .../Public/Tools/RuntimePolyEditTool.h | 2 +- ToolsFrameworkDemo.uproject | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index e406535..4d15ab9 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -71,6 +71,12 @@ bUseMouseForTouch=False bEnableMouseSmoothing=True bEnableFOVScaling=True bCaptureMouseOnLaunch=False +bEnableLegacyInputScales=True +bEnableMotionControls=True +bFilterInputByPlatformUser=False +bEnableInputDeviceSubsystem=True +bShouldFlushPressedKeysOnViewportFocusLost=True +bEnableDynamicComponentInputBinding=True bAlwaysShowTouchInterface=False bShowConsoleOnFourFingerTap=True bEnableGestureRecognizer=False @@ -88,8 +94,8 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="RedoAction",bShift=False,bCtrl=True,bAlt=False,bCmd=False,Key=Y) +AxisMappings=(AxisName="MouseMovementX",Scale=1.000000,Key=MouseX) +AxisMappings=(AxisName="MouseMovementY",Scale=1.000000,Key=MouseY) -DefaultPlayerInputClass=/Script/Engine.PlayerInput -DefaultInputComponentClass=/Script/Engine.InputComponent +DefaultPlayerInputClass=/Script/EnhancedInput.EnhancedPlayerInput +DefaultInputComponentClass=/Script/EnhancedInput.EnhancedInputComponent DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks -ConsoleKeys=Tilde +ConsoleKeys=Tilde diff --git a/Plugins/RuntimeGeometryUtils/Source/RuntimeGeometryUtils/Public/GeneratedMeshDeformersLibrary.h b/Plugins/RuntimeGeometryUtils/Source/RuntimeGeometryUtils/Public/GeneratedMeshDeformersLibrary.h index 64094a0..0e969a9 100644 --- a/Plugins/RuntimeGeometryUtils/Source/RuntimeGeometryUtils/Public/GeneratedMeshDeformersLibrary.h +++ b/Plugins/RuntimeGeometryUtils/Source/RuntimeGeometryUtils/Public/GeneratedMeshDeformersLibrary.h @@ -1,3 +1,4 @@ +#pragma once #include "Engine/Classes/Kismet/BlueprintFunctionLibrary.h" #include "GeneratedMesh.h" diff --git a/Source/RuntimeToolsSystem/Public/Tools/RuntimePolyEditTool.cpp b/Source/RuntimeToolsSystem/Public/Tools/RuntimePolyEditTool.cpp index a441b27..6e03368 100644 --- a/Source/RuntimeToolsSystem/Public/Tools/RuntimePolyEditTool.cpp +++ b/Source/RuntimeToolsSystem/Public/Tools/RuntimePolyEditTool.cpp @@ -6,7 +6,7 @@ #define LOCTEXT_NAMESPACE "URuntimeEditMeshPolygonsTool" -USingleSelectionMeshEditingTool* URuntimePolyEditToolBuilder::CreateNewTool(const FToolBuilderState& SceneState) const +USingleTargetWithSelectionTool* URuntimePolyEditToolBuilder::CreateNewTool(const FToolBuilderState& SceneState) const { URuntimePolyEditTool* PolyEditTool = NewObject(SceneState.ToolManager); PolyEditTool->LocalTargetWorld = SceneState.World; diff --git a/Source/RuntimeToolsSystem/Public/Tools/RuntimePolyEditTool.h b/Source/RuntimeToolsSystem/Public/Tools/RuntimePolyEditTool.h index d99e331..9248bac 100644 --- a/Source/RuntimeToolsSystem/Public/Tools/RuntimePolyEditTool.h +++ b/Source/RuntimeToolsSystem/Public/Tools/RuntimePolyEditTool.h @@ -8,7 +8,7 @@ class RUNTIMETOOLSSYSTEM_API URuntimePolyEditToolBuilder : public UEditMeshPolyg { GENERATED_BODY() public: - virtual USingleSelectionMeshEditingTool* CreateNewTool(const FToolBuilderState& SceneState) const override; + virtual USingleTargetWithSelectionTool* CreateNewTool(const FToolBuilderState& SceneState) const override; }; diff --git a/ToolsFrameworkDemo.uproject b/ToolsFrameworkDemo.uproject index 7f96e88..096e10a 100644 --- a/ToolsFrameworkDemo.uproject +++ b/ToolsFrameworkDemo.uproject @@ -1,6 +1,6 @@ { "FileVersion": 3, - "EngineAssociation": "5.0", + "EngineAssociation": "5.2", "Category": "", "Description": "", "Modules": [