From 942e7a53d6040d2a7c04c5f23f59e273f6f64e76 Mon Sep 17 00:00:00 2001
From: Jonathan Wendt <wendt@vr.rwth-aachen.de>
Date: Thu, 5 Dec 2019 08:29:13 +0100
Subject: [PATCH] renaming of class to VRWidgetInteractionComponent
---
.../Private/VRWidgetInteractionComponent.cpp | 16 +++++++---------
.../Public/VRWidgetInteractionComponent.h | 8 ++++----
.../WidgetInteraction/Public/WidgetInteraction.h | 8 ++++----
3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/Source/WidgetInteraction/Private/VRWidgetInteractionComponent.cpp b/Source/WidgetInteraction/Private/VRWidgetInteractionComponent.cpp
index 2685e08..a06ffa6 100644
--- a/Source/WidgetInteraction/Private/VRWidgetInteractionComponent.cpp
+++ b/Source/WidgetInteraction/Private/VRWidgetInteractionComponent.cpp
@@ -1,18 +1,16 @@
// Fill out your copyright notice in the Description page of Project Settings.
-#include "RwthComponent.h"
+#include "VRWidgetInteractionComponent.h"
+
#include "Runtime/InputCore/Classes/InputCoreTypes.h"
#include "Runtime/Engine/Classes/Components/InputComponent.h"
#include "VirtualRealityPawn.h"
-URwthComponent::URwthComponent()
-{
-
-}
+UVRWidgetInteractionComponent::UVRWidgetInteractionComponent() {}
-void URwthComponent::Init()
+void UVRWidgetInteractionComponent::Init()
{
- SetVisibility(true);
+ SetVisibility(true);
InteractionDistance = 1000000.0f;
auto input_cmp = dynamic_cast<UInputComponent*>(GetOwner()->GetComponentByClass(UInputComponent::StaticClass()));
@@ -23,11 +21,11 @@ void URwthComponent::Init()
RegisterComponent();
}
-void URwthComponent::SetVisibility(bool visible) {
+void UVRWidgetInteractionComponent::SetVisibility(bool visible) {
bShowDebug = visible;
}
-void URwthComponent::OnFire(bool val)
+void UVRWidgetInteractionComponent::OnFire(bool val)
{
if (val == true)
PressPointerKey(EKeys::LeftMouseButton);
diff --git a/Source/WidgetInteraction/Public/VRWidgetInteractionComponent.h b/Source/WidgetInteraction/Public/VRWidgetInteractionComponent.h
index d5fda41..76360f2 100644
--- a/Source/WidgetInteraction/Public/VRWidgetInteractionComponent.h
+++ b/Source/WidgetInteraction/Public/VRWidgetInteractionComponent.h
@@ -4,21 +4,21 @@
#include "CoreMinimal.h"
#include "Components/WidgetInteractionComponent.h"
-#include "RwthComponent.generated.h"
+#include "VRWidgetInteractionComponent.generated.h"
/**
*
*/
UCLASS()
-class WIDGETINTERACTION_API URwthComponent : public UWidgetInteractionComponent
+class WIDGETINTERACTION_API UVRWidgetInteractionComponent : public UWidgetInteractionComponent
{
GENERATED_BODY()
public:
- URwthComponent();
+ UVRWidgetInteractionComponent();
void Init();
- void SetVisibility(bool visible);
+ void SetVisibility(bool visible);
protected:
void OnFire(bool val);
diff --git a/Source/WidgetInteraction/Public/WidgetInteraction.h b/Source/WidgetInteraction/Public/WidgetInteraction.h
index b9ee1e0..b970b95 100644
--- a/Source/WidgetInteraction/Public/WidgetInteraction.h
+++ b/Source/WidgetInteraction/Public/WidgetInteraction.h
@@ -4,7 +4,7 @@
#include "CoreMinimal.h"
#include "VirtualRealityPawn.h"
-#include "RwthComponent.h"
+#include "VRWidgetInteractionComponent.h"
#include "Modules/ModuleManager.h"
class WIDGETINTERACTION_API FWidgetInteractionModule : public IModuleInterface
@@ -17,7 +17,7 @@ public:
UFUNCTION() void OnWorldTickStart(ELevelTick, float);
- URwthComponent* GetWidgetInteractionComponent();
+ UVRWidgetInteractionComponent* GetWidgetInteractionComponent();
private:
void CreateWidgetInteraction(USceneComponent * parent, AVirtualRealityPawn* outer);
@@ -25,6 +25,6 @@ private:
private:
TBaseDelegate<void, ELevelTick, float> on_world_tick_start_delegate_;
- URwthComponent * widget_interaction_cmp_;
- UWorld* last_world;
+ UVRWidgetInteractionComponent * widget_interaction_cmp_;
+ UWorld* last_world;
};
--
GitLab