Migrated to work with 4.17 (and probably 4.16)

tomlooman · Aug 10, 2017 · c8270d2 · c8270d2
1 parent 5a3fe79
commit c8270d2
Show file tree

Hide file tree

Showing 19 changed files with 130 additions and 62 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Tutorials/.gitignore b/Tutorials/.gitignore
@@ -0,0 +1,74 @@
+/Packaged/*
+/Content/StarterContent
+.DS_Store
+
+# Visual Studio 2015 user specific files
+.vs/
+
+# Visual Studio 2015 database file
+*.VC.db
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+*.ipa
+
+# These project files can be generated by the engine
+*.xcodeproj
+*.xcworkspace
+*.sln
+*.suo
+*.opensdf
+*.sdf
+*.VC.db
+*.VC.opendb
+
+# Precompiled Assets
+SourceArt/**/*.png
+SourceArt/**/*.tga
+
+# Binary Files
+Binaries/*
+
+# Builds
+Build/*
+
+# Don't ignore icon files in Build
+!Build/**/*.ico
+
+# Built data for maps
+*_BuiltData.uasset
+
+# Configuration files generated by the Editor
+Saved/*
+
+# Compiled source files for the engine to use
+Intermediate/*
+
+# Cache files for the editor to use
+DerivedDataCache/*
diff --git a/Tutorials/Binaries/Win64/UE4Editor-Tutorials.dll b/Tutorials/Binaries/Win64/UE4Editor-Tutorials.dll
diff --git a/Tutorials/Binaries/Win64/UE4Editor-Tutorials.pdb b/Tutorials/Binaries/Win64/UE4Editor-Tutorials.pdb
diff --git a/Tutorials/Content/Maps/OutlinePostEffect_Map.umap b/Tutorials/Content/Maps/OutlinePostEffect_Map.umap
diff --git a/Tutorials/Source/Tutorials.Target.cs b/Tutorials/Source/Tutorials.Target.cs
@@ -5,21 +5,10 @@
 
 public class TutorialsTarget : TargetRules
 {
-	public TutorialsTarget(TargetInfo Target)
+	public TutorialsTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Game;
-	}
-
-	//
-	// TargetRules interface.
-	//
 
-	public override void SetupBinaries(
-		TargetInfo Target,
-		ref List<UEBuildBinaryConfiguration> OutBuildBinaryConfigurations,
-		ref List<string> OutExtraModuleNames
-		)
-	{
-		OutExtraModuleNames.Add("Tutorials");
+        ExtraModuleNames.Add("Tutorials");
 	}
 }
diff --git a/Tutorials/Source/Tutorials/Private/TutorialsCharacter.cpp b/Tutorials/Source/Tutorials/Private/TutorialsCharacter.cpp
@@ -1,7 +1,7 @@
 // Copyright 1998-2014 Epic Games, Inc. All Rights Reserved.
 
-#include "Tutorials.h"
 #include "TutorialsCharacter.h"
+#include "Tutorials.h"
 #include "TutorialsProjectile.h"
 
 //////////////////////////////////////////////////////////////////////////
@@ -19,7 +19,9 @@ ATutorialsCharacter::ATutorialsCharacter(const class FObjectInitializer& PCIP)
 
 	// Create a CameraComponent	
 	FirstPersonCameraComponent = PCIP.CreateDefaultSubobject<UCameraComponent>(this, TEXT("FirstPersonCamera"));
-	FirstPersonCameraComponent->AttachParent = GetCapsuleComponent();
+	GetCapsuleComponent()->AttachToComponent(FirstPersonCameraComponent, FAttachmentTransformRules::KeepRelativeTransform);
+	//FirstPersonCameraComponent->AttachToComponent(this, GetCapsuleComponent());
+
 	FirstPersonCameraComponent->RelativeLocation = FVector(0, 0, 64.f); // Position the camera
 
 	// Default offset from the character location for projectiles to spawn
@@ -28,7 +30,7 @@ ATutorialsCharacter::ATutorialsCharacter(const class FObjectInitializer& PCIP)
 	// Create a mesh component that will be used when being viewed from a '1st person' view (when controlling this pawn)
 	Mesh1P = PCIP.CreateDefaultSubobject<USkeletalMeshComponent>(this, TEXT("CharacterMesh1P"));
 	Mesh1P->SetOnlyOwnerSee(true);			// only the owning player will see this mesh
-	Mesh1P->AttachParent = FirstPersonCameraComponent;
+	Mesh1P->AttachToComponent(FirstPersonCameraComponent, FAttachmentTransformRules::KeepRelativeTransform);
 	Mesh1P->RelativeLocation = FVector(0.f, 0.f, -150.f);
 	Mesh1P->bCastDynamicShadow = false;
 	Mesh1P->CastShadow = false;

diff --git a/Tutorials/Source/Tutorials/Private/TutorialsGameMode.cpp b/Tutorials/Source/Tutorials/Private/TutorialsGameMode.cpp
@@ -1,7 +1,7 @@
 // Copyright 1998-2014 Epic Games, Inc. All Rights Reserved.
 
-#include "Tutorials.h"
 #include "TutorialsGameMode.h"
+#include "Tutorials.h"
 #include "TutorialsHUD.h"
 
 ATutorialsGameMode::ATutorialsGameMode(const class FObjectInitializer& PCIP)

diff --git a/Tutorials/Source/Tutorials/Private/TutorialsHUD.cpp b/Tutorials/Source/Tutorials/Private/TutorialsHUD.cpp
@@ -1,9 +1,11 @@
 // Copyright 1998-2014 Epic Games, Inc. All Rights Reserved.
 
-#include "Tutorials.h"
 #include "TutorialsHUD.h"
+#include "Tutorials.h"
+
 
-ATutorialsHUD::ATutorialsHUD(const class FObjectInitializer& PCIP) : Super(PCIP)
+ATutorialsHUD::ATutorialsHUD(const class FObjectInitializer& PCIP):
+	Super(PCIP)
 {
 	// Set the crosshair texture
 	static ConstructorHelpers::FObjectFinder<UTexture2D> CrosshiarTexObj(TEXT("/Game/Textures/T_Crosshair_D"));

diff --git a/Tutorials/Source/Tutorials/Private/TutorialsProjectile.cpp b/Tutorials/Source/Tutorials/Private/TutorialsProjectile.cpp
@@ -1,8 +1,7 @@
 // Copyright 1998-2014 Epic Games, Inc. All Rights Reserved.
 
-#include "Tutorials.h"
 #include "TutorialsProjectile.h"
-
+#include "Tutorials.h"
 
 ATutorialsProjectile::ATutorialsProjectile(const class FObjectInitializer& PCIP) 
 	: Super(PCIP)
@@ -26,7 +25,8 @@ ATutorialsProjectile::ATutorialsProjectile(const class FObjectInitializer& PCIP)
 	InitialLifeSpan = 3.0f;
 }
 
-void ATutorialsProjectile::OnHit(AActor* OtherActor, UPrimitiveComponent* OtherComp, FVector NormalImpulse, const FHitResult& Hit)
+//(AActor* OtherActor, UPrimitiveComponent* OtherComp, FVector NormalImpulse, const FHitResult& Hit)
+void ATutorialsProjectile::OnHit(UPrimitiveComponent* HitComp, AActor* OtherActor, UPrimitiveComponent* OtherComp, FVector NormalImpulse, const FHitResult& Hit)
 {
 	// Only add impulse and destroy projectile if we hit a physics
 	if ((OtherActor != NULL) && (OtherActor != this) && (OtherComp != NULL) && OtherComp->IsSimulatingPhysics())

diff --git a/Tutorials/Source/Tutorials/Public/TutorialsCharacter.h b/Tutorials/Source/Tutorials/Public/TutorialsCharacter.h
@@ -1,12 +1,18 @@
 // Copyright 1998-2014 Epic Games, Inc. All Rights Reserved.
 #pragma once
 
+#include "GameFramework/Character.h"
+
 #include "TutorialsCharacter.generated.h"
 
 UCLASS(config=Game)
-class ATutorialsCharacter : public ACharacter
+class TUTORIALS_API ATutorialsCharacter : public ACharacter
 {
-	GENERATED_UCLASS_BODY()
+	GENERATED_BODY()
+
+public:
+
+	ATutorialsCharacter(const class FObjectInitializer& PCIP);
 
 	/** Pawn mesh: 1st person view (arms; seen only by self) */
 	UPROPERTY(VisibleDefaultsOnly, Category=Mesh)

