Swapped order of rendering/gui windows for config files, allowing gui resize (#2087)

82214224 · Micah Acinapura · GitHub · 9f463ed0 · 82214224 · 82214224
Unverified Commit 82214224 authored 3 years ago by Micah Acinapura Committed by GitHub 3 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 63 additions and 63 deletions
+63 -63
--- a/config/gui_projector.json
+++ b/config/gui_projector.json
@@ -12,6 +12,22 @@
      "address": "localhost",
      "port": 20401,
      "windows": [
+        {
+          "fullscreen": false,
+          "border": false,
+          "name": "GUI",
+          "tags": [ "GUI" ],
+          "draw3d": false,
+          "stereo": "none",
+          "pos": { "x": 0, "y": 0 },
+          "size": { "x": 1920, "y": 1080 },
+          "viewports": [
+            {
+              "pos": { "x": 0.0, "y": 0.0 },
+              "size": { "x": 1.0, "y": 1.0 }
+            }
+          ]
+        },
        {
          "fullscreen": true,
          "monitor": 1,
@@ -35,22 +51,6 @@
              }
            }
          ]
-        },
-        {
-          "fullscreen": false,
-          "border": false,
-          "name": "GUI",
-          "tags": [ "GUI" ],
-          "draw3d": false,
-          "stereo": "none",
-          "pos": { "x": 0, "y": 0 },
-          "size": { "x": 1920, "y": 1080 },
-          "viewports": [
-            {
-              "pos": { "x": 0.0, "y": 0.0 },
-              "size": { "x": 1.0, "y": 1.0 }
-            }
-          ]
        }
      ]
    }

