From 6564ee3a39c7c5908a9133a535348ffb634c1569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=A4fer?=
<pschaefer@ITA.AKUSTIK.RWTH-AACHEN.DE>
Date: Wed, 22 Feb 2023 08:53:33 +0100
Subject: [PATCH] VAReceiverActor: updated property description, categories and
order
---
Source/VAPlugin/Public/VAReceiverActor.h | 66 ++++++++++++------------
1 file changed, 32 insertions(+), 34 deletions(-)
diff --git a/Source/VAPlugin/Public/VAReceiverActor.h b/Source/VAPlugin/Public/VAReceiverActor.h
index dfb9cd0..9a475a2 100644
--- a/Source/VAPlugin/Public/VAReceiverActor.h
+++ b/Source/VAPlugin/Public/VAReceiverActor.h
@@ -46,28 +46,51 @@ protected:
UPROPERTY(EditAnywhere, meta = (DisplayName = "Ask for Debug mode?", Category = "General Settings"))
bool bAskForDebugMode = false;
- // Check if should try to use Python Automatic Remote star
- UPROPERTY(EditAnywhere, meta = (DisplayName = "Use Automatic Remote VA Start via Python?", Category = "Connection"))
- bool bAutomaticRemoteVAStart = true;
+ // View point to head center offset (x forward-dir, y right-dir, z up-dir) in cm. Note that x and z most probably need to be negative!
+ UPROPERTY(EditAnywhere, meta = (Category = "General Settings"))
+ FVector ViewpointToHeadcenterOffset = FVector(0, 0, 0);
+
+ // Source for tracking data, e.g., VirtualRealityPawn, ManualData (e.g., manually passed on from Optitrack)
+ UPROPERTY(EditAnywhere, meta = (Category = "General Settings"))
+ ETrackingSource TrackingSource = ETrackingSource::VirtualRealityPawn;
+
// Choose how to connect to the Server (automatic: build with windows connect with 127.0.0.1:12340, build with linux connect to cave)
UPROPERTY(EditAnywhere, meta = (DisplayName = "Usecase", Category = "Connection"))
TEnumAsByte<EConnectionSetting::Type> AddressSetting = EConnectionSetting::Type::Automatic;
// IP Address for manual input
- UPROPERTY(EditAnywhere, meta = (DisplayName = "IP Adress", Category = "Connection")) // CanEditChange used
+ UPROPERTY(EditAnywhere, meta = (DisplayName = "IP Adress", Category = "Connection"))
FString ServerIPAddress = "10.0.1.240";
// Port for manual input
- UPROPERTY(EditAnywhere, meta = (DisplayName = "Port [0, 65535]", Category = "Connection", // CanEditChange used
+ UPROPERTY(EditAnywhere, meta = (DisplayName = "Port [0, 65535]", Category = "Connection",
ClampMin = "0", ClampMax = "65535", UIMin = "0", UIMax = "65535"))
uint16 ServerPort = 12340;
- // Port for manual input
- UPROPERTY(EditAnywhere, meta = (Category = "Connection", DisplayName = "Always reconnect to VAServer when this level is started?"))
+ // Always reconnect to VAServer when this level is started?
+ UPROPERTY(EditAnywhere, meta = (Category = "Connection", DisplayName = "Automatic Reconnect"))
bool bReconnecToVAServer = true;
- // Read in File?
+ // Activate automatic remote VAServer start via Python (VAServer Launcher)
+ UPROPERTY(EditAnywhere, meta = (DisplayName = "Use VAServer Launcher", Category = "VAServer Launcher"))
+ bool bAutomaticRemoteVAStart = true;
+
+ // Port for remote VAServer Launcher [0, 65535]
+ UPROPERTY(EditAnywhere, meta = (DisplayName = "VAServer Launcher Port", Category = "VAServer Launcher",
+ ClampMin = "0", ClampMax = "65535", UIMin = "0", UIMax = "65535"))
+ uint16 RemoteVAStarterPort = 41578;
+
+ // ID for VAServer version being started automatically, configurable in the Config of the VAServer Launcher
+ UPROPERTY(EditAnywhere, meta = (DisplayName = "VAServer Version ID", Category = "VAServer Launcher"))
+ FString WhichVAServerVersionToStart = TEXT("2022.a");
+
+ // Ini file with VA renderer settings. File will be sent to VAServer launcher on startup if filename is not empty.
+ UPROPERTY(EditAnywhere, meta = (DisplayName = "VARenderer.ini file", Category = "VAServer Launcher"))
+ FString VARendererIniFile = TEXT("");
+
+
+ // Read an initial mapping file for directivities?
UPROPERTY(EditAnywhere, meta = (DisplayName = "Read an initial mapping file?", Category = "Directivity Manager"))
bool bReadInitialMappingFile = false;
@@ -76,34 +99,9 @@ protected:
UPROPERTY(EditAnywhere, meta = (DisplayName = "Name of ini file for directivities", Category = "Directivity Manager"))
FString DirMappingFileName = "";
- // Port for remote VAServer starting
- UPROPERTY(EditAnywhere, meta = (DisplayName = "Remote VAServer Start Port [0, 65535]", Category = "Connection",
- // CanEditChange used
- ClampMin = "0", ClampMax = "65535", UIMin = "0", UIMax = "65535"))
- uint16 RemoteVAStarterPort = 41578;
-
- // Which version should be started automatically
- UPROPERTY(EditAnywhere, meta = (DisplayName =
- "Which VAServer version should be started, configurable in the Config of the VAServer Launcher", Category =
- "General Settings"))
- FString WhichVAServerVersionToStart = TEXT("2020.a");
-
- // Ini file with VA renderer settings. File will be sent to VAServer launcher on startup if not empty
- UPROPERTY(EditAnywhere, meta = (DisplayName = "VARenderer.ini file", Category = "Connection"))
- FString VARendererIniFile = TEXT("");
-
// Controller for global auraliztion modes
UPROPERTY(EditAnywhere, Instanced, NoClear, meta = (DisplayName = "Auraliztion Mode Controller", Category = "Auralization Modes"))
- UVAAuralizationModeController* AuralizationModeController;
-
- // View point to head center offset (x forward-dir, y right-dir, z up-dir) in cm. Note that x and z most probably need to be negative!
- UPROPERTY(EditAnywhere, meta = (Category = "General Settings"))
- FVector ViewpointToHeadcenterOffset = FVector(0, 0, 0);
-
- // Source for tracking data, e.g., VirtualRealityPawn, ManualData (e.g., manually passed on from Optitrack)
- UPROPERTY(EditAnywhere, meta = (Category = "General Settings"))
- ETrackingSource TrackingSource = ETrackingSource::VirtualRealityPawn;
-
+ UVAAuralizationModeController* AuralizationModeController;
public:
--
GitLab