diff --git a/AVVR/Assets/Prefabs/Complete XR Origin Set Up Variant AVVR.prefab b/AVVR/Assets/Prefabs/Complete XR Origin Set Up Variant AVVR.prefab index 9ed5d0604576c6900ee9a0def5be90de5bb4e33b..7643856b4cc70241216ece33673af634e589a49b 100644 --- a/AVVR/Assets/Prefabs/Complete XR Origin Set Up Variant AVVR.prefab +++ b/AVVR/Assets/Prefabs/Complete XR Origin Set Up Variant AVVR.prefab @@ -115,9 +115,9 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.3 + near clip plane: 0.01 far clip plane: 1000 - field of view: 60 + field of view: 90 orthographic: 0 orthographic size: 5 m_Depth: 0 @@ -257,23 +257,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3582865935180742671, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3582865935180742671, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3582865935180742671, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 352 objectReference: {fileID: 0} - target: {fileID: 3582865935180742671, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 200 objectReference: {fileID: 0} - target: {fileID: 3582865935180742671, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -111 objectReference: {fileID: 0} - target: {fileID: 4063634363251406371, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: SnapTurnProvider @@ -309,43 +309,43 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4843115453168706472, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4843115453168706472, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4843115453168706472, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 352 objectReference: {fileID: 0} - target: {fileID: 4843115453168706472, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 200 objectReference: {fileID: 0} - target: {fileID: 4843115453168706472, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -245 objectReference: {fileID: 0} - target: {fileID: 5233380041029087467, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5233380041029087467, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5233380041029087467, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 352 objectReference: {fileID: 0} - target: {fileID: 5233380041029087467, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 200 objectReference: {fileID: 0} - target: {fileID: 5233380041029087467, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -178 objectReference: {fileID: 0} - target: {fileID: 5603239251682444825, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchorMax.x @@ -389,23 +389,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7559043828606092874, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7559043828606092874, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7559043828606092874, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 352 objectReference: {fileID: 0} - target: {fileID: 7559043828606092874, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 200 objectReference: {fileID: 0} - target: {fileID: 7559043828606092874, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -312 objectReference: {fileID: 0} - target: {fileID: 8027956442804198582, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_Value @@ -413,23 +413,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9223145543918184230, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9223145543918184230, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9223145543918184230, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 352 objectReference: {fileID: 0} - target: {fileID: 9223145543918184230, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 200 objectReference: {fileID: 0} - target: {fileID: 9223145543918184230, guid: d312efb32cfde1a4592787da1e12f8ec, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -44 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -626,7 +626,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8697337692808881382, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8697337692808881382, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3} propertyPath: m_AnchoredPosition.y @@ -662,7 +662,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8697337693122987695, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8697337693122987695, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3} propertyPath: m_AnchoredPosition.y @@ -682,7 +682,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8697337693683843182, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3} propertyPath: m_AnchoredPosition.x - value: 44.7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8697337693683843182, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3} propertyPath: m_AnchoredPosition.y @@ -710,7 +710,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8697337694165207079, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8697337694165207079, guid: 4d28f6590e91f644e9731292f51c4f2c, type: 3} propertyPath: m_AnchoredPosition.y @@ -1117,7 +1117,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2690795497190510875, guid: aa788f58037d03649911102b0771966e, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2690795497190510875, guid: aa788f58037d03649911102b0771966e, type: 3} propertyPath: m_AnchoredPosition.y @@ -1145,7 +1145,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2690795497469257964, guid: aa788f58037d03649911102b0771966e, type: 3} propertyPath: m_AnchoredPosition.x - value: 44.7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2690795497469257964, guid: aa788f58037d03649911102b0771966e, type: 3} propertyPath: m_AnchoredPosition.y @@ -1165,7 +1165,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2690795497611470181, guid: aa788f58037d03649911102b0771966e, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2690795497611470181, guid: aa788f58037d03649911102b0771966e, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/AVVR/Assets/_Scripts/SpectatorWindow.cs b/AVVR/Assets/_Scripts/SpectatorWindow.cs index da5f3af1054f761badc6cc14582871178a50439d..eb0fbbd8ce94cf65937da6e4dfc715c74e6be08f 100644 --- a/AVVR/Assets/_Scripts/SpectatorWindow.cs +++ b/AVVR/Assets/_Scripts/SpectatorWindow.cs @@ -41,48 +41,40 @@ public class SpectatorWindow : MonoBehaviour spectatorCam.targetTexture = renderTexture; } - private GUIStyle windowStyle; - - private void Start() - { - // Initialize window style - windowStyle = new GUIStyle(GUI.skin.window); - windowStyle.normal.background = MakeWindowBackground(new Color(0.2f, 0.2f, 0.2f, 1f)); - } - - private Texture2D MakeWindowBackground(Color color) - { - Texture2D tex = new Texture2D(1, 1); - tex.SetPixel(0, 0, color); - tex.Apply(); - return tex; - } - private void OnGUI() { if (!showWindow) return; - // Draw the window with custom style - windowRect = enableWindowDrag ? - GUI.Window(0, windowRect, DrawWindowContents, "Spectator View", windowStyle) : - GUI.Window(0, windowRect, DrawWindowContents, "", windowStyle); + // Create a solid background style + var backgroundStyle = new GUIStyle(GUI.skin.window); + var tex = new Texture2D(1, 1); + tex.SetPixel(0, 0, new Color(0.2f, 0.2f, 0.2f, 1f)); + tex.Apply(); + backgroundStyle.normal.background = tex; + + // Draw the window with solid background + GUI.backgroundColor = Color.black; + windowRect = GUI.Window(0, windowRect, DrawWindowContents, "Spectator View", backgroundStyle); } private void DrawWindowContents(int windowID) { + // Draw black background for render texture area + GUI.Box(new Rect(0, 20, windowRect.width, windowRect.height - 20), ""); + // Draw the render texture GUI.DrawTexture(new Rect(0, 20, windowRect.width, windowRect.height - 20), renderTexture); - // Allow window dragging - if (enableWindowDrag) + // Close button + if (GUI.Button(new Rect(windowRect.width - 25, 2, 20, 16), "X")) { - GUI.DragWindow(); + showWindow = false; } - // Add a close button - if (GUI.Button(new Rect(windowRect.width - 25, 2, 20, 16), "X")) + // Window dragging + if (enableWindowDrag) { - showWindow = false; + GUI.DragWindow(); } } @@ -100,7 +92,6 @@ public class SpectatorWindow : MonoBehaviour public void HideWindow() => showWindow = false; public void ToggleWindow() => showWindow = !showWindow; - // Method to change window size public void SetWindowSize(float width, float height) { windowRect.width = width;