--- a/config/single_fisheye_gui.json
+++ b/config/single_fisheye_gui.json
@@ -7,44 +7,44 @@
      "port": 20401,
      "windows": [
        {
-          "name": "OpenSpace",
+          "name": "GUI",
+          "tags": [ "GUI" ],
          "fullscreen": false,
-          "draw2d": false,
+          "draw3d": false,
          "stereo": "none",
+          "pos": { "x": 50, "y": 50 },
          "size": { "x": 1024, "y": 1024 },
          "viewports": [
            {
              "pos": { "x": 0.0, "y": 0.0 },
              "size": { "x": 1.0, "y": 1.0 },
              "projection": {
-                "type": "FisheyeProjection",
-                "fov": 180.0,
-                "quality": "1k",
-                "tilt": 27.0,
-                "background": { "r": 0.1, "g": 0.1, "b": 0.1, "a": 1.0 }
+                "type": "PlanarProjection",
+                "fov": {
+                  "hfov": 80.0,
+                  "vfov": 50.534015846724
+                },
+                "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 }
              }
            }
          ]
        },
        {
-          "name": "GUI",
-          "tags": [ "GUI" ],
+          "name": "OpenSpace",
          "fullscreen": false,
-          "draw3d": false,
+          "draw2d": false,
          "stereo": "none",
-          "pos": { "x": 50, "y": 50 },
          "size": { "x": 1024, "y": 1024 },
          "viewports": [
            {
              "pos": { "x": 0.0, "y": 0.0 },
              "size": { "x": 1.0, "y": 1.0 },
              "projection": {
-                "type": "PlanarProjection",
-                "fov": {
-                  "hfov": 80.0,
-                  "vfov": 50.534015846724
-                },
-                "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 }
+                "type": "FisheyeProjection",
+                "fov": 180.0,
+                "quality": "1k",
+                "tilt": 27.0,
+                "background": { "r": 0.1, "g": 0.1, "b": 0.1, "a": 1.0 }
              }
            }
          ]

--- a/config/single_gui.json
+++ b/config/single_gui.json
@@ -13,15 +13,15 @@
      "port": 20401,
      "windows": [
        {
-          "name": "OpenSpace",
+          "name": "GUI",
+          "tags": [ "GUI" ],
          "fullscreen": false,
-          "draw2d": false,
+          "draw3d": false,
          "stereo": "none",
          "pos": { "x": 50, "y": 50 },
          "size": { "x": 1280, "y": 720 },
          "viewports": [
            {
-              "tracked": true,
              "pos": { "x": 0.0, "y": 0.0 },
              "size": { "x": 1.0, "y": 1.0 },
              "projection": {
@@ -36,15 +36,15 @@
          ]
        },
        {
-          "name": "GUI",
-          "tags": [ "GUI" ],
+          "name": "OpenSpace",
          "fullscreen": false,
-          "draw3d": false,
+          "draw2d": false,
          "stereo": "none",
          "pos": { "x": 50, "y": 50 },
          "size": { "x": 1280, "y": 720 },
          "viewports": [
            {
+              "tracked": true,
              "pos": { "x": 0.0, "y": 0.0 },
              "size": { "x": 1.0, "y": 1.0 },
              "projection": {

--- a/config/single_gui_spout.json
+++ b/config/single_gui_spout.json
@@ -13,16 +13,15 @@
      "port": 20401,
      "windows": [
        {
-          "name": "OpenSpace",
+          "name": "GUI",
          "pos": { "x": 50, "y": 50 },
          "size": { "x": 1280, "y": 720 },
          "stereo": "none",
-          "tags": [ "Spout" ],
+          "tags": [ "GUI" ],
          "viewports": [
            {
              "pos": { "x": 0.0, "y": 0.0 },
              "size": { "x": 1.0, "y": 1.0 },
-              "tracked": true,
              "projection": {
                "type": "PlanarProjection",
                "fov": {
@@ -35,15 +34,16 @@
          ]
        },
        {
-          "name": "GUI",
+          "name": "OpenSpace",
          "pos": { "x": 50, "y": 50 },
          "size": { "x": 1280, "y": 720 },
          "stereo": "none",
-          "tags": [ "GUI" ],
+          "tags": [ "Spout" ],
          "viewports": [
            {
              "pos": { "x": 0.0, "y": 0.0 },
              "size": { "x": 1.0, "y": 1.0 },
+              "tracked": true,
              "projection": {
                "type": "PlanarProjection",
                "fov": {

--- a/config/spherical_mirror_gui.json
+++ b/config/spherical_mirror_gui.json
@@ -8,47 +8,47 @@
      "windows": [
        {
          "fullscreen": false,
-          "name": "Spherical Projection",
+          "name": "GUI",
+          "tags": [ "GUI" ],
+          "draw3d": false,
          "stereo": "none",
-          "draw2d": false,
-          "pos": { "x": 0, "y": 100 },
+          "pos": { "x": 50, "y": 50 },
          "size": { "x": 1280, "y": 720 },
          "res": { "x": 2048, "y": 2048 },
          "viewports": [
            {
-              "mesh": "mesh/standard_16x9.data",
              "pos": { "x": 0.0, "y": 0.0 },
              "size": { "x": 1.0, "y": 1.0 },
              "projection": {
-                "type": "FisheyeProjection",
-                "fov": 180.0,
-                "quality": "2k",
-                "tilt": 30.0,
-                "background": { "r": 0.1, "g": 0.1, "b": 0.1, "a": 1.0 }
+                "type": "PlanarProjection",
+                "fov": {
+                  "hfov": 80.0,
+                  "vfov": 50.534015846724
+                },
+                "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 }
              }
            }
          ]
        },
        {
          "fullscreen": false,
-          "name": "GUI",
-          "tags": [ "GUI" ],
-          "draw3d": false,
+          "name": "Spherical Projection",
          "stereo": "none",
-          "pos": { "x": 50, "y": 50 },
+          "draw2d": false,
+          "pos": { "x": 0, "y": 100 },
          "size": { "x": 1280, "y": 720 },
          "res": { "x": 2048, "y": 2048 },
          "viewports": [
            {
+              "mesh": "mesh/standard_16x9.data",
              "pos": { "x": 0.0, "y": 0.0 },
              "size": { "x": 1.0, "y": 1.0 },
              "projection": {
-                "type": "PlanarProjection",
-                "fov": {
-                  "hfov": 80.0,
-                  "vfov": 50.534015846724
-                },
-                "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 }
+                "type": "FisheyeProjection",
+                "fov": 180.0,
+                "quality": "2k",
+                "tilt": 30.0,
+                "background": { "r": 0.1, "g": 0.1, "b": 0.1, "a": 1.0 }
              }
            }
          ]