Skip to content

Commit 33612b4

Browse files
FIX: Downgraded Continuum3D scene/prefabs to Unity 2019 compatible version
UPDATE: Added StandaloneDisplayManager window to CAVE2-Manager
1 parent 1ea0ecd commit 33612b4

9 files changed

+23
-7
lines changed

CAVE2/Prefabs/CAVE2-Manager.prefab

68.7 KB
Binary file not shown.
-144 KB
Binary file not shown.
-168 Bytes
Binary file not shown.
-3.64 KB
Binary file not shown.

Continuum/Prefabs/CAVE2-Manager.prefab.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-190 KB
Binary file not shown.

Continuum/Prefabs/CAVE2-PlayerController.prefab.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-2.93 KB
Binary file not shown.

Continuum/Scripts/StandaloneDisplayManager.cs

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ public class StandaloneDisplayManager : MonoBehaviour
1515
[SerializeField]
1616
InputField newHeightInput;
1717

18-
[SerializeField]
19-
Toggle fullScreenToggle;
20-
2118
[SerializeField]
2219
Text currentWindowPosition;
2320

@@ -58,7 +55,6 @@ void Start()
5855
{
5956
newWidthInput.text = Screen.width.ToString();
6057
newHeightInput.text = Screen.height.ToString();
61-
fullScreenToggle.SetIsOnWithoutNotify(Screen.fullScreen);
6258
}
6359

6460
// Update is called once per frame
@@ -182,11 +178,24 @@ void FixedUpdate()
182178
if(stereoCamera == null)
183179
{
184180
stereoMode.interactable = false;
181+
stereoAutoRes.interactable = false;
182+
stereoInvertToggle.interactable = false;
185183
stereoCamera = Camera.main.GetComponent<StereoscopicCamera>();
186184
}
187185
else
188186
{
189-
stereoMode.interactable = true;
187+
if (stereoCamera.enabled)
188+
{
189+
stereoMode.interactable = true;
190+
stereoAutoRes.interactable = true;
191+
stereoInvertToggle.interactable = true;
192+
}
193+
else
194+
{
195+
stereoMode.interactable = false;
196+
stereoAutoRes.interactable = false;
197+
stereoInvertToggle.interactable = false;
198+
}
190199

191200
if (lastStereoMode != stereoMode.value)
192201
{
@@ -302,6 +311,13 @@ public void SetWindowPosition()
302311

303312
ConfigurationManager.loadedConfig.displayConfig.screenXPos = newX;
304313
ConfigurationManager.loadedConfig.displayConfig.screenYPos = newY;
314+
#else
315+
int newX = 0;
316+
int newY = 0;
317+
318+
int.TryParse(newXPosInput.text, out newX);
319+
int.TryParse(newYPosInput.text, out newY);
320+
CAVE2ClusterManager.SetPosition(newX, newY, Screen.width, Screen.height, windowModeDropdown.value == 2);
305321
#endif
306322
}
307323

0 commit comments

Comments
 (0)