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

More logging options and lookup of loaded VR plugin

parent 2242b4d5
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Source/NDisplayLaunchButton/Private/NDisplayLaunchButton.cpp
+ 14
− 7
View file @ 2bcdff72
......@@ -52,6 +52,13 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked()
return;
}
if(FModuleManager::Get().IsModuleLoaded("SteamVR") || FModuleManager::Get().IsModuleLoaded("OculusHMD"))
{
FText Title = FText::FromString("VR Plugin enabled.");
FMessageDialog::Open(EAppMsgType::Ok, FText::FromString("You have either SteamVR or OculusVR enabled in your project. This prevents NDisplay from working. You can switch them off in the 'Plugin' menu."), &Title);
return;
}
if (!UEditorLoadingAndSavingUtils::SaveDirtyPackagesWithDialog(true, true)) return;
// minimize the root window to provide max performance for the preview.
......@@ -86,11 +93,11 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked()
const int Num_Nodes = 5;
FString Windows_Node_Specific_Commands[Num_Nodes] = {
"dc_node=node_floor WinX=720 WinY=300 ResX=480 ResY=480" + ((Settings->MiniCAVELogToProjectDir) ? (" -log ABSLOG=" + FPaths::ProjectDir() + "\\MiniCave.log") : "") + " " + Settings->MiniCAVEAdditionalLaunchParametersMaster,
"dc_node=node_front WinX=720 WinY=0 ResX=480 ResY=300",
"dc_node=node_left WinX=420 WinY=300 ResX=300 ResY=480",
"dc_node=node_right WinX=1200 WinY=300 ResX=300 ResY=480",
"dc_node=node_back WinX=720 WinY=780 ResX=480 ResY=300"
"dc_node=node_floor WinX=720 WinY=300 ResX=480 ResY=480" + FString((Settings->MiniCAVELogMasterWindow) ? " -log" : "") + ((Settings->MiniCAVELogToProjectDirFloor) ? (" ABSLOG=" + FPaths::ProjectDir() + "\\MiniCave_Floor_Master.log") : "") + " " + Settings->MiniCAVEAdditionalLaunchParametersMaster,
"dc_node=node_front WinX=720 WinY=0 ResX=480 ResY=300" + ((Settings->MiniCAVELogToProjectDirFront) ? (" ABSLOG=" + FPaths::ProjectDir() + "\\MiniCave_Front.log") : ""),
"dc_node=node_left WinX=420 WinY=300 ResX=300 ResY=480" + ((Settings->MiniCAVELogToProjectDirLeft) ? (" ABSLOG=" + FPaths::ProjectDir() + "\\MiniCave_Left.log") : ""),
"dc_node=node_right WinX=1200 WinY=300 ResX=300 ResY=480" + ((Settings->MiniCAVELogToProjectDirRight) ? (" ABSLOG=" + FPaths::ProjectDir() + "\\MiniCave_Right.log") : ""),
"dc_node=node_back WinX=720 WinY=780 ResX=480 ResY=300" + ((Settings->MiniCAVELogToProjectDirBack) ? (" ABSLOG=" + FPaths::ProjectDir() + "\\MiniCave_Back.log") : "")
};
FProcHandle Processes[Num_Nodes];
......@@ -109,8 +116,8 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked()
const int Num_Nodes = 2;
FString Windows_Node_Specific_Commands[Num_Nodes] = {
"dc_node=node_left WinX=200 WinY=200 ResX=480 ResY=480" + ((Settings->TwoScreenLogToProjectDir) ? (" -log ABSLOG=" + FPaths::ProjectDir() + "\\TwoScreenL.log") : "") + " " + Settings->MiniCAVEAdditionalLaunchParametersMaster,
"dc_node=node_right WinX=682 WinY=200 ResX=480 ResY=480 -log ABSLOG=" + FPaths::ProjectDir() + "\\TwoScreenR.log"
"dc_node=node_left WinX=200 WinY=200 ResX=480 ResY=480" + FString((Settings->TwoScreenLogMasterWindow) ? " -log" : "") + ((Settings->TwoScreenLogToProjectDirLeft) ? (" ABSLOG=" + FPaths::ProjectDir() + "\\TwoScreen_Left_Master.log") : "") + " " + Settings->TwoScreenAdditionalLaunchParametersMaster,
"dc_node=node_right WinX=682 WinY=200 ResX=480 ResY=480" + ((Settings->MiniCAVELogToProjectDirFront) ? (" ABSLOG = " + FPaths::ProjectDir() + "\\TwoScreen_Right.log") : "")
};
FProcHandle Processes[Num_Nodes];
......
Source/NDisplayLaunchButton/Public/NDisplayLaunchButtonSettings.h
+ 35
− 13
View file @ 2bcdff72
......@@ -37,11 +37,15 @@ public:
* TwoScreen Options
*/
UPROPERTY(EditAnywhere, config, Category = "General|TwoScreen", meta = (DisplayName = "Launch Parameters"))
FString TwoScreenLaunchParameters = "-dc_cluster -dc_dev_mono -windowed -fixedseed -notexturestreaming -opengl4";
FString TwoScreenLaunchParameters = "-dc_cluster -dc_dev_mono -windowed -fixedseed -notexturestreaming";
UPROPERTY(EditAnywhere, config, Category = "General|TwoScreen", meta = (DisplayName = "Additioanl Launch Parameters for Master"))
FString TwoScreenAdditionalLaunchParametersMaster = "";
UPROPERTY(EditAnywhere, config, Category = "General|TwoScreen", meta = (DisplayName = "Write Log to Project Directory"))
bool TwoScreenLogToProjectDir = true;
UPROPERTY(EditAnywhere, config, Category = "General|TwoScreen|Log", meta = (DisplayName = "Open Log Window for Master Node"))
bool TwoScreenLogMasterWindow = true;
UPROPERTY(EditAnywhere, config, Category = "General|TwoScreen|Log", meta = (DisplayName = "Write Log for Floor-Left to Project Directory"))
bool TwoScreenLogToProjectDirLeft = true;
UPROPERTY(EditAnywhere, config, Category = "General|TwoScreen|Log", meta = (DisplayName = "Write Log for Front-Right to Project Directory"))
bool TwoScreenLogToProjectDirRight = false;
/*
* Mini CAVE Options
......@@ -49,9 +53,20 @@ public:
UPROPERTY(EditAnywhere, config, Category = "General|MiniCAVE", meta = (DisplayName = "Launch Parameters"))
FString MiniCAVELaunchParameters = "-dc_cluster -dc_dev_mono -windowed -fixedseed -notexturestreaming -opengl4";
UPROPERTY(EditAnywhere, config, Category = "General|MiniCAVE", meta = (DisplayName = "Additioanl Launch Parameters for Master"))
FString MiniCAVEAdditionalLaunchParametersMaster = "";
UPROPERTY(EditAnywhere, config, Category = "General|MiniCAVE", meta = (DisplayName = "Write Log to Project Directory"))
bool MiniCAVELogToProjectDir = true;
FString MiniCAVEAdditionalLaunchParametersMaster = "-log";
UPROPERTY(EditAnywhere, config, Category = "General|MiniCAVE|Log", meta = (DisplayName = "Open Log Window for Master Node"))
bool MiniCAVELogMasterWindow = true;
UPROPERTY(EditAnywhere, config, Category = "General|MiniCAVE|Log", meta = (DisplayName = "Write Log for Floor-Node to Project Directory"))
bool MiniCAVELogToProjectDirFloor = true;
UPROPERTY(EditAnywhere, config, Category = "General|MiniCAVE|Log", meta = (DisplayName = "Write Log for Front-Node to Project Directory"))
bool MiniCAVELogToProjectDirFront = false;
UPROPERTY(EditAnywhere, config, Category = "General|MiniCAVE|Log", meta = (DisplayName = "Write Log for Left-Node to Project Directory"))
bool MiniCAVELogToProjectDirLeft = false;
UPROPERTY(EditAnywhere, config, Category = "General|MiniCAVE|Log", meta = (DisplayName = "Write Log for Right-Node to Project Directory"))
bool MiniCAVELogToProjectDirRight = false;
UPROPERTY(EditAnywhere, config, Category = "General|MiniCAVE|Log", meta = (DisplayName = "Write Log for Back-Node to Project Directory"))
bool MiniCAVELogToProjectDirBack = false;
/*
* CAVE Options
......@@ -103,11 +118,18 @@ public:
PROPERTY_CONDITION_CHECK(TwoScreenLaunchParameters, LaunchType == ButtonLaunchType_TWO_SCREEN)
PROPERTY_CONDITION_CHECK(TwoScreenAdditionalLaunchParametersMaster, LaunchType == ButtonLaunchType_TWO_SCREEN)
PROPERTY_CONDITION_CHECK(TwoScreenLogToProjectDir, LaunchType == ButtonLaunchType_TWO_SCREEN)
PROPERTY_CONDITION_CHECK(TwoScreenLogToProjectDirRight, LaunchType == ButtonLaunchType_TWO_SCREEN)
PROPERTY_CONDITION_CHECK(TwoScreenLogToProjectDirLeft, LaunchType == ButtonLaunchType_TWO_SCREEN)
PROPERTY_CONDITION_CHECK(TwoScreenLogMasterWindow, LaunchType == ButtonLaunchType_TWO_SCREEN)
PROPERTY_CONDITION_CHECK(MiniCAVELaunchParameters, LaunchType == ButtonLaunchType_MiniCAVE)
PROPERTY_CONDITION_CHECK(MiniCAVEAdditionalLaunchParametersMaster, LaunchType == ButtonLaunchType_MiniCAVE)
PROPERTY_CONDITION_CHECK(MiniCAVELogToProjectDir, LaunchType == ButtonLaunchType_MiniCAVE)
PROPERTY_CONDITION_CHECK(MiniCAVELogToProjectDirFloor, LaunchType == ButtonLaunchType_MiniCAVE)
PROPERTY_CONDITION_CHECK(MiniCAVELogToProjectDirFront, LaunchType == ButtonLaunchType_MiniCAVE)
PROPERTY_CONDITION_CHECK(MiniCAVELogToProjectDirLeft, LaunchType == ButtonLaunchType_MiniCAVE)
PROPERTY_CONDITION_CHECK(MiniCAVELogToProjectDirRight, LaunchType == ButtonLaunchType_MiniCAVE)
PROPERTY_CONDITION_CHECK(MiniCAVELogToProjectDirBack, LaunchType == ButtonLaunchType_MiniCAVE)
PROPERTY_CONDITION_CHECK(MiniCAVELogMasterWindow, LaunchType == ButtonLaunchType_MiniCAVE)
PROPERTY_CONDITION_CHECK(CAVELaunchScriptPath, LaunchType == ButtonLaunchType_CAVE)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment