Fixing up includes for arm64

VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Melee.cpp

@@ -46,6 +46,12 @@ UGS_Melee::UGS_Melee(const FObjectInitializer& ObjectInitializer) :
 	bOnlyPenetrateWithTwoHands = false;
 }
 
+void UGS_Melee::SetIsLodged(bool IsLodged, UPrimitiveComponent* LodgeComponent)
+{
+	bIsLodged = IsLodged;
+	LodgedComponent = LodgeComponent;
+}
+
 void UGS_Melee::UpdateDualHandInfo()
 {
 	TArray<FBPGripPair> HoldingControllers;

VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp

@@ -8,6 +8,10 @@
 #include "Grippables/GrippablePhysicsReplication.h"
 #include UE_INLINE_GENERATED_CPP_BY_NAME(GrippablePhysicsReplication)
 
+#include "CoreMinimal.h"
+#include "PhysicsEngine\BodyInstance.h"
+#include "Components/PrimitiveComponent.h"
+#include "Components/SkeletalMeshComponent.h"
 #include "UObject/ObjectMacros.h"
 #include "UObject/Interface.h"
 #include "DrawDebugHelpers.h"

VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp

@@ -3,11 +3,16 @@
 #include "Grippables/HandSocketComponent.h"
 #include UE_INLINE_GENERATED_CPP_BY_NAME(HandSocketComponent)
 
+#include "CoreMinimal.h"
+#include "UObject/UObjectIterator.h"
 #include "Engine/CollisionProfile.h"
+#include "BoneContainer.h"
 #include "Animation/AnimSequence.h"
 #include "Animation/AnimInstanceProxy.h"
 #include "Animation/PoseSnapshot.h"
 #include "Animation/AnimData/AnimDataModel.h"
+#include "Engine/SkinnedAssetCommon.h"
+#include "Engine/SkinnedAsset.h"
 //#include "VRExpansionFunctionLibrary.h"
 #include "Components/SkeletalMeshComponent.h"
 #include "Components/PoseableMeshComponent.h"
@@ -1010,4 +1015,11 @@ FGameplayTagContainer& UHandSocketComponent::GetGameplayTags()
 
 /////////////////////////////////////////////////
 //- End Push networking getter / setter functions
-/////////////////////////////////////////////////
+/////////////////////////////////////////////////
+
+void UHandSocketAnimInstance::NativeInitializeAnimation()
+{
+	Super::NativeInitializeAnimation();
+
+	OwningSocket = Cast<UHandSocketComponent>(GetOwningComponent()->GetAttachParent());
+}

VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/CollisionIgnoreSubsystem.cpp

@@ -4,6 +4,7 @@
 #include UE_INLINE_GENERATED_CPP_BY_NAME(CollisionIgnoreSubsystem)
 
 #include "Components/SkeletalMeshComponent.h"
+#include "Engine/World.h"
 #include "Runtime/Engine/Classes/Kismet/GameplayStatics.h"
 #include "VRGlobalSettings.h"
 
@@ -92,6 +93,16 @@ void UCollisionIgnoreSubsystem::ConstructInput()
 	}
 }
 
