CHANGE: Removed UnityTransport package for non-CAVE2 uses

NEW: Added default config files for new ConfigurationManager system
uic-evl · May 25, 2023 · 07292a4 · 07292a4
1 parent 3753d25
commit 07292a4
Show file tree

Hide file tree

Showing 12 changed files with 117 additions and 4 deletions.
diff --git a/Assets/Configs.meta b/Assets/Configs.meta
diff --git a/Assets/Configs/continuum3D.cfg b/Assets/Configs/continuum3D.cfg
@@ -0,0 +1,44 @@
+{
+    "showDebugMenu": true,
+    "displayConfig": {
+        "screenWidth": 7680,
+        "screenHeight": 4320,
+        "fullscreen": false,
+        "windowMode": "Borderless Window",
+        "screenXPos": 0,
+        "screenYPos": 0,
+        "useGeneralizedPerspectiveProjection": true,
+        "screenUL": {
+            "x": -2.051,
+            "y": 2.627,
+            "z": 6.043
+        },
+        "screenLL": {
+            "x": -2.051,
+            "y": 0.309,
+            "z": 6.043
+        },
+        "screenLR": {
+            "x": 2.051,
+            "y": 0.309,
+            "z": 6.043
+        }
+    },
+    "stereoscopicConfig": {
+        "stereoMode": "Interleaved",
+        "stereoResolutionX": 1366,
+        "stereoResolutionY": 768,
+        "autoStereoResolution": true,
+        "invertStereo": true
+    },
+    "trackerConfig": {
+        "trackerType": "omicron",
+        "connectToServer": true,
+        "serverIP": "thor.evl.uic.edu",
+        "serverMsgPort": 28000,
+        "dataPort": 7015,
+        "continuum3DCoordinateConversion": true,
+        "continuumMainCoordinateConversion": false,
+        "trackingSimulatorMode": false
+    }
+}
diff --git a/Assets/Configs/default.cfg b/Assets/Configs/default.cfg
@@ -0,0 +1,44 @@
+{
+    "showDebugMenu": false,
+    "displayConfig": {
+        "screenWidth": 1024,
+        "screenHeight": 768,
+        "fullscreen": true,
+        "windowMode": "Windowed",
+        "screenXPos": -1,
+        "screenYPos": -1,
+        "useGeneralizedPerspectiveProjection": true,
+        "screenUL": {
+            "x": -2.051,
+            "y": 2.627,
+            "z": 6.043
+        },
+        "screenLL": {
+            "x": -2.051,
+            "y": 0.309,
+            "z": 6.043
+        },
+        "screenLR": {
+            "x": 2.051,
+            "y": 0.309,
+            "z": 6.043
+        }
+    },
+    "stereoscopicConfig": {
+        "stereoMode": "None",
+        "stereoResolutionX": 1366,
+        "stereoResolutionY": 768,
+        "autoStereoResolution": true,
+        "invertStereo": false
+    },
+    "trackerConfig": {
+        "trackerType": "omicron",
+        "connectToServer": true,
+        "serverIP": "thor.evl.uic.edu",
+        "serverMsgPort": 28000,
+        "dataPort": 7013,
+        "continuum3DCoordinateConversion": false,
+        "continuumMainCoordinateConversion": false,
+        "trackingSimulatorMode": false
+    }
+}
diff --git a/Assets/Configs/default.cfg.meta b/Assets/Configs/default.cfg.meta
diff --git a/Assets/config.cfg b/Assets/config.cfg
@@ -0,0 +1 @@
+default.cfg
diff --git a/Assets/config.cfg.meta b/Assets/config.cfg.meta
diff --git a/Assets/module-omicron b/Assets/module-omicron
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -14,7 +14,6 @@
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.7.4",
-    "com.unity.transport": "1.3.4",
     "com.unity.ugui": "1.0.0",
     "com.unity.xr.legacyinputhelpers": "2.1.10",
     "com.unity.modules.ai": "1.0.0",

diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.2.18f1
-m_EditorVersionWithRevision: 2022.2.18f1 (5ebc6493a86f)
+m_EditorVersion: 2022.2.20f1
+m_EditorVersionWithRevision: 2022.2.20f1 (c5d806317f84)
diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
@@ -14,6 +14,9 @@ EditorUserSettings:
     RecentlyUsedSceneGuid-2:
       value: 53010d5f000c0a0f0f57097a13220744144e19727a7d77667d7c4562e3b2376f
       flags: 0
+    RecentlyUsedSceneGuid-3:
+      value: 010905555154590b085f0a7348260d44134e1e7c7f7922322c794930e0b56560
+      flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0
+9 −0		CAVE2/Examples/Generalized Perspective Projection/Scripts/StereoscopicCamera.cs
+ −		CAVE2/Prefabs/CAVE2 Standard Menu/Main Menu.prefab
+ −		CAVE2/Prefabs/CAVE2-Manager.prefab
+ −		CAVE2/Scenes/Cube World Example.unity
+51 −3		CAVE2/Scripts/Managers/CAVE2ClusterManager.cs
+193 −60		CAVE2/Scripts/Managers/CAVE2RPCManager.cs
+5 −0		CAVE2/Scripts/UI/HeadNodeDebugManager.cs
+8 −0		Continuum.meta
+8 −0		Continuum/Prefabs.meta
+ −		Continuum/Prefabs/Continuum-PlayerController Variant.prefab
+7 −0		Continuum/Prefabs/Continuum-PlayerController Variant.prefab.meta
+8 −0		Continuum/Scenes.meta
+ −		Continuum/Scenes/Cube World Example (Continuum3D).unity
+7 −0		Continuum/Scenes/Cube World Example (Continuum3D).unity.meta
+8 −0		Continuum/Scripts.meta
+124 −0		Continuum/Scripts/ConfigurationManager.cs
+11 −0		Continuum/Scripts/ConfigurationManager.cs.meta
+353 −0		Continuum/Scripts/StandaloneDisplayManager.cs
+11 −0		Continuum/Scripts/StandaloneDisplayManager.cs.meta
+49 −62		Scripts/Util/OmicronManager.cs