From eb8215628bc2dd030c8b34ee71c9c0b6e35db3df Mon Sep 17 00:00:00 2001
From: Malin <malin.ejdbo@gmail.com>
Date: Fri, 17 Dec 2021 10:54:26 +0100
Subject: [PATCH] Add paceship config file

---
 config/single_four_win_projectionplane.xml | 78 -------------------
 config/spaceship.xml                       | 90 ++++++++++++++++++++++
 openspace.cfg                              |  8 +-
 3 files changed, 94 insertions(+), 82 deletions(-)
 delete mode 100644 config/single_four_win_projectionplane.xml
 create mode 100644 config/spaceship.xml

diff --git a/config/single_four_win_projectionplane.xml b/config/single_four_win_projectionplane.xml
deleted file mode 100644
index 42e380b78b..0000000000
--- a/config/single_four_win_projectionplane.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" ?>
-<Cluster masterAddress="127.0.0.1">
-  <Node address="127.0.0.1" port="20401">
-    <!-- Forward (dummy) -->
-    <Window fullScreen="false" border="true" draw3D="false">
-      <Pos x="600" y="100" />
-      <Size  x="1280" y="720" />
-      <Viewport tracked="true">
-        <Pos x="0.0" y="0.0" />
-        <Size x="1.0" y="1.0" />
-        <Projectionplane>
-          <Pos x="-0.3" y="-0.18" z="0.0" /> <!-- lower left -->
-          <Pos x="-0.3" y="0.18" z="0.0" /> <!-- upper left -->
-          <Pos x="0.3" y="0.18" z="0.0" /> <!-- upper right -->
-        </Projectionplane>
-      </Viewport>
-    </Window>
-    <!-- Forward, again, because the first one will just result in a black window... -->
-    <Window fullScreen="false" border="false">
-      <Pos x="600" y="100" />
-      <Size x="1280" y="720" />
-      <Viewport tracked="true">
-        <Pos x="0.0" y="0.0" />
-        <Size x="1.0" y="1.0" />
-        <Projectionplane>
-          <Pos x="-0.3" y="-0.18" z="0.0" /> <!-- lower left -->
-          <Pos x="-0.3" y="0.18" z="0.0" /> <!-- upper left -->
-          <Pos x="0.3" y="0.18" z="0.0" /> <!-- upper right -->
-        </Projectionplane>
-      </Viewport>
-    </Window>
-    <!-- Left -->
-    <Window fullScreen="false" border="false">
-      <Pos x="200" y="100" />
-      <Size x="400" y="720" />
-      <Viewport>
-        <Pos x="0.0" y="0.0" />
-        <Size x="1.0" y="1.0" />
-        <Projectionplane>
-          <Pos x="-0.4" y="-0.18" z="0.1" /> <!-- lower left -->
-          <Pos x="-0.4" y="0.18" z="0.1" /> <!-- upper left -->
-          <Pos x="-0.3" y="0.18" z="0.0" /> <!-- upper right -->
-        </Projectionplane>
-      </Viewport>
-    </Window>
-    <!-- Right -->
-    <Window fullScreen="false" border="false">
-      <Pos x="1880" y="100" />
-      <Size x="400" y="720" />
-      <Viewport>
-        <Pos x="0.0" y="0.0" />
-        <Size x="1.0" y="1.0" />
-        <Projectionplane>
-          <Pos x="0.3" y="-0.18" z="0.0" /> <!-- lower left -->
-          <Pos x="0.3" y="0.18" z="0.0" /> <!-- upper left -->
-          <Pos x="0.4" y="0.18" z="0.1" /> <!-- upper right -->
-        </Projectionplane>
-      </Viewport>
-    </Window>
-    <!-- Bottom TODO-->
-    <Window fullScreen="false" border="false">
-      <Pos x="600" y="820" />
-      <Size x="1280" y="720" />
-      <Viewport>
-        <Pos x="0.0" y="0.0" />
-        <Size x="1.0" y="1.0" />
-        <Projectionplane>
-          <Pos x="-0.3" y="-0.18" z="0.36" /> <!-- lower left -->
-          <Pos x="-0.3" y="-0.18" z="0.0" /> <!-- upper left -->
-          <Pos x="0.3" y="-0.18" z="0.0" /> <!-- upper right -->
-        </Projectionplane>
-      </Viewport>
-    </Window>
-  </Node>
-  <User eyeSeparation="0.065">
-    <Pos x="0.0" y="0.0" z="0.4" />
-  </User>
-</Cluster>
diff --git a/config/spaceship.xml b/config/spaceship.xml
new file mode 100644
index 0000000000..55cc96f2ff
--- /dev/null
+++ b/config/spaceship.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" ?>
+<Cluster masterAddress="127.0.0.1">
+  <Node address="127.0.0.1" port="20401">
+    <!-- Forward (dummy) -->
+    <Window fullScreen="false" border="true" draw3D="false">
+      <Pos x="1440" y="0" />
+      <Size x="3840" y="2160" />
+      <Viewport tracked="true">
+        <Pos x="0.0" y="0.0" />
+        <Size x="1.0" y="1.0" />
+        <Res x="2560" y="1440"/>
+        <Projectionplane>
+          <Pos x="-605" y="-335" z="0.0" /> 
+          <Pos x="-605" y="335" z="0.0" />
+          <Pos x="605" y="335" z="0.0" />
+        </Projectionplane>
+      </Viewport>
+    </Window>
+    <!-- Forward, again, because the first one will just result in a black window... -->
+    <Window fullScreen="false" border="false">
+        <Pos x="1440" y="0" />
+        <Size x="3840" y="2160" />
+        <Res x="2560" y="1440"/>
+        <Viewport tracked="true">
+            <Pos x="0.0" y="0.0" />
+            <Size x="1.0" y="1.0" />
+            <Projectionplane>
+                <Pos x="-605" y="-335" z="0.0" />
+                <!-- lower left -->
+                <Pos x="-605" y="335" z="0.0" />
+                <!-- upper left -->
+                <Pos x="605" y="335" z="0.0" />
+                <!-- upper right -->
+            </Projectionplane>
+        </Viewport>
+    </Window>
+    <!-- Left -->
+    <Window fullScreen="false" border="false">
+      <Pos x="0" y="0" />
+      <Size x="1440" y="2560" />
+      <Res x="1920" y="1080"/>
+      <Viewport>
+        <Pos x="0.0" y="0.0" />
+        <Size x="1.0" y="1.0" />
+        <Projectionplane>
+          <Pos x="-934.7" y="-353" z="454.9" /> <!-- lower left -->
+          <Pos x="-934.7" y="357" z="454.9" /> <!-- upper left -->
+          <Pos x="-777.1" y="357" z="87.2" /> <!-- upper right -->
+        </Projectionplane>
+      </Viewport>
+    </Window>
+    <!-- Right -->
+    <Window fullScreen="false" border="false">
+      <Pos x="5280" y="0" />
+      <Size x="1490" y="2560" />
+      <Res x="1920" y="1080"/>
+      <Viewport>
+        <Pos x="0.0" y="0.0" />
+        <Size x="1.0" y="1.0" />
+        <Projectionplane>
+          <Pos x="777.1" y="-353" z="87.2" /> <!-- lower left -->
+          <Pos x="777.1" y="357" z="87.2" /> <!-- upper left -->
+          <Pos x="934.7" y="357" z="454.9" /> <!-- upper right -->
+        </Projectionplane>
+      </Viewport>
+    </Window>
+    <!-- Bottom TODO-->
+    <Window fullScreen="false" border="false">
+      <Pos x="1440" y="2160" />
+      <Size x="3866" y="2160" />
+      <Res x="2560" y="1440"/>
+      <Viewport>
+        <Pos x="0.0" y="0.0" />
+        <Size x="1.0" y="1.0" />
+        <Projectionplane>
+          <Pos x="-465" y="-917.6" z="584.7" /> <!-- lower left -->
+          <Pos x="-465" y="-728.7" z="90.6" /> <!-- upper left -->
+          <Pos x="465" y="-728.7" z="90.6" /> <!-- upper right -->
+        </Projectionplane>
+      </Viewport>
+    </Window>
+  </Node>
+  <User eyeSeparation="0.065">
+    <Pos x="0.0" y="0.0" z="1030" />
+  </User>
+  <Settings>
+      <Display swapInterval="1" refreshRate="30"/>
+  </Settings>
+</Cluster>
+
diff --git a/openspace.cfg b/openspace.cfg
index b1f2e954d7..990561895e 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -8,7 +8,7 @@
 -- or a dome cluster system
 
 -- A regular 1280x720 window