+void UCollisionIgnoreSubsystem::Deinitialize()
+{
+	Super::Deinitialize();
+
+	if (UpdateHandle.IsValid())
+	{
+		GetWorld()->GetTimerManager().ClearTimer(UpdateHandle);
+	}
+}
+
 
 void UCollisionIgnoreSubsystem::UpdateTimer(bool bChangesWereMade)
 {

VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp

@@ -3,8 +3,11 @@
 #include "Misc/VRAIPerceptionOverrides.h"
 #include UE_INLINE_GENERATED_CPP_BY_NAME(VRAIPerceptionOverrides)
 
-#include "EngineDefines.h"
-#include "EngineGlobals.h"
+#include "CoreMinimal.h"
+#include "Engine/Engine.h"
+#include "Engine/World.h"
+//#include "EngineDefines.h"
+//#include "EngineGlobals.h"
 #include "CollisionQueryParams.h"
 //#include "Engine/Engine.h"
 #include "AISystem.h"

VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VREPhysicalAnimationComponent.cpp

@@ -8,10 +8,11 @@
 #include "ReferenceSkeleton.h"
 #include "DrawDebugHelpers.h"
 
-#if ENABLE_DRAW_DEBUG
+#if UE_ENABLE_DEBUG_DRAWING
 #include "Chaos/ImplicitObject.h"
 #include "Chaos/TriangleMeshImplicitObject.h"
 #include "Chaos/ShapeInstance.h"
+#include "Chaos/DebugDrawQueue.h"
 #endif
 
 #include "Physics/PhysicsInterfaceCore.h"
@@ -232,8 +233,8 @@ void UVREPhysicalAnimationComponent::UpdateWeldedBoneDriver(float DeltaTime)
 				if (FPhysicsInterface::IsValid(ActorHandle) /*&& FPhysicsInterface::IsRigidBody(ActorHandle)*/)
 				{
 
-#if ENABLE_DRAW_DEBUG
-					if (bDebugDrawCollision)
+#if UE_ENABLE_DEBUG_DRAWING
+					if (false)//bDebugDrawCollision)
 					{
 						Chaos::FDebugDrawQueue::GetInstance().SetConsumerActive(this, true); // Need to deactivate this later as well
 						Chaos::FDebugDrawQueue::GetInstance().SetMaxCost(20000);
@@ -252,8 +253,8 @@ void UVREPhysicalAnimationComponent::UpdateWeldedBoneDriver(float DeltaTime)
 						FTransform GlobalPoseInv = GlobalPose.Inverse();
 
 
-#if ENABLE_DRAW_DEBUG
-						if (bDebugDrawCollision)
+#if UE_ENABLE_DEBUG_DRAWING
+						if (false)//bDebugDrawCollision)
 						{
 							Chaos::FDebugDrawQueue::GetInstance().SetRegionOfInterest(GlobalPose.GetLocation(), 100.0f);
 						}
@@ -306,33 +307,33 @@ void UVREPhysicalAnimationComponent::UpdateWeldedBoneDriver(float DeltaTime)
 								}
 							}
 
-#if ENABLE_DRAW_DEBUG
-							if (bDebugDrawCollision)
+#if UE_ENABLE_DEBUG_DRAWING
+							if (false)//bDebugDrawCollision)
 							{
-								const Chaos::FImplicitObject& ShapeImplicit = Shape.GetGeometry();
+								/*const Chaos::FImplicitObject& ShapeImplicit = Shape.GetGeometry();
 								Chaos::EImplicitObjectType Type = ShapeImplicit.GetType();
 
 								FTransform shapeTransform = FPhysicsInterface::GetLocalTransform(Shape);
 								FTransform FinalTransform = shapeTransform * GlobalPose;
 								Chaos::FRigidTransform3 RigTransform(FinalTransform);
-								Chaos::DebugDraw::DrawShape(RigTransform, &ShapeImplicit, Shape.Shape, FColor::White);
+								Chaos::DebugDraw::DrawShape(RigTransform, &ShapeImplicit, Shape.Shape, FColor::White);*/
 							}
 #endif
 						}
 					});
 
-#if ENABLE_DRAW_DEBUG
-					if (bDebugDrawCollision)
+#if UE_ENABLE_DEBUG_DRAWING
+					if (false)//bDebugDrawCollision)
 					{
 						// Get the latest commands
-						TArray<Chaos::FLatentDrawCommand> DrawCommands;
+						/*TArray<Chaos::FLatentDrawCommand> DrawCommands;
 						Chaos::FDebugDrawQueue::GetInstance().ExtractAllElements(DrawCommands);
 						if (DrawCommands.Num())
 						{
 							DebugDrawMesh(DrawCommands);
 						}
 						Chaos::FDebugDrawQueue::GetInstance().SetConsumerActive(this, false); // Need to deactivate this later as well
-						Chaos::FDebugDrawQueue::GetInstance().SetEnabled(false);
+						Chaos::FDebugDrawQueue::GetInstance().SetEnabled(false);*/
 					}
 #endif
 				}
@@ -342,7 +343,8 @@ void UVREPhysicalAnimationComponent::UpdateWeldedBoneDriver(float DeltaTime)
 	}
 }
 
-#if ENABLE_DRAW_DEBUG
+#if UE_ENABLE_DEBUG_DRAWING
+/*
 void UVREPhysicalAnimationComponent::DebugDrawMesh(const TArray<Chaos::FLatentDrawCommand>& DrawCommands)
 {
 	UWorld* World = this->GetWorld();
@@ -383,5 +385,5 @@ void UVREPhysicalAnimationComponent::DebugDrawMesh(const TArray<Chaos::FLatentDr
 			break;
 		}
 	}
-}
+}*/
 #endif

VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRFullScreenUserWidget.cpp

@@ -4,7 +4,7 @@
 #include UE_INLINE_GENERATED_CPP_BY_NAME(VRFullScreenUserWidget)
 
 //#include "Components/PostProcessComponent.h"
-//#include "Engine/Engine.h"
+#include "Engine/Engine.h"
 #include "Engine/GameInstance.h"
 #include "Engine/GameViewportClient.h"
 #include "Engine/TextureRenderTarget2D.h"

VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRLogComponent.cpp

@@ -3,6 +3,9 @@
 #include "Misc/VRLogComponent.h"
 #include UE_INLINE_GENERATED_CPP_BY_NAME(VRLogComponent)
 
+#include "Engine/Engine.h"
+#include "GenericPlatform\GenericPlatformInputDeviceMapper.h"
+#include "Engine\GameViewportClient.h"
 #include "GlobalRenderResources.h"
 
 //#include "Engine/Engine.h"

VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRPlayerStart.cpp

@@ -3,6 +3,8 @@
 #include "Misc/VRPlayerStart.h"
 #include UE_INLINE_GENERATED_CPP_BY_NAME(VRPlayerStart)
 
+#include "CoreMinimal.h"
+#include "Engine/World.h"
 #include "Components/CapsuleComponent.h"
 #include "Components/BillboardComponent.h"
 

VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp

@@ -3,12 +3,17 @@
 #include "Misc/VRRenderTargetManager.h"
 #include UE_INLINE_GENERATED_CPP_BY_NAME(VRRenderTargetManager)
 
+#include "Engine/World.h"
+#include "GlobalRenderResources.h"
+#include "Components/ActorComponent.h"
 #include "Kismet/GameplayStatics.h"
+#include "GameFramework\Pawn.h"
 #include "GameFramework/PlayerState.h"
 #include "GameFramework/PlayerController.h"
 #include "Engine/TextureRenderTarget2D.h"
 #include "Engine/Texture2D.h"
 #include "TextureResource.h"
+#include "PixelFormat.h"
 #include "CanvasTypes.h"
 #include "Kismet/KismetMathLibrary.h"
 #include "Kismet/KismetRenderingLibrary.h"
@@ -485,6 +490,14 @@ void ARenderTargetReplicationProxy::SendNextDataBlob()
 	}
 }
 
+void ARenderTargetReplicationProxy::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	if (SendTimer_Handle.IsValid())
+		GetWorld()->GetTimerManager().ClearTimer(SendTimer_Handle);
+
+	Super::EndPlay(EndPlayReason);
+}
+
 //=============================================================================
 void ARenderTargetReplicationProxy::GetLifetimeReplicatedProps(TArray< class FLifetimeProperty >& OutLifetimeProps) const
 {

VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp

@@ -4,6 +4,8 @@
 
 #include "VRBPDatatypes.h"
 #include "DefaultMovementSet\LayeredMoves\BasicLayeredMoves.h"
+#include "Engine/BlueprintGeneratedClass.h"
+#include "Curves\CurveFloat.h" // Delete after tests, only needed for cloning
 #include "ReplicatedVRCameraComponent.h"
 
 DEFINE_LOG_CATEGORY(LogVRMoverComponent);
@@ -161,7 +163,8 @@ void AVRMoverBasePawn::BeginPlay()
 		if (HasLocalNetOwner())
 		{
 			// Add the persistant HMDlayered move addition
-			CharacterMotionComponent->QueueLayeredMove(TSharedPtr<FLayeredMoveBase>(new FLayeredMove_VRMovement()));
+			TSharedPtr<FLayeredMove_VRMovement> VRMoveLayer = MakeShared<FLayeredMove_VRMovement>();
+			CharacterMotionComponent->QueueLayeredMove(VRMoveLayer);
 		}
 	}
 }

VRExpansionPlugin/Source/VRExpansionPlugin/Private/ParentRelativeAttachmentComponent.cpp

@@ -3,6 +3,7 @@
 #include "ParentRelativeAttachmentComponent.h"
 #include UE_INLINE_GENERATED_CPP_BY_NAME(ParentRelativeAttachmentComponent)
 
+#include "Engine/Engine.h"
 #include "VRBaseCharacter.h"
 #include "VRCharacter.h"
 #include "IXRTrackingSystem.h"

VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp

@@ -3,6 +3,9 @@
 #include "ReplicatedVRCameraComponent.h"
 #include UE_INLINE_GENERATED_CPP_BY_NAME(ReplicatedVRCameraComponent)
 
+#include "CoreMinimal.h"
+#include "Engine/Engine.h"
+#include "Engine/World.h"
 #include "Net/UnrealNetwork.h"
 #include "VRBaseCharacter.h"
 #include "VRCharacter.h"
