getsetgames · nesjett · Mar 30, 2017 · Mar 31, 2017 · Mar 31, 2017 · Mar 20, 2020
diff --git 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
@@ -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
@@ -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
@@ -5,6 +5,8 @@
 
 #pragma once
 
+#include "UObject/Object.h"
+#include "Engine/GameViewportClient.h"
 #include "SwipeViewportClient.generated.h"
 
 UENUM(BlueprintType)
@@ -23,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/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
@@ -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/SwipePrivatePCH.h b/Source/Swipe/Private/SwipePrivatePCH.h
@@ -5,14 +5,11 @@
 
 #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
 // add includes for headers that are used in most of your module's source files though.
 
 DECLARE_LOG_CATEGORY_EXTERN(LogSwipe, Log, All);
 
-#include "SwipeClasses.h"
+#include "SwipeClasses.h"
diff --git 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
@@ -3,14 +3,17 @@
 //  Copyright (c) 2015 Get Set Games Inc. All rights reserved.
 //
 
+#include "SwipeViewportClient.h"
 #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)
 {
@@ -119,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);
@@ -134,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
@@ -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
@@ -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[] {