From d379052278660e2a4dfa53abd11555c265106853 Mon Sep 17 00:00:00 2001 From: acdemiralp <demiralpali@gmail.com> Date: Tue, 20 Nov 2018 00:52:12 +0100 Subject: [PATCH] Updated from VR-Group/turbulent_flow. --- .../nDisplayExtensions/Private/DisplayClusterPawnBase.cpp | 4 ++++ .../nDisplayExtensions/Private/DisplayClusterPawnCAVE.cpp | 8 ++++++++ Source/nDisplayExtensions/Public/DisplayClusterPawnBase.h | 1 + Source/nDisplayExtensions/Public/DisplayClusterPawnCAVE.h | 4 +++- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Source/nDisplayExtensions/Private/DisplayClusterPawnBase.cpp b/Source/nDisplayExtensions/Private/DisplayClusterPawnBase.cpp index b55f5209..9411bc4c 100644 --- a/Source/nDisplayExtensions/Private/DisplayClusterPawnBase.cpp +++ b/Source/nDisplayExtensions/Private/DisplayClusterPawnBase.cpp @@ -133,6 +133,10 @@ void ADisplayClusterPawnBase::Tick (float Delt const float Mult = GetWorld()->GetWorldSettings()->WorldToMeters / 100.f; SetActorScale3D(FVector(Mult, Mult, Mult)); } +void ADisplayClusterPawnBase::BeginDestroy() +{ + Super::BeginDestroy(); +} UPawnMovementComponent* ADisplayClusterPawnBase::GetMovementComponent() const { return MovementComponent; diff --git a/Source/nDisplayExtensions/Private/DisplayClusterPawnCAVE.cpp b/Source/nDisplayExtensions/Private/DisplayClusterPawnCAVE.cpp index 7ec14b84..3a4cccd8 100644 --- a/Source/nDisplayExtensions/Private/DisplayClusterPawnCAVE.cpp +++ b/Source/nDisplayExtensions/Private/DisplayClusterPawnCAVE.cpp @@ -20,6 +20,10 @@ void ADisplayClusterPawnCAVE::OnButtonEvent_Implementation (bool Pressed } +void ADisplayClusterPawnCAVE::BeginPlay () +{ + Super::BeginPlay(); +} void ADisplayClusterPawnCAVE::Tick (float DeltaSeconds) { // Due to these declarations, this class is bound to aixcave.cfg. @@ -52,3 +56,7 @@ void ADisplayClusterPawnCAVE::Tick (float DeltaSecon if (ButtonReleased) OnButtonEvent_Implementation(false, i); } } +void ADisplayClusterPawnCAVE::BeginDestroy () +{ + Super::BeginDestroy(); +} \ No newline at end of file diff --git a/Source/nDisplayExtensions/Public/DisplayClusterPawnBase.h b/Source/nDisplayExtensions/Public/DisplayClusterPawnBase.h index 9cdc7a1f..68fc6820 100644 --- a/Source/nDisplayExtensions/Public/DisplayClusterPawnBase.h +++ b/Source/nDisplayExtensions/Public/DisplayClusterPawnBase.h @@ -24,6 +24,7 @@ public: virtual void BeginPlay () override; virtual void Tick (float DeltaSeconds) override; + virtual void BeginDestroy () override; virtual UPawnMovementComponent* GetMovementComponent() const override; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Pawn") float BaseTurnRate ; diff --git a/Source/nDisplayExtensions/Public/DisplayClusterPawnCAVE.h b/Source/nDisplayExtensions/Public/DisplayClusterPawnCAVE.h index e60cf954..fbb47da0 100644 --- a/Source/nDisplayExtensions/Public/DisplayClusterPawnCAVE.h +++ b/Source/nDisplayExtensions/Public/DisplayClusterPawnCAVE.h @@ -17,7 +17,9 @@ public: UFUNCTION(BlueprintNativeEvent, BlueprintCallable, Category = "Input") void OnTriggerEvent(bool Pressed); protected: - virtual void Tick (float DeltaSeconds) override; + virtual void BeginPlay () override; + virtual void Tick (float DeltaSeconds) override; + virtual void BeginDestroy() override; UDisplayClusterSceneComponent* Flystick = nullptr; }; -- GitLab