@@ -579,4 +582,11 @@ void UReplicatedVRCameraComponent::SetNetUpdateRate(float NewNetUpdateRate)
 #if WITH_PUSH_MODEL
 	MARK_PROPERTY_DIRTY_FROM_NAME(UReplicatedVRCameraComponent, NetUpdateRate, this);
 #endif
+}
+
+bool UReplicatedVRCameraComponent::IsLocallyControlled() const
+{
+	// I like epics new authority check more than my own
+	const AActor* MyOwner = GetOwner();
+	return MyOwner->HasLocalNetOwner();
 }

VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRAIController.cpp

@@ -4,6 +4,8 @@
 #include UE_INLINE_GENERATED_CPP_BY_NAME(VRAIController)
 
 //#include "VRBPDatatypes.h"
+#include "CoreMinimal.h"
+#include "Engine/World.h"
 #include "VRBaseCharacter.h"
 #include "Components/CapsuleComponent.h"
 #include "NetworkingDistanceConstants.h" // Needed for the LinOfSightTo function override to work

VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp

@@ -3,7 +3,9 @@
 #include "VRBPDatatypes.h"
 #include UE_INLINE_GENERATED_CPP_BY_NAME(VRBPDatatypes)
 
+#include "CoreMinimal.h"
 #include "VRGlobalSettings.h"
+#include "Components\PrimitiveComponent.h"
 #include "HAL/IConsoleManager.h"
 #include "Chaos/ChaosEngineInterface.h"
 
@@ -269,4 +271,22 @@ bool FBPAdvancedPhysicsHandleSettings::FillTo(FBPActorPhysicsHandleInformation*
 	}
 
 	return true;
+}
+
+AActor* FBPActorGripInformation::GetGrippedActor() const
+{
+	return Cast<AActor>(GrippedObject);
+}
+
+UPrimitiveComponent* FBPActorGripInformation::GetGrippedComponent() const
+{
+	return Cast<UPrimitiveComponent>(GrippedObject);
+}
+
+bool FBPActorGripInformation::operator==(const UPrimitiveComponent* Other) const
+{
+	if (Other && GrippedObject && GrippedObject == (const UObject*)Other)
+		return true;
+
+	return false;
 }

VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp

@@ -19,6 +19,7 @@
 #include "Navigation/PathFollowingComponent.h"
 #include "VRPlayerController.h"
 #include "GameFramework/PhysicsVolume.h"
+#include "Animation\AnimInstance.h"
 
 
 DEFINE_LOG_CATEGORY(LogVRBaseCharacterMovement);

VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp

@@ -2,6 +2,8 @@
 #include UE_INLINE_GENERATED_CPP_BY_NAME(VRGestureComponent)
 
 #include "VRBaseCharacter.h"
+#include "Engine/Engine.h"
+#include "Engine/World.h"
 #include "Components/SplineMeshComponent.h"
 #include "Components/SplineComponent.h"
 #include "Components/LineBatchComponent.h"

VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp

@@ -3,6 +3,8 @@
 #include "VRPathFollowingComponent.h"
 #include UE_INLINE_GENERATED_CPP_BY_NAME(VRPathFollowingComponent)
 
+#include "CoreMinimal.h"
+#include "Engine/World.h"
 //#include "Runtime/Engine/Private/EnginePrivate.h"
 
 //#if ENGINE_MAJOR_VERSION == 4 && ENGINE_MINOR_VERSION >= 13

VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp

@@ -6,6 +6,8 @@
 //#include "Runtime/Engine/Private/EnginePrivate.h"
 //#include "WorldCollision.h"
 #include "PhysicsPublic.h"
+#include "Engine/World.h"
+#include "Engine/Engine.h"
 #include "Engine/ScopedMovementUpdate.h"
 #include "SceneManagement.h"
 #include "PrimitiveSceneProxy.h"

VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Melee.h

@@ -181,11 +181,8 @@ class VREXPANSIONPLUGIN_API UGS_Melee : public UGS_Default
 	virtual void OnLodgeHitCallback(AActor* SelfActor, AActor* OtherActor, FVector NormalImpulse, const FHitResult& Hit);
 
 	UFUNCTION(BlueprintCallable, Category = "Weapon Settings")
-		void SetIsLodged(bool IsLodged, UPrimitiveComponent * LodgeComponent)
-	{
-		bIsLodged = IsLodged;
-		LodgedComponent = LodgeComponent;
-	}
+	void SetIsLodged(bool IsLodged, UPrimitiveComponent* LodgeComponent);
+
 
 	bool bIsLodged;
 	TWeakObjectPtr<UPrimitiveComponent> LodgedComponent;