-SGCTConfig = sgct.config.single{vsync=false}
+-- SGCTConfig = sgct.config.single{vsync=false}
 -- A regular 1920x1080 window
 -- SGCTConfig = sgct.config.single{1920, 1080}
 -- A windowed 1920x1080 fullscreen
@@ -24,7 +24,7 @@ SGCTConfig = sgct.config.single{vsync=false}
 -- https://sgct.github.io/configuration-files.html
 
 -- To use a sgct configuration file set the variable like below
--- SGCTConfig = "${CONFIG}/single_gui.xml"
+SGCTConfig = "${CONFIG}/spaceship.xml"
 -- In the config/ folder we provide the some predefined files which you can modify.
 -- fullscreen1080.xml: fullscreen window at 1920x1080
 -- gui_projector.xml: one window for the gui and a second fullscreen window for rendering
@@ -137,7 +137,7 @@ ModuleConfigurations = {
         }
     },
     Server = {
-        AllowAddresses = { "127.0.0.1", "localhost" },
+        AllowAddresses = { "127.0.0.1", "localhost", "10.50.15.188" },
         Interfaces = {
             {
                 Type = "TcpSocket",
@@ -227,7 +227,7 @@ PrintEvents = false
 
 ShutdownCountdown = 3
 ScreenshotUseDate = true
-BypassLauncher = false
+BypassLauncher = true
 
 -- OnScreenTextScaling = "framebuffer"
 -- PerProfileCache = true