diff --git a/LaunchConfig/tileddisplayvideo.cfg b/LaunchConfig/tdw.cfg similarity index 99% rename from LaunchConfig/tileddisplayvideo.cfg rename to LaunchConfig/tdw.cfg index 0e161fbb2a4df58fc3e221f73b82bfac77b04fbe..fac07f503cc0840176afaff7e019eb8a53a06e53 100644 --- a/LaunchConfig/tileddisplayvideo.cfg +++ b/LaunchConfig/tdw.cfg @@ -285,4 +285,4 @@ #******************************************************************** # Any custom arguments available in runtime can be specified here. # Format: ARG_NAME=ARG_VAL -[custom] Hardware_Platform=TiledDisplayVideo +[custom] Hardware_Platform=TDW diff --git a/Source/NDisplayLaunchButton/Private/NDisplayLaunchButton.cpp b/Source/NDisplayLaunchButton/Private/NDisplayLaunchButton.cpp index 7e98a289f9ba33bce295755a33be98abf197f831..9e40e2f3ed85d22ecba584a30d3025577cf8646c 100644 --- a/Source/NDisplayLaunchButton/Private/NDisplayLaunchButton.cpp +++ b/Source/NDisplayLaunchButton/Private/NDisplayLaunchButton.cpp @@ -128,20 +128,20 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked() FPlatformProcess::WaitForProc(Processes[0]); //wait for only one of them } //Tiled Display Wall - if (Settings->LaunchType == ButtonLaunchType_Tiled_Display_Video) + if (Settings->LaunchType == ButtonLaunchType_TiledDisplayWall) { - FString ConfigTDW = IPluginManager::Get().FindPlugin("NDisplayLaunchButton")->GetBaseDir() + "/LaunchConfig/tileddisplayvideo.cfg"; + FString ConfigTDW = IPluginManager::Get().FindPlugin("NDisplayLaunchButton")->GetBaseDir() + "/LaunchConfig/tdw.cfg"; FString EditorExecutableTDW = "UE4Editor.exe"; - FString ParametersTDW = "\"" + FPaths::GetProjectFilePath() + "\" -game dc_cfg=\"" + ConfigTDW + "\" " + Settings->TiledDisplayVideoLaunchParameters; + FString ParametersTDW = "\"" + FPaths::GetProjectFilePath() + "\" -game dc_cfg=\"" + ConfigTDW + "\" " + Settings->TiledDisplayWallLaunchParameters; const int Num_NodesTDW = 6; FString Windows_Node_Specific_CommandsTDW[Num_NodesTDW] = { - "dc_node=node_tl WinX=200 WinY=200 ResX=480 ResY=272" + FString((Settings->TiledDisplayVideoLogMasterWindow) ? " -log" : "") + ((Settings->TiledDisplayVideoLogToProjectDirTL) ? (" ABSLOG=" + FPaths::ProjectDir() + "\\TiledDisplayVideo_TL_Master.log") : "") + " " + Settings->TiledDisplayVideoAdditionalLaunchParametersMaster, - "dc_node=node_tm WinX=693 WinY=200 ResX=480 ResY=272" + ((Settings->TiledDisplayVideoLogToProjectDirTM) ? (" ABSLOG = " + FPaths::ProjectDir() + "\\TiledDisplayVideo_TM.log") : ""), - "dc_node=node_tr WinX=1186 WinY=200 ResX=480 ResY=272" + ((Settings->TiledDisplayVideoLogToProjectDirTR) ? (" ABSLOG = " + FPaths::ProjectDir() + "\\TiledDisplayVideo_TR.log") : ""), - "dc_node=node_bl WinX=200 WinY=483 ResX=480 ResY=272" + ((Settings->TiledDisplayVideoLogToProjectDirBL) ? (" ABSLOG = " + FPaths::ProjectDir() + "\\TiledDisplayVideo_BL.log") : ""), - "dc_node=node_bm WinX=693 WinY=483 ResX=480 ResY=272" + ((Settings->TiledDisplayVideoLogToProjectDirBM) ? (" ABSLOG = " + FPaths::ProjectDir() + "\\TiledDisplayVideo_BM.log") : ""), - "dc_node=node_br WinX=1186 WinY=483 ResX=480 ResY=272" + ((Settings->TiledDisplayVideoLogToProjectDirBR) ? (" ABSLOG = " + FPaths::ProjectDir() + "\\TiledDisplayVideo_BR.log") : "") + "dc_node=node_tl WinX=200 WinY=200 ResX=480 ResY=272" + FString((Settings->TiledDisplayWallLogMasterWindow) ? " -log" : "") + ((Settings->TiledDisplayWallLogToProjectDirTL) ? (" ABSLOG=" + FPaths::ProjectDir() + "\\TiledDisplayWall_TL_Master.log") : "") + " " + Settings->TiledDisplayWallAdditionalLaunchParametersMaster, + "dc_node=node_tm WinX=693 WinY=200 ResX=480 ResY=272" + ((Settings->TiledDisplayWallLogToProjectDirTM) ? (" ABSLOG = " + FPaths::ProjectDir() + "\\TiledDisplayWall_TM.log") : ""), + "dc_node=node_tr WinX=1186 WinY=200 ResX=480 ResY=272" + ((Settings->TiledDisplayWallLogToProjectDirTR) ? (" ABSLOG = " + FPaths::ProjectDir() + "\\TiledDisplayWall_TR.log") : ""), + "dc_node=node_bl WinX=200 WinY=483 ResX=480 ResY=272" + ((Settings->TiledDisplayWallLogToProjectDirBL) ? (" ABSLOG = " + FPaths::ProjectDir() + "\\TiledDisplayWall_BL.log") : ""), + "dc_node=node_bm WinX=693 WinY=483 ResX=480 ResY=272" + ((Settings->TiledDisplayWallLogToProjectDirBM) ? (" ABSLOG = " + FPaths::ProjectDir() + "\\TiledDisplayWall_BM.log") : ""), + "dc_node=node_br WinX=1186 WinY=483 ResX=480 ResY=272" + ((Settings->TiledDisplayWallLogToProjectDirBR) ? (" ABSLOG = " + FPaths::ProjectDir() + "\\TiledDisplayWall_BR.log") : "") }; FProcHandle Processes[Num_NodesTDW]; diff --git a/Source/NDisplayLaunchButton/Public/NDisplayLaunchButtonSettings.h b/Source/NDisplayLaunchButton/Public/NDisplayLaunchButtonSettings.h index 6e6122ed13b0b4d408480907c6e867d3d4e84036..71263953ce5e50e14c9288ef1ffef08eaff9a0fe 100644 --- a/Source/NDisplayLaunchButton/Public/NDisplayLaunchButtonSettings.h +++ b/Source/NDisplayLaunchButton/Public/NDisplayLaunchButtonSettings.h @@ -22,7 +22,7 @@ enum ButtonLaunchType ButtonLaunchType_TWO_SCREEN UMETA(DisplayName = "Two Screen"), ButtonLaunchType_CAVE UMETA(DisplayName = "CAVE"), ButtonLaunchType_ROLV UMETA(DisplayName = "ROLV"), - ButtonLaunchType_Tiled_Display_Video UMETA(DisplayName = "TDW") + ButtonLaunchType_TiledDisplayWall UMETA(DisplayName = "TDW") }; UCLASS(config=Engine, defaultconfig, meta=(DisplayName="nDisplay Launch Button")) @@ -51,24 +51,24 @@ public: /* * TiledDisplayVideo Options */ - UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayVideo", meta = (DisplayName = "Launch Parameters")) - FString TiledDisplayVideoLaunchParameters = "-dc_cluster -dc_dev_mono -windowed -fixedseed -notexturestreaming"; - UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayVideo", meta = (DisplayName = "Additioanl Launch Parameters for Master")) - FString TiledDisplayVideoAdditionalLaunchParametersMaster = ""; - UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayVideo|Log", meta = (DisplayName = "Open Log Window for Master Node")) - bool TiledDisplayVideoLogMasterWindow = true; - UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayVideo|Log", meta = (DisplayName = "Write Log for TL-Node to Project Directory")) - bool TiledDisplayVideoLogToProjectDirTL = true; - UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayVideo|Log", meta = (DisplayName = "Write Log for TM-Node to Project Directory")) - bool TiledDisplayVideoLogToProjectDirTM = false; - UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayVideo|Log", meta = (DisplayName = "Write Log for TR-Node to Project Directory")) - bool TiledDisplayVideoLogToProjectDirTR = false; - UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayVideo|Log", meta = (DisplayName = "Write Log for BL-Node to Project Directory")) - bool TiledDisplayVideoLogToProjectDirBL = false; - UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayVideo|Log", meta = (DisplayName = "Write Log for BM-Node to Project Directory")) - bool TiledDisplayVideoLogToProjectDirBM = false; - UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayVideo|Log", meta = (DisplayName = "Write Log for BR-Node to Project Directory")) - bool TiledDisplayVideoLogToProjectDirBR = false; + UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayWall", meta = (DisplayName = "Launch Parameters")) + FString TiledDisplayWallLaunchParameters = "-dc_cluster -dc_dev_mono -windowed -fixedseed -notexturestreaming"; + UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayWall", meta = (DisplayName = "Additioanl Launch Parameters for Master")) + FString TiledDisplayWallAdditionalLaunchParametersMaster = ""; + UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayWall|Log", meta = (DisplayName = "Open Log Window for Master Node")) + bool TiledDisplayWallLogMasterWindow = true; + UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayWall|Log", meta = (DisplayName = "Write Log for TL-Node to Project Directory")) + bool TiledDisplayWallLogToProjectDirTL = true; + UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayWall|Log", meta = (DisplayName = "Write Log for TM-Node to Project Directory")) + bool TiledDisplayWallLogToProjectDirTM = false; + UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayWall|Log", meta = (DisplayName = "Write Log for TR-Node to Project Directory")) + bool TiledDisplayWallLogToProjectDirTR = false; + UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayWall|Log", meta = (DisplayName = "Write Log for BL-Node to Project Directory")) + bool TiledDisplayWallLogToProjectDirBL = false; + UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayWall|Log", meta = (DisplayName = "Write Log for BM-Node to Project Directory")) + bool TiledDisplayWallLogToProjectDirBM = false; + UPROPERTY(EditAnywhere, config, Category = "General|TiledDisplayWall|Log", meta = (DisplayName = "Write Log for BR-Node to Project Directory")) + bool TiledDisplayWallLogToProjectDirBR = false; /* * Mini CAVE Options @@ -145,15 +145,15 @@ public: PROPERTY_CONDITION_CHECK(TwoScreenLogToProjectDirLeft, LaunchType == ButtonLaunchType_TWO_SCREEN) PROPERTY_CONDITION_CHECK(TwoScreenLogMasterWindow, LaunchType == ButtonLaunchType_TWO_SCREEN) - PROPERTY_CONDITION_CHECK(TiledDisplayVideoLaunchParameters, LaunchType == ButtonLaunchType_Tiled_Display_Video) - PROPERTY_CONDITION_CHECK(TiledDisplayVideoAdditionalLaunchParametersMaster, LaunchType == ButtonLaunchType_Tiled_Display_Video) - PROPERTY_CONDITION_CHECK(TiledDisplayVideoLogToProjectDirTL, LaunchType == ButtonLaunchType_Tiled_Display_Video) - PROPERTY_CONDITION_CHECK(TiledDisplayVideoLogToProjectDirTM, LaunchType == ButtonLaunchType_Tiled_Display_Video) - PROPERTY_CONDITION_CHECK(TiledDisplayVideoLogToProjectDirTR, LaunchType == ButtonLaunchType_Tiled_Display_Video) - PROPERTY_CONDITION_CHECK(TiledDisplayVideoLogToProjectDirBL, LaunchType == ButtonLaunchType_Tiled_Display_Video) - PROPERTY_CONDITION_CHECK(TiledDisplayVideoLogToProjectDirBM, LaunchType == ButtonLaunchType_Tiled_Display_Video) - PROPERTY_CONDITION_CHECK(TiledDisplayVideoLogToProjectDirBR, LaunchType == ButtonLaunchType_Tiled_Display_Video) - PROPERTY_CONDITION_CHECK(TiledDisplayVideoLogMasterWindow, LaunchType == ButtonLaunchType_Tiled_Display_Video) + PROPERTY_CONDITION_CHECK(TiledDisplayWallLaunchParameters, LaunchType == ButtonLaunchType_TiledDisplayWall) + PROPERTY_CONDITION_CHECK(TiledDisplayWallAdditionalLaunchParametersMaster, LaunchType == ButtonLaunchType_TiledDisplayWall) + PROPERTY_CONDITION_CHECK(TiledDisplayWallLogToProjectDirTL, LaunchType == ButtonLaunchType_TiledDisplayWall) + PROPERTY_CONDITION_CHECK(TiledDisplayWallLogToProjectDirTM, LaunchType == ButtonLaunchType_TiledDisplayWall) + PROPERTY_CONDITION_CHECK(TiledDisplayWallLogToProjectDirTR, LaunchType == ButtonLaunchType_TiledDisplayWall) + PROPERTY_CONDITION_CHECK(TiledDisplayWallLogToProjectDirBL, LaunchType == ButtonLaunchType_TiledDisplayWall) + PROPERTY_CONDITION_CHECK(TiledDisplayWallLogToProjectDirBM, LaunchType == ButtonLaunchType_TiledDisplayWall) + PROPERTY_CONDITION_CHECK(TiledDisplayWallLogToProjectDirBR, LaunchType == ButtonLaunchType_TiledDisplayWall) + PROPERTY_CONDITION_CHECK(TiledDisplayWallLogMasterWindow, LaunchType == ButtonLaunchType_TiledDisplayWall) PROPERTY_CONDITION_CHECK(MiniCAVELaunchParameters, LaunchType == ButtonLaunchType_MiniCAVE) PROPERTY_CONDITION_CHECK(MiniCAVEAdditionalLaunchParametersMaster, LaunchType == ButtonLaunchType_MiniCAVE)