Skip to content
Snippets Groups Projects
Commit b826bfed authored by Sebastian Pape's avatar Sebastian Pape
Browse files

Fixing Packaging Error

parent e7c8cb01
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "NDisplayLaunchButtonCommands.h" #include "NDisplayLaunchButtonCommands.h"
#include "Misc/MessageDialog.h" #include "Misc/MessageDialog.h"
#include "Framework/MultiBox/MultiBoxBuilder.h" #include "Framework/MultiBox/MultiBoxBuilder.h"
#include "IPluginManager.h" #include "Interfaces/IPluginManager.h"
#include "Misc/EngineVersion.h" #include "Misc/EngineVersion.h"
#include "Networking.h" #include "Networking.h"
#include "SocketHelper.h" #include "SocketHelper.h"
...@@ -46,7 +46,7 @@ void FNDisplayLaunchButtonModule::ShutdownModule() ...@@ -46,7 +46,7 @@ void FNDisplayLaunchButtonModule::ShutdownModule()
void FNDisplayLaunchButtonModule::PluginButtonClicked() void FNDisplayLaunchButtonModule::PluginButtonClicked()
{ {
const UNDisplayLaunchButtonSettings* Settings = GetDefault<UNDisplayLaunchButtonSettings>(); const UNDisplayLaunchButtonSettings* Settings = GetDefault<UNDisplayLaunchButtonSettings>();
if (Settings->LaunchType == NONE) if (Settings->LaunchType == ButtonLaunchType_NONE)
{ {
GEngine->AddOnScreenDebugMessage(-1, 3, FColor::White, TEXT("The Button is set to do nothing.")); GEngine->AddOnScreenDebugMessage(-1, 3, FColor::White, TEXT("The Button is set to do nothing."));
return; return;
...@@ -58,7 +58,7 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked() ...@@ -58,7 +58,7 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked()
TSharedPtr<SWindow> RootWindow = FGlobalTabmanager::Get()->GetRootWindow(); TSharedPtr<SWindow> RootWindow = FGlobalTabmanager::Get()->GetRootWindow();
if (RootWindow.IsValid()) RootWindow->Minimize(); if (RootWindow.IsValid()) RootWindow->Minimize();
if (Settings->LaunchType == ROLV) if (Settings->LaunchType == ButtonLaunchType_ROLV)
{ {
FString EditorExecutable = "UE4Editor.exe"; FString EditorExecutable = "UE4Editor.exe";
FString Parameters = "\"" + FPaths::GetProjectFilePath() + "\" -game dc_cfg=\"" + Settings->RolvConfig.FilePath + "\"" + ((Settings->ROLVLogToProjectDir) ? ("-log ABSLOG=" + FPaths::ProjectDir() + "\\ROLV_Launch.log") : ""); FString Parameters = "\"" + FPaths::GetProjectFilePath() + "\" -game dc_cfg=\"" + Settings->RolvConfig.FilePath + "\"" + ((Settings->ROLVLogToProjectDir) ? ("-log ABSLOG=" + FPaths::ProjectDir() + "\\ROLV_Launch.log") : "");
...@@ -78,7 +78,7 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked() ...@@ -78,7 +78,7 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked()
if (Settings->SwitchProjector && ModeFromBefore != DisplayType_Error) SwitchProjectorToState(Settings->ProjectorIP, Settings->ProjectorPort, ModeFromBefore); if (Settings->SwitchProjector && ModeFromBefore != DisplayType_Error) SwitchProjectorToState(Settings->ProjectorIP, Settings->ProjectorPort, ModeFromBefore);
} }
if (Settings->LaunchType == MiniCAVE) if (Settings->LaunchType == ButtonLaunchType_MiniCAVE)
{ {
FString Config = IPluginManager::Get().FindPlugin("CAVELaunchButton")->GetBaseDir() + "/LaunchConfig/minicave.cfg"; FString Config = IPluginManager::Get().FindPlugin("CAVELaunchButton")->GetBaseDir() + "/LaunchConfig/minicave.cfg";
FString EditorExecutable = "UE4Editor.exe"; FString EditorExecutable = "UE4Editor.exe";
...@@ -101,7 +101,7 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked() ...@@ -101,7 +101,7 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked()
FPlatformProcess::WaitForProc(Processes[Num_Nodes - 1]); //wait for only one of them FPlatformProcess::WaitForProc(Processes[Num_Nodes - 1]); //wait for only one of them
} }
if (Settings->LaunchType == CAVE) if (Settings->LaunchType == ButtonLaunchType_CAVE)
{ {
FProcHandle Instance = FPlatformProcess::CreateProc( FProcHandle Instance = FPlatformProcess::CreateProc(
*Settings->CAVELaunchScriptPath.FilePath, *Settings->CAVELaunchScriptPath.FilePath,
......
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
#include "CoreMinimal.h" #include "CoreMinimal.h"
#include "Sockets.h" #include "Sockets.h"
#include "IPv4Address.h" #include "Interfaces/IPv4/IPv4Address.h"
#include "IPv4Endpoint.h" #include "Interfaces/IPv4/IPv4Endpoint.h"
#include "TcpSocketBuilder.h" #include "Common/TcpSocketBuilder.h"
#include "Logging/LogMacros.h"
#include "SocketHelper.generated.h" #include "SocketHelper.generated.h"
DECLARE_LOG_CATEGORY_CLASS(LogNDisplayLaunchButtonSockerHelper, Log, All); DECLARE_LOG_CATEGORY_CLASS(LogNDisplayLaunchButtonSockerHelper, Log, All);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "CoreMinimal.h" #include "CoreMinimal.h"
#include "Modules/ModuleManager.h" #include "Modules/ModuleManager.h"
#include "NDisplayLaunchButtonSettings.h" #include "NDisplayLaunchButtonSettings.h"
#include "LogMacros.h" #include "Logging/LogMacros.h"
#include "Framework/MultiBox/MultiBoxBuilder.h" #include "Framework/MultiBox/MultiBoxBuilder.h"
class FToolBarBuilder; class FToolBarBuilder;
......
...@@ -17,10 +17,10 @@ enum ProjectorDisplayType ...@@ -17,10 +17,10 @@ enum ProjectorDisplayType
UENUM(BlueprintType) UENUM(BlueprintType)
enum ButtonLaunchType enum ButtonLaunchType
{ {
NONE UMETA(DisplayName = "Nothing"), ButtonLaunchType_NONE UMETA(DisplayName = "Nothing"),
MiniCAVE UMETA(DisplayName = "MiniCAVE"), ButtonLaunchType_MiniCAVE UMETA(DisplayName = "MiniCAVE"),
CAVE UMETA(DisplayName = "CAVE"), ButtonLaunchType_CAVE UMETA(DisplayName = "CAVE"),
ROLV UMETA(DisplayName = "ROLV") ButtonLaunchType_ROLV UMETA(DisplayName = "ROLV")
}; };
UCLASS(config=Engine, defaultconfig, meta=(DisplayName="nDisplay Launch Button")) UCLASS(config=Engine, defaultconfig, meta=(DisplayName="nDisplay Launch Button"))
...@@ -90,26 +90,26 @@ public: ...@@ -90,26 +90,26 @@ public:
//TODO: This Code is not executed for all FFilePath Properties. Check if this works in 4.23 with the EditCondition Parser and remove this method //TODO: This Code is not executed for all FFilePath Properties. Check if this works in 4.23 with the EditCondition Parser and remove this method
PROPERTY_CONDITION_CHECK(MiniCAVELaunchParameters, LaunchType == MiniCAVE) PROPERTY_CONDITION_CHECK(MiniCAVELaunchParameters, LaunchType == ButtonLaunchType_MiniCAVE)
PROPERTY_CONDITION_CHECK(MiniCAVEAdditionalLaunchParametersMaster, LaunchType == MiniCAVE) PROPERTY_CONDITION_CHECK(MiniCAVEAdditionalLaunchParametersMaster, LaunchType == ButtonLaunchType_MiniCAVE)
PROPERTY_CONDITION_CHECK(MiniCAVELogToProjectDir, LaunchType == MiniCAVE) PROPERTY_CONDITION_CHECK(MiniCAVELogToProjectDir, LaunchType == ButtonLaunchType_MiniCAVE)
PROPERTY_CONDITION_CHECK(CAVELaunchScriptPath, LaunchType == CAVE) PROPERTY_CONDITION_CHECK(CAVELaunchScriptPath, LaunchType == ButtonLaunchType_CAVE)
PROPERTY_CONDITION_CHECK(RolvConfig, LaunchType == ROLV) PROPERTY_CONDITION_CHECK(RolvConfig, LaunchType == ButtonLaunchType_ROLV)
PROPERTY_CONDITION_CHECK(ROLVLaunchParameters, LaunchType == ROLV) PROPERTY_CONDITION_CHECK(ROLVLaunchParameters, LaunchType == ButtonLaunchType_ROLV)
PROPERTY_CONDITION_CHECK(ROLVLogToProjectDir, LaunchType == ROLV) PROPERTY_CONDITION_CHECK(ROLVLogToProjectDir, LaunchType == ButtonLaunchType_ROLV)
PROPERTY_CONDITION_CHECK(SwitchProjector, LaunchType == ROLV) PROPERTY_CONDITION_CHECK(SwitchProjector, LaunchType == ButtonLaunchType_ROLV)
PROPERTY_CONDITION_CHECK(ProjectorType, LaunchType == ROLV && SwitchProjector) PROPERTY_CONDITION_CHECK(ProjectorType, LaunchType == ButtonLaunchType_ROLV && SwitchProjector)
PROPERTY_CONDITION_CHECK(ProjectorIP, LaunchType == ROLV && SwitchProjector) PROPERTY_CONDITION_CHECK(ProjectorIP, LaunchType == ButtonLaunchType_ROLV && SwitchProjector)
PROPERTY_CONDITION_CHECK(ProjectorPort, LaunchType == ROLV && SwitchProjector) PROPERTY_CONDITION_CHECK(ProjectorPort, LaunchType == ButtonLaunchType_ROLV && SwitchProjector)
PROPERTY_CONDITION_CHECK(VRPNConfigPath, LaunchType == ROLV && StartVRPN) PROPERTY_CONDITION_CHECK(VRPNConfigPath, LaunchType == ButtonLaunchType_ROLV && StartVRPN)
PROPERTY_CONDITION_CHECK(StartVRPN, LaunchType == ROLV) PROPERTY_CONDITION_CHECK(StartVRPN, LaunchType == ButtonLaunchType_ROLV)
PROPERTY_CONDITION_CHECK(VRPNPath, LaunchType == ROLV && StartVRPN) PROPERTY_CONDITION_CHECK(VRPNPath, LaunchType == ButtonLaunchType_ROLV && StartVRPN)
PROPERTY_CONDITION_CHECK(VRPNConfigPath, LaunchType == ROLV && StartVRPN) PROPERTY_CONDITION_CHECK(VRPNConfigPath, LaunchType == ButtonLaunchType_ROLV && StartVRPN)
PROPERTY_CONDITION_CHECK(StartDTrack, LaunchType == ROLV) PROPERTY_CONDITION_CHECK(StartDTrack, LaunchType == ButtonLaunchType_ROLV)
PROPERTY_CONDITION_CHECK(DTrackIP, LaunchType == ROLV && StartDTrack) PROPERTY_CONDITION_CHECK(DTrackIP, LaunchType == ButtonLaunchType_ROLV && StartDTrack)
PROPERTY_CONDITION_CHECK(DTrackPort, LaunchType == ROLV && StartDTrack) PROPERTY_CONDITION_CHECK(DTrackPort, LaunchType == ButtonLaunchType_ROLV && StartDTrack)
return ParentVal; return ParentVal;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment