From eb728ac3e72bfb02b6fb275515f18c5f315b01e9 Mon Sep 17 00:00:00 2001 From: Derek van Vliet Date: Thu, 30 Mar 2017 16:36:42 -0400 Subject: [PATCH 1/4] [4.15] fixed header order errors --- Source/Swipe/Private/SwipeComponent.cpp | 1 + Source/Swipe/Private/SwipeDelegates.cpp | 1 + Source/Swipe/Private/SwipeSettings.cpp | 1 + Source/Swipe/Private/SwipeViewportClient.cpp | 1 + 4 files changed, 4 insertions(+) diff --git a/Source/Swipe/Private/SwipeComponent.cpp b/Source/Swipe/Private/SwipeComponent.cpp index de2a0b2..5cec58e 100644 --- a/Source/Swipe/Private/SwipeComponent.cpp +++ b/Source/Swipe/Private/SwipeComponent.cpp @@ -3,6 +3,7 @@ // Copyright (c) 2015 Get Set Games Inc. All rights reserved. // +#include "SwipeComponent.h" #include "SwipePrivatePCH.h" void USwipeComponent::OnRegister() diff --git a/Source/Swipe/Private/SwipeDelegates.cpp b/Source/Swipe/Private/SwipeDelegates.cpp index 08600f8..32ac94d 100644 --- a/Source/Swipe/Private/SwipeDelegates.cpp +++ b/Source/Swipe/Private/SwipeDelegates.cpp @@ -3,6 +3,7 @@ // Copyright (c) 2015 Get Set Games Inc. All rights reserved. // +#include "SwipeDelegates.h" #include "SwipePrivatePCH.h" USwipeDelegates::FTouchDelegate USwipeDelegates::TouchBeganDelegate; diff --git a/Source/Swipe/Private/SwipeSettings.cpp b/Source/Swipe/Private/SwipeSettings.cpp index 01ef14d..82ea0f1 100644 --- a/Source/Swipe/Private/SwipeSettings.cpp +++ b/Source/Swipe/Private/SwipeSettings.cpp @@ -3,6 +3,7 @@ // Copyright (c) 2015 Get Set Games Inc. All rights reserved. // +#include "SwipeSettings.h" #include "SwipePrivatePCH.h" USwipeSettings::USwipeSettings(const FObjectInitializer& ObjectInitializer) diff --git a/Source/Swipe/Private/SwipeViewportClient.cpp b/Source/Swipe/Private/SwipeViewportClient.cpp index a0e5911..88a1017 100644 --- a/Source/Swipe/Private/SwipeViewportClient.cpp +++ b/Source/Swipe/Private/SwipeViewportClient.cpp @@ -3,6 +3,7 @@ // Copyright (c) 2015 Get Set Games Inc. All rights reserved. // +#include "SwipeViewportClient.h" #include "SwipePrivatePCH.h" #include "Runtime/Engine/Classes/Engine/UserInterfaceSettings.h" From 51d0a89e615350eed0f1b566f57bd7488fe54549 Mon Sep 17 00:00:00 2001 From: Derek van Vliet Date: Fri, 31 Mar 2017 09:24:49 -0400 Subject: [PATCH 2/4] [4.15] removed monolithic header includes --- Source/Swipe/Private/SwipePrivatePCH.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/Swipe/Private/SwipePrivatePCH.h b/Source/Swipe/Private/SwipePrivatePCH.h index 1de303e..d53a746 100644 --- a/Source/Swipe/Private/SwipePrivatePCH.h +++ b/Source/Swipe/Private/SwipePrivatePCH.h @@ -5,9 +5,6 @@ #pragma once -#include "CoreUObject.h" -#include "Engine.h" - #include "ISwipe.h" // You should place include statements to your module's private header files here. You only need to @@ -15,4 +12,4 @@ DECLARE_LOG_CATEGORY_EXTERN(LogSwipe, Log, All); -#include "SwipeClasses.h" \ No newline at end of file +#include "SwipeClasses.h" From 7f1c01dea6ae58730b66e5d8083ae603d4dd3f67 Mon Sep 17 00:00:00 2001 From: Derek van Vliet Date: Fri, 31 Mar 2017 14:39:58 -0400 Subject: [PATCH 3/4] added required includes --- Source/Swipe/Classes/SwipeComponent.h | 1 + Source/Swipe/Classes/SwipeDelegates.h | 2 ++ Source/Swipe/Classes/SwipeSettings.h | 2 ++ Source/Swipe/Classes/SwipeViewportClient.h | 1 + 4 files changed, 6 insertions(+) diff --git a/Source/Swipe/Classes/SwipeComponent.h b/Source/Swipe/Classes/SwipeComponent.h index 7163c14..6cff032 100644 --- a/Source/Swipe/Classes/SwipeComponent.h +++ b/Source/Swipe/Classes/SwipeComponent.h @@ -5,6 +5,7 @@ #pragma once +#include "Components/ActorComponent.h" #include "SwipeComponent.generated.h" UCLASS(ClassGroup = Input, HideCategories = (Activation, "Components|Activation", Collision), meta = (BlueprintSpawnableComponent)) diff --git a/Source/Swipe/Classes/SwipeDelegates.h b/Source/Swipe/Classes/SwipeDelegates.h index dedd25b..2bc5614 100644 --- a/Source/Swipe/Classes/SwipeDelegates.h +++ b/Source/Swipe/Classes/SwipeDelegates.h @@ -5,6 +5,8 @@ #pragma once +#include "UObject/Object.h" +#include "UObject/ScriptMacros.h" #include "SwipeDelegates.generated.h" UCLASS(NotBlueprintable) diff --git a/Source/Swipe/Classes/SwipeSettings.h b/Source/Swipe/Classes/SwipeSettings.h index de03beb..c71c9e4 100644 --- a/Source/Swipe/Classes/SwipeSettings.h +++ b/Source/Swipe/Classes/SwipeSettings.h @@ -5,6 +5,8 @@ #pragma once +#include "UObject/Object.h" +#include "UObject/ScriptMacros.h" #include "SwipeSettings.generated.h" UCLASS(config = Engine, defaultconfig) diff --git a/Source/Swipe/Classes/SwipeViewportClient.h b/Source/Swipe/Classes/SwipeViewportClient.h index 685e34c..0a53262 100644 --- a/Source/Swipe/Classes/SwipeViewportClient.h +++ b/Source/Swipe/Classes/SwipeViewportClient.h @@ -5,6 +5,7 @@ #pragma once +#include "UObject/Object.h" #include "SwipeViewportClient.generated.h" UENUM(BlueprintType) From dce7219d2bc18741f900eb13cfb320ea4f461f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A9stor=20Sabater?= Date: Fri, 20 Mar 2020 21:43:01 +0100 Subject: [PATCH 4/4] Support to UE 4.24 --- Source/Swipe/Classes/SwipeViewportClient.h | 34 +++++++++++++++++++- Source/Swipe/Private/SwipeViewportClient.cpp | 6 ++-- Source/Swipe/Public/ISwipe.h | 2 +- Source/Swipe/Swipe.Build.cs | 2 +- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/Source/Swipe/Classes/SwipeViewportClient.h b/Source/Swipe/Classes/SwipeViewportClient.h index 0a53262..b6620a4 100644 --- a/Source/Swipe/Classes/SwipeViewportClient.h +++ b/Source/Swipe/Classes/SwipeViewportClient.h @@ -6,6 +6,7 @@ #pragma once #include "UObject/Object.h" +#include "Engine/GameViewportClient.h" #include "SwipeViewportClient.generated.h" UENUM(BlueprintType) @@ -24,13 +25,44 @@ class USwipeViewportClient : public UGameViewportClient { GENERATED_BODY() public: - virtual bool InputTouch(FViewport* Viewport, + /* + virtual bool InputTouch(FViewport* Viewport, + int32 ControllerId, + uint32 Handle, + ETouchType::Type Type, + const FVector2D& TouchLocation, + float Force, + FDateTime DeviceTimestamp, + uint32 TouchpadIndex) override; + + + virtual bool InputTouch +( + FViewport * Viewport, + int32 ControllerId, + uint32 Handle, + ETouchType::Type Type, + const FVector2D & TouchLocation, + float Force, + FDateTime DeviceTimestamp, + uint32 TouchpadIndex +) + */ + virtual bool InputTouch(FViewport* InViewport, int32 ControllerId, uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, + float Force, FDateTime DeviceTimestamp, uint32 TouchpadIndex) override; + /*bool InputTouch(FViewport* Viewport, + int32 ControllerId, + uint32 Handle, + ETouchType::Type Type, + const FVector2D& TouchLocation, + FDateTime DeviceTimestamp, + uint32 TouchpadIndex) override;*/ private: bool bSwiping; diff --git a/Source/Swipe/Private/SwipeViewportClient.cpp b/Source/Swipe/Private/SwipeViewportClient.cpp index 88a1017..fef1dc8 100644 --- a/Source/Swipe/Private/SwipeViewportClient.cpp +++ b/Source/Swipe/Private/SwipeViewportClient.cpp @@ -7,11 +7,13 @@ #include "SwipePrivatePCH.h" #include "Runtime/Engine/Classes/Engine/UserInterfaceSettings.h" + bool USwipeViewportClient::InputTouch(FViewport* InViewport, int32 ControllerId, uint32 Handle, ETouchType::Type Type, const FVector2D& TouchLocation, + float Force, FDateTime DeviceTimestamp, uint32 TouchpadIndex) { @@ -120,7 +122,7 @@ bool USwipeViewportClient::InputTouch(FViewport* InViewport, FTimerHandle TapHandler; FTimerDelegate TapHandlerDelegate; TapHandlerDelegate.BindUObject(this, &USwipeViewportClient::ResetTapHandler); - UWorld* World = GetWorld(); + World = GetWorld(); if (World) { World->GetTimerManager().SetTimer(TapHandler, TapHandlerDelegate, SwipeSettings->MaxTimeBetweenTaps, false); @@ -135,7 +137,7 @@ bool USwipeViewportClient::InputTouch(FViewport* InViewport, break; } - bool bResult = Super::InputTouch(InViewport, ControllerId, Handle, Type, TouchLocation, DeviceTimestamp, TouchpadIndex); + bool bResult = Super::InputTouch(InViewport, ControllerId, Handle, Type, TouchLocation, false, DeviceTimestamp, TouchpadIndex); return bResult; } diff --git a/Source/Swipe/Public/ISwipe.h b/Source/Swipe/Public/ISwipe.h index a84c7cd..d53e502 100644 --- a/Source/Swipe/Public/ISwipe.h +++ b/Source/Swipe/Public/ISwipe.h @@ -5,7 +5,7 @@ #pragma once -#include "ModuleManager.h" +#include "Modules/ModuleManager.h" class ISwipe : public IModuleInterface { diff --git a/Source/Swipe/Swipe.Build.cs b/Source/Swipe/Swipe.Build.cs index f98554e..9492263 100644 --- a/Source/Swipe/Swipe.Build.cs +++ b/Source/Swipe/Swipe.Build.cs @@ -7,7 +7,7 @@ namespace UnrealBuildTool.Rules { public class Swipe : ModuleRules { - public Swipe(TargetInfo Target) + public Swipe(ReadOnlyTargetRules Target) : base(Target) { PublicIncludePaths.AddRange( new string[] {