Skip to content
Snippets Groups Projects
Commit 24b82b2c authored by Jonathan Ehret's avatar Jonathan Ehret
Browse files

Merge branch 'feature/mini-cave-426' into 'develop'

Feature/mini cave 426

See merge request VR-Group/unreal-development/tools/NDisplayLaunchButton!10
parents 87826714 b13e16c0
No related branches found
No related tags found
1 merge request!10Feature/mini cave 426
[projection] id="proj_screen_floor" type="simple" screen="screen_floor"
[projection] id="proj_screen_front" type="simple" screen="screen_front"
[projection] id="proj_screen_left" type="simple" screen="screen_left"
[projection] id="proj_screen_right" type="simple" screen="screen_right"
[projection] id="proj_screen_back" type="simple" screen="screen_back"
# AUTO_CONVERSION, new entities finish
##################################################################### #####################################################################
# nDisplay config file for aixCAVE # nDisplay config file for mini CAVE
##################################################################### #####################################################################
##################################################################### #####################################################################
...@@ -110,11 +102,48 @@ ...@@ -110,11 +102,48 @@
# height - height of viewport in pixels # height - height of viewport in pixels
#******************************************************************** #********************************************************************
[viewport] id=vp_floor x=0 y=0 width=480 height=480 projection="proj_screen_floor" [viewport] id=vp_floor x=0 y=0 width=480 height=480 projection="proj_screen_floor" camera="camera_dynamic_left"
[viewport] id=vp_front x=0 y=0 width=480 height=300 projection="proj_screen_front" [viewport] id=vp_front x=0 y=0 width=480 height=300 projection="proj_screen_front" camera="camera_dynamic_left"
[viewport] id=vp_left x=0 y=0 width=300 height=480 projection="proj_screen_left" [viewport] id=vp_left x=0 y=0 width=300 height=480 projection="proj_screen_left" camera="camera_dynamic_left"
[viewport] id=vp_right x=0 y=0 width=300 height=480 projection="proj_screen_right" [viewport] id=vp_right x=0 y=0 width=300 height=480 projection="proj_screen_right" camera="camera_dynamic_left"
[viewport] id=vp_back x=0 y=0 width=480 height=300 projection="proj_screen_back" [viewport] id=vp_back x=0 y=0 width=480 height=300 projection="proj_screen_back" camera="camera_dynamic_left"
#####################################################################
# Projection policies
#********************************************************************
# Projection policy is an abstraction which knows where to take an
# projection input data and how to compute the output. This means
# that each policy might have it's own properties that it knows how
# to interpret and utilize. There are several projection policies
# available natively: simple, MPCDI and EasyBlend:
#
# * Simple - This one is the native projection policy that can be fully
# configured from the config file. All you need is to specify
# a projection screen. Those who has been used the nDisplay
# before are familiar with this policy already.
#
# * MPCDI - This policy allows to use an industry standard for multi-
# projector setups. It requires a special .mpcdi file that
# contains all the data required for computations.
#
# * EasyBlend - This policy is an implementation of the EasyBLend SDK
# provided by Scalable Display Technologies. It requires
# a bunch of special files that describe a multi-projector
# system.
#
# Properties:
# id - Unique projection policy name
# type - Projection policy type (custom types can be used)
#********************************************************************
# Here is an example of simple projection policy. It requires to
# specify projection screens only. Refer to specific demo configs
# or documentation page to get more info about other projection policies.
[projection] id="proj_screen_floor" type="simple" screen="screen_floor"
[projection] id="proj_screen_front" type="simple" screen="screen_front"
[projection] id="proj_screen_left" type="simple" screen="screen_left"
[projection] id="proj_screen_right" type="simple" screen="screen_right"
[projection] id="proj_screen_back" type="simple" screen="screen_back"
##################################################################### #####################################################################
# Cameras # Cameras
...@@ -137,7 +166,7 @@ ...@@ -137,7 +166,7 @@
# tracker_ch - ID of tracking device's channel; no tracking by default. # tracker_ch - ID of tracking device's channel; no tracking by default.
#******************************************************************** #********************************************************************
[camera] id=camera_dynamic loc="X=0,Y=0,Z=0" parent=shutter_glasses eye_swap="false" eye_dist="64" force_offset="0" [camera] id="camera_dynamic_left" loc="X=0,Y=0,Z=0" parent="shutter_glasses" force_offset="-1" eye_dist="0.064"
##################################################################### #####################################################################
# Scene nodes (hierarchy transforms) # Scene nodes (hierarchy transforms)
......
...@@ -194,11 +194,11 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked() ...@@ -194,11 +194,11 @@ void FNDisplayLaunchButtonModule::PluginButtonClicked()
const int Num_Nodes = 5; const int Num_Nodes = 5;
FString Windows_Node_Specific_Commands[Num_Nodes] = { FString Windows_Node_Specific_Commands[Num_Nodes] = {
"dc_node=node_floor WinX=720 WinY=300 ResX=480 ResY=480" + FString((Settings->MiniCAVELogMasterWindow) ? " -log" : "") + ((Settings->MiniCAVELogToProjectDirFloor) ? (" ABSLOG=" + GetFilePathInProject("MiniCave_Floor_Master.log")) : "") + " " + Settings->MiniCAVEAdditionalLaunchParametersMaster, "dc_node=node_floor dc_camera=camera_dynamic_left -dc_cluster WinX=720 WinY=300 ResX=480 ResY=480" + FString((Settings->MiniCAVELogMasterWindow) ? " -log" : "") + ((Settings->MiniCAVELogToProjectDirFloor) ? (" ABSLOG=" + GetFilePathInProject("MiniCave_Floor_Master.log")) : "") + " " + Settings->MiniCAVEAdditionalLaunchParametersMaster,
"dc_node=node_front WinX=720 WinY=0 ResX=480 ResY=300" + ((Settings->MiniCAVELogToProjectDirFront) ? (" ABSLOG=" + GetFilePathInProject("MiniCave_Front.log")) : ""), "dc_node=node_front dc_camera=camera_dynamic_left -dc_cluster WinX=720 WinY=0 ResX=480 ResY=300" + ((Settings->MiniCAVELogToProjectDirFront) ? (" ABSLOG=" + GetFilePathInProject("MiniCave_Front.log")) : ""),
"dc_node=node_left WinX=420 WinY=300 ResX=300 ResY=480" + ((Settings->MiniCAVELogToProjectDirLeft) ? (" ABSLOG=" + GetFilePathInProject("MiniCave_Left.log" )) : ""), "dc_node=node_left dc_camera=camera_dynamic_left -dc_cluster WinX=420 WinY=300 ResX=300 ResY=480" + ((Settings->MiniCAVELogToProjectDirLeft) ? (" ABSLOG=" + GetFilePathInProject("MiniCave_Left.log" )) : ""),
"dc_node=node_right WinX=1200 WinY=300 ResX=300 ResY=480" + ((Settings->MiniCAVELogToProjectDirRight) ? (" ABSLOG=" + GetFilePathInProject("MiniCave_Right.log")) : ""), "dc_node=node_right dc_camera=camera_dynamic_left -dc_cluster WinX=1200 WinY=300 ResX=300 ResY=480" + ((Settings->MiniCAVELogToProjectDirRight) ? (" ABSLOG=" + GetFilePathInProject("MiniCave_Right.log")) : ""),
"dc_node=node_back WinX=720 WinY=780 ResX=480 ResY=300" + ((Settings->MiniCAVELogToProjectDirBack) ? (" ABSLOG=" + GetFilePathInProject("MiniCave_Back.log" )) : "") "dc_node=node_back dc_camera=camera_dynamic_left -dc_cluster WinX=720 WinY=780 ResX=480 ResY=300" + ((Settings->MiniCAVELogToProjectDirBack) ? (" ABSLOG=" + GetFilePathInProject("MiniCave_Back.log" )) : "")
}; };
FProcHandle Processes[Num_Nodes]; FProcHandle Processes[Num_Nodes];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment