v 1.1.1

Added ability to use preconfigured display

PictureWindow.cs:
- Set to default to TopLeft instruction
- Added check to see if RealWindow is already positioned, and if so to use it's dimensions

PictureWindowCamera.cs:
- Added check to ensure WindowController is set

PictureWindowUI.cs:
- Added Instruction display for "Click the trigger to begin" and associated logic in order to assign WindowController

Author: deprecatedcoder

Assets/SmirkingCat/Scripts/PictureWindow.cs

@@ -69,6 +69,8 @@ private void Awake()
         private IEnumerator Start()
         {
 
+            WindowUI.ShowInstruction(PictureWindowUI.INSTRUCTION.TopLeft);
+
             // Set Cursor to not be visible
             Cursor.visible = false;
 
@@ -112,6 +114,42 @@ private void Update()
 
             if (_targetBox) _targetBox.SetActive(UseTargetBox);
 
+            if (!IsConfigured)
+            {
+
+                if (RealWindow.Display.transform.position != Vector3.zero)
+                {
+
+                    WindowUI.ShowInstruction(PictureWindowUI.INSTRUCTION.Trigger);
+
+                    if (WindowController)
+                    {
+
+                        MeshFilter rend = RealWindow.Display.GetComponent<MeshFilter>();
+
+                        // Set the corners based on the corners of the configured Quad
+                        RealWindow.BottomLeft = RealWindow.Display.transform.TransformPoint(rend.mesh.vertices[0]);
+                        RealWindow.TopRight = RealWindow.Display.transform.TransformPoint(rend.mesh.vertices[1]);
+                        RealWindow.BottomRight = RealWindow.Display.transform.TransformPoint(rend.mesh.vertices[2]);
+                        RealWindow.TopLeft = RealWindow.Display.transform.TransformPoint(rend.mesh.vertices[3]);
+
+                        // Duplicate everything over to the VirtualWindow
+                        VirtualWindow.TopLeft = RealWindow.TopLeft;
+                        VirtualWindow.BottomLeft = RealWindow.BottomLeft;
+                        VirtualWindow.BottomRight = RealWindow.BottomRight;
+                        VirtualWindow.TopRight = RealWindow.TopRight;
+
+                        // Set the config flag
+                        IsConfigured = true;
+
+                        // Turn the instructions off
+                        WindowUI.ShowInstruction(PictureWindowUI.INSTRUCTION.None);
+                    }
+
+                }
+
+            }
+
         }
 
 

Assets/SmirkingCat/Scripts/PictureWindowCamera.cs

@@ -42,7 +42,7 @@ private void LateUpdate()
     {
 
 
-        if (PW && PW.IsConfigured)
+        if (PW && PW.IsConfigured && PW.WindowController)
         {
 
             if (!IsConfigured) ConfigureCamera();

Assets/SmirkingCat/Scripts/PictureWindowUI.cs

@@ -18,7 +18,7 @@ public class PictureWindowUI : MonoBehaviour
 
         private GameObject _instruction, _reset, _subtitle;
 
-        private RectTransform _instructionArrow;
+        private RectTransform _instructionArrow, _instructionNote;
 
         private Text _instructionText, _subtitleText;
 
@@ -36,6 +36,7 @@ public enum INSTRUCTION
             TopLeft,
             BottomLeft,
             BottomRight,
+            Trigger
 
         }
 
@@ -46,9 +47,10 @@ private void Awake()
             // Get all the instruction stuff and default to the first one
             _instruction = transform.Find("Canvas/Instruction").gameObject;
             _instructionArrow = _instruction.transform.Find("Arrow").GetComponentInChildren<RectTransform>();
+            _instructionNote = _instruction.transform.Find("Note").GetComponentInChildren<RectTransform>();
             _instructionText = _instruction.transform.Find("Text").GetComponentInChildren<Text>();
 
-            ShowInstruction(INSTRUCTION.TopLeft);
+            ShowInstruction(INSTRUCTION.None);
 
             // Get the reset meter and related components
             _reset = transform.Find("Canvas/Reset").gameObject;
@@ -104,6 +106,13 @@ public void ShowInstruction(INSTRUCTION instruction)
                     ShowInstruction(new Vector2(-110, 110), new Vector2(1, 0), new Vector2(1, 0), Quaternion.Euler(0, 0, 0), "bottom right");
                     break;
 
+                case INSTRUCTION.Trigger:
+                    _instruction.SetActive(true);
+                    _instructionArrow.gameObject.SetActive(false);
+                    _instructionNote.gameObject.SetActive(false);
+                    _instructionText.text = "Click the trigger to begin";
+                    break;
+
                 case INSTRUCTION.None:
                 default:
                     _instruction.SetActive(false);
@@ -119,6 +128,8 @@ private void ShowInstruction(Vector2 anchor, Vector2 anchorMin, Vector2 anchorMa
         {
 
             _instruction.SetActive(true);
+            _instructionArrow.gameObject.SetActive(true);
+            _instructionNote.gameObject.SetActive(true);
             _instructionArrow.anchoredPosition = anchor;
             _instructionArrow.anchorMin = anchorMin;
             _instructionArrow.anchorMax = anchorMax;