diff --git a/Tutorials/Source/Tutorials/Public/TutorialsGameMode.h b/Tutorials/Source/Tutorials/Public/TutorialsGameMode.h
@@ -1,13 +1,16 @@
 // Copyright 1998-2014 Epic Games, Inc. All Rights Reserved.
 #pragma once
 
+#include "GameFramework/GameModeBase.h"
 #include "TutorialsGameMode.generated.h"
 
-UCLASS(minimalapi)
-class ATutorialsGameMode : public AGameMode
+UCLASS()
+class TUTORIALS_API ATutorialsGameMode : public AGameModeBase
 {
-	GENERATED_UCLASS_BODY()
+	GENERATED_BODY()
 
+public:
+	ATutorialsGameMode(const class FObjectInitializer& PCIP);
 };
 
 

diff --git a/Tutorials/Source/Tutorials/Public/TutorialsHUD.h b/Tutorials/Source/Tutorials/Public/TutorialsHUD.h
@@ -1,15 +1,18 @@
 // Copyright 1998-2014 Epic Games, Inc. All Rights Reserved.
 #pragma once 
 
+#include "GameFramework/HUD.h"
 #include "TutorialsHUD.generated.h"
 
 UCLASS()
-class ATutorialsHUD : public AHUD
+class TUTORIALS_API ATutorialsHUD : public AHUD
 {
-	GENERATED_UCLASS_BODY()
+	GENERATED_BODY()
 
 public:
 
+	ATutorialsHUD(const class FObjectInitializer& PCIP);
+
 	/** Primary draw call for the HUD */
 	virtual void DrawHUD() override;
 

diff --git a/Tutorials/Source/Tutorials/Public/TutorialsProjectile.h b/Tutorials/Source/Tutorials/Public/TutorialsProjectile.h
@@ -1,12 +1,19 @@
 // Copyright 1998-2014 Epic Games, Inc. All Rights Reserved.
 #pragma once
 
+#include "GameFramework/Actor.h"
+#include "Components/SphereComponent.h"
+
 #include "TutorialsProjectile.generated.h"
 
 UCLASS(config=Game)
-class ATutorialsProjectile : public AActor
+class TUTORIALS_API ATutorialsProjectile : public AActor
 {
-	GENERATED_UCLASS_BODY()
+	GENERATED_BODY()
+
+public:
+
+	ATutorialsProjectile(const class FObjectInitializer& PCIP);
 
 	/** Sphere collision component */
 	UPROPERTY(VisibleDefaultsOnly, Category=Projectile)
@@ -18,6 +25,6 @@ class ATutorialsProjectile : public AActor
 
 	/** called when projectile hits something */
 	UFUNCTION()
-	void OnHit(AActor* OtherActor, UPrimitiveComponent* OtherComp, FVector NormalImpulse, const FHitResult& Hit);
+	void OnHit(UPrimitiveComponent* HitComp, AActor* OtherActor, UPrimitiveComponent* OtherComp, FVector NormalImpulse, const FHitResult& Hit);
 };
 
diff --git a/Tutorials/Source/Tutorials/Tutorials.Build.cs b/Tutorials/Source/Tutorials/Tutorials.Build.cs
@@ -4,8 +4,10 @@
 
 public class Tutorials : ModuleRules
 {
-	public Tutorials(TargetInfo Target)
+	public Tutorials(ReadOnlyTargetRules Target): base(Target)
 	{
+        PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+
 		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" });
 	}
 }
diff --git a/Tutorials/Source/Tutorials/UsableActorTutorial/UsableActor.cpp b/Tutorials/Source/Tutorials/UsableActorTutorial/UsableActor.cpp
@@ -1,3 +1,3 @@
 
-#include "Tutorials.h"
 #include "UsableActor.h"
+#include "Tutorials.h"
diff --git a/Tutorials/Source/Tutorials/UsableActorTutorial/UsableCppCharacter.cpp b/Tutorials/Source/Tutorials/UsableActorTutorial/UsableCppCharacter.cpp
@@ -1,10 +1,10 @@
 
 
-#include "Tutorials.h"
 #include "UsableCppCharacter.h"
+#include "Tutorials.h"
 #include "UsableActor.h"
 #include "TutorialsProjectile.h"
-
+#include "Engine/World.h"
 
 AUsableCppCharacter::AUsableCppCharacter()
 	: Super()
@@ -18,13 +18,13 @@ AUsableCppCharacter::AUsableCppCharacter()
 
 	// Create a CameraComponent	
 	FirstPersonCameraComponent = CreateDefaultSubobject<UCameraComponent>(TEXT("FirstPersonCamera"));
-	FirstPersonCameraComponent->AttachParent = GetCapsuleComponent();
+	FirstPersonCameraComponent->AttachToComponent(GetCapsuleComponent(), FAttachmentTransformRules::KeepRelativeTransform);
 	FirstPersonCameraComponent->RelativeLocation = FVector(0, 0, 64.f); // Position the camera
 
 	// Create a mesh component that will be used when being viewed from a '1st person' view (when controlling this pawn)
 	Mesh1P = CreateDefaultSubobject<USkeletalMeshComponent>(TEXT("CharacterMesh1P"));
 	Mesh1P->SetOnlyOwnerSee(true);			// only the owning player will see this mesh
-	Mesh1P->AttachParent = FirstPersonCameraComponent;
+	Mesh1P->AttachToComponent(FirstPersonCameraComponent, FAttachmentTransformRules::KeepRelativeTransform);
 	Mesh1P->RelativeLocation = FVector(0.f, 0.f, -150.f);
 	Mesh1P->bCastDynamicShadow = false;
 	Mesh1P->CastShadow = false;
@@ -58,7 +58,7 @@ AUsableActor* AUsableCppCharacter::GetUsableInView()
 	TraceParams.bTraceComplex = true;
 
 	FHitResult Hit(ForceInit);
-	GetWorld()->LineTraceSingle(Hit, start_trace, end_trace, COLLISION_PROJECTILE, TraceParams);
+	ActorLineTraceSingle(Hit, start_trace, end_trace, COLLISION_PROJECTILE, TraceParams);
 
 	//DrawDebugLine(GetWorld(), start_trace, end_trace, FColor(255, 255, 255), false, 1);
 

diff --git a/Tutorials/Source/TutorialsEditor.Target.cs b/Tutorials/Source/TutorialsEditor.Target.cs
@@ -5,21 +5,10 @@
 
 public class TutorialsEditorTarget : TargetRules
 {
-	public TutorialsEditorTarget(TargetInfo Target)
+	public TutorialsEditorTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Editor;
-	}
-
-	//
-	// TargetRules interface.
-	//
 
-	public override void SetupBinaries(
-		TargetInfo Target,
-		ref List<UEBuildBinaryConfiguration> OutBuildBinaryConfigurations,
-		ref List<string> OutExtraModuleNames
-		)
-	{
-		OutExtraModuleNames.Add("Tutorials");
+        ExtraModuleNames.Add("Tutorials");
 	}
 }
diff --git a/Tutorials/Tutorials.uproject b/Tutorials/Tutorials.uproject
@@ -1,6 +1,6 @@
 {
 	"FileVersion": 3,
-	"EngineAssociation": "4.10",
+	"EngineAssociation": "{57375377-44E8-71FB-8A37-70803ED6365A}",
 	"Category": "",
 	"Description": "",
 	"Modules": [