Fixed guard camera UIs such that status text is rendered appropriately for all cameras

.gitignore

@@ -29,3 +29,4 @@
 # Builds
 **/*.apk
 **/*.unitypackage
+**/UnityPackageManager/

Project Undercover/Assets/Materials/UI.mat

@@ -7,7 +7,7 @@ Material:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: UI
-  m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: a0427fb9da4c72a418dc62beaf086294, type: 3}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0

Project Undercover/Assets/Resources/Guard Camera.prefab

@@ -11,6 +11,42 @@ Prefab:
   m_ParentPrefab: {fileID: 0}
   m_RootGameObject: {fileID: 1889434021946074}
   m_IsPrefabParent: 1
+--- !u!1 &1002941015032580
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224424466063770242}
+  - component: {fileID: 223842615197851596}
+  - component: {fileID: 114137535134960880}
+  - component: {fileID: 114957169318180170}
+  m_Layer: 0
+  m_Name: CameraUI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1207964487639616
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224828917623348380}
+  - component: {fileID: 222280648911112164}
+  - component: {fileID: 114108550545748738}
+  - component: {fileID: 114806494459964590}
+  m_Layer: 0
+  m_Name: Panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1374339161963754
 GameObject:
   m_ObjectHideFlags: 0
@@ -28,6 +64,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1706951542144962
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224003334026830312}
+  - component: {fileID: 222660614382546832}
+  - component: {fileID: 114826556738018834}
+  m_Layer: 0
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1889434021946074
 GameObject:
   m_ObjectHideFlags: 0
@@ -38,7 +91,6 @@ GameObject:
   - component: {fileID: 4661043116803332}
   - component: {fileID: 20437103875467350}
   - component: {fileID: 124909405360866564}
-  - component: {fileID: 92524413853108834}
   - component: {fileID: 81070402336043930}
   - component: {fileID: 114214698486704570}
   - component: {fileID: 114503650767683602}
@@ -75,15 +127,16 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1889434021946074}
-  m_LocalRotation: {x: -0.18472917, y: 0.3749558, z: -0.07651737, w: -0.9052229}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 9, y: 3, z: -9}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4695271445839178}
   - {fileID: 4663376666333470}
+  - {fileID: 224424466063770242}
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 33.817, y: -139.944, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: -0, z: 0}
 --- !u!4 &4663376666333470
 Transform:
   m_ObjectHideFlags: 1
@@ -145,7 +198,6 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
-  m_StereoMirrorMode: 0
 --- !u!20 &20960955616270498
 Camera:
   m_ObjectHideFlags: 1
@@ -181,7 +233,6 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
-  m_StereoMirrorMode: 0
 --- !u!23 &23118308228354854
 MeshRenderer:
   m_ObjectHideFlags: 1
@@ -191,6 +242,7 @@ MeshRenderer:
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -206,6 +258,7 @@ MeshRenderer:
   m_PreserveUVs: 1
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
   m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
@@ -240,13 +293,6 @@ AudioListener:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1889434021946074}
   m_Enabled: 0
---- !u!92 &92524413853108834
-Behaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1889434021946074}
-  m_Enabled: 1
 --- !u!108 &108796398514616960
 Light:
   m_ObjectHideFlags: 1
@@ -283,6 +329,54 @@ Light:
   m_UseColorTemperature: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
+--- !u!114 &114108550545748738
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1207964487639616}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: a3c9ba309d7999b489463b2ebe102c8b, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114137535134960880
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002941015032580}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
 --- !u!114 &114214698486704570
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -294,7 +388,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5b4e3fd11940c1048a7e28e5dfc80560, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mCamera: {fileID: 0}
+  cameraStatusText: {fileID: 114826556738018834}
   glowPrePassCamera: {fileID: 1374339161963754}
 --- !u!114 &114503650767683602
 MonoBehaviour:
@@ -348,6 +442,77 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   glowShader: {fileID: 4800000, guid: 39d85d8c36c331e46af6e70a2b4e8d80, type: 3}
   blurShader: {fileID: 4800000, guid: f956270686a9d9e45bea04cd985135cc, type: 3}
+--- !u!114 &114806494459964590
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1207964487639616}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 1
+  m_ChildControlHeight: 1
+--- !u!114 &114826556738018834
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1706951542144962}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: a3c9ba309d7999b489463b2ebe102c8b, type: 2}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Sample Text
+--- !u!114 &114957169318180170
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002941015032580}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!124 &124909405360866564
 Behaviour:
   m_ObjectHideFlags: 1
@@ -355,3 +520,91 @@ Behaviour:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1889434021946074}
   m_Enabled: 1
+--- !u!222 &222280648911112164
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1207964487639616}
+--- !u!222 &222660614382546832
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1706951542144962}
+--- !u!223 &223842615197851596
+Canvas:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002941015032580}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 1
+  m_Camera: {fileID: 20437103875467350}
+  m_PlaneDistance: 2
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &224003334026830312
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1706951542144962}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -513.4081, y: 217.19734, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 224828917623348380}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -513.4081, y: 217.19734}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224424466063770242
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1002941015032580}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 9}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224828917623348380}
+  m_Father: {fileID: 4661043116803332}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224828917623348380
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1207964487639616}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -15.300003, y: -16.099998, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 224003334026830312}
+  m_Father: {fileID: 224424466063770242}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -65.3, y: 33.9}
+  m_SizeDelta: {x: 130, y: 70}
+  m_Pivot: {x: 0.5, y: 0.5}

Project Undercover/Assets/Scripts/Guard/GuardCamera.cs

@@ -1,10 +1,22 @@
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class GuardCamera : Photon.PunBehaviour {
 
-    public Camera mCamera;
+    const string AVAILABLE_TEXT = "(Available)";
+    const string IN_CONTROL_TEXT = "(In-Control)";
+    const string LOCKED_TEXT = "(Locked)";
 
+    Color AVAILABLE_COLOR = Color.black;
+    Color IN_CONTROL_COLOR = Color.black;
+    Color LOCKED_COLOR = Color.red;
+
+    public Text cameraStatusText;
+    
+    public Camera Camera { get { return mCamera; } }
+
+    private Camera mCamera;
     private Light mSpotlight;
     private AudioListener mListener;
 
@@ -39,6 +51,9 @@ public class GuardCamera : Photon.PunBehaviour {
 
         // Initialize empty player queue
         mPlayers = new List<int>();
+
+        // Set the camera status text/color.
+        UpdateCameraText();
     }
 	
 	void Update()
@@ -138,6 +153,32 @@ public class GuardCamera : Photon.PunBehaviour {
         photonView.RPC("UpdateRotation", PhotonTargets.Others, this.xRotation, this.yRotation);
     }
 
+    /**
+    * Set the text in the bottom-right corner, denoting the lock-status of the Camera.
+    */
+    void UpdateCameraText()
+    {
+        // First set the camera name
+        cameraStatusText.text = this.gameObject.name + "\n";
+
+        // Then set the status text
+        if (mPlayers.Count == 0)
+        {
+            cameraStatusText.text += AVAILABLE_TEXT;
+            cameraStatusText.color = AVAILABLE_COLOR;
+        }
+        else if (InControl())
+        {
+            cameraStatusText.text += IN_CONTROL_TEXT;
+            cameraStatusText.color = IN_CONTROL_COLOR;
+        }
+        else
+        {
+            cameraStatusText.text += LOCKED_TEXT;
+            cameraStatusText.color = LOCKED_COLOR;
+        }
+    }
+
     /*
      * Called via RPC to add a player to this camera.
      */
@@ -149,6 +190,9 @@ public class GuardCamera : Photon.PunBehaviour {
 
         // Because there is now a player, make sure the spotlight is on.
         mSpotlight.enabled = true;
+
+        // Update camera text as necessary.
+        UpdateCameraText();
     }
 
     /*
@@ -165,6 +209,9 @@ public class GuardCamera : Photon.PunBehaviour {
         {
             mSpotlight.enabled = false;
         }
+
+        // Update camera text as necessary.
+        UpdateCameraText();
     }
 
     /**

Project Undercover/Assets/Scripts/Guard/GuardController.cs

@@ -4,8 +4,6 @@ using UnityEngine.UI;
 
 public class GuardController : Photon.PunBehaviour {
 
-    public Text cameraStatusText;
-
     const float CAMERA_SENSITIVITY = 120.0f;
 
     private int mCurrentCamera; // -1 means preview mode
@@ -69,24 +67,6 @@ public class GuardController : Photon.PunBehaviour {
         }
     }
 
-    /**
-     * Set the text in the bottom-right corner, denoting if the camera is locked.
-     */
-    void SetCameraText()
-    {
-        // TODO - GuardCamera should be responsible for text.
-        // Each GuardCamera should display its name in colored text.
-        // Red denotes that it is owned by another player, Green denotes free.
-        if (mInControl)
-        {
-            cameraStatusText.text = "In-Control";
-        }
-        else
-        {
-            cameraStatusText.text = "Locked";
-        }
-    }
-
     /**
      * Cycle the player to a specific camera, or just the next one.
      */
@@ -109,7 +89,6 @@ public class GuardController : Photon.PunBehaviour {
 
         // Determine if we are in control.
         mInControl = mCameras[mCurrentCamera].InControl();
-        SetCameraText();
     }
 
     GuardCamera GetCurrentGuardCamera()
@@ -176,13 +155,12 @@ public class GuardController : Photon.PunBehaviour {
         if (newInControl != mInControl)
         {
             mInControl = newInControl;
-            SetCameraText();
         }
 
         if (Input.GetButtonDown("Fire1"))
         {
             RaycastHit hit;
-            Ray ray = GetCurrentGuardCamera().mCamera.ScreenPointToRay(Input.mousePosition);
+            Ray ray = GetCurrentGuardCamera().Camera.ScreenPointToRay(Input.mousePosition);
 
             if (Physics.Raycast(ray, out hit, 100.0f))
             {

Project Undercover/Assets/Scripts/Lobby/GameManager.cs

@@ -9,7 +9,6 @@ public class GameManager : Photon.PunBehaviour {
     public GameObject guardController;
     public GameObject spyPrefab, NPCPrefab, cameraRigPrefab;
     public int numNpcs = 9;
-    public GameObject guardCameraPanel;
     private static GameManager _activeManager = null;
 
     public override void OnLeftRoom()
@@ -53,7 +52,6 @@ public class GameManager : Photon.PunBehaviour {
         if (PersistantPlayerSettings.character == PersistantPlayerSettings.Character.Guard)
         {
             guardController.SetActive(true);
-            guardCameraPanel.SetActive(true);
             //guardPanel.SetActive(true);
         }
         else

Project Undercover/Assets/Shaders/Default_OverlayNoZTest.shader

@@ -0,0 +1,93 @@
+// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'
+
+Shader "UI/Default_OverlayNoZTest"
+ {
+     Properties
+     {
+         [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {}
+         _Color ("Tint", Color) = (1,1,1,1)
+          
+         _StencilComp ("Stencil Comparison", Float) = 8
+         _Stencil ("Stencil ID", Float) = 0
+         _StencilOp ("Stencil Operation", Float) = 0
+         _StencilWriteMask ("Stencil Write Mask", Float) = 255
+         _StencilReadMask ("Stencil Read Mask", Float) = 255
+  
+         _ColorMask ("Color Mask", Float) = 15
+     }
+  
+     SubShader
+     {
+         Tags
+         { 
+             "Queue"="Overlay" 
+             "IgnoreProjector"="True" 
+             "RenderType"="Transparent" 
+             "PreviewType"="Plane"
+             "CanUseSpriteAtlas"="True"
+         }
+          
+         Stencil
+         {
+             Ref [_Stencil]
+             Comp [_StencilComp]
+             Pass [_StencilOp] 
+             ReadMask [_StencilReadMask]
+             WriteMask [_StencilWriteMask]
+         }
+  
+         Cull Off
+         Lighting Off
+         ZWrite Off
+         ZTest Off
+         Blend SrcAlpha OneMinusSrcAlpha
+         ColorMask [_ColorMask]
+  
+         Pass
+         {
+         CGPROGRAM
+             #pragma vertex vert
+             #pragma fragment frag
+             #include "UnityCG.cginc"
+              
+             struct appdata_t
+             {
+                 float4 vertex   : POSITION;
+                 float4 color    : COLOR;
+                 float2 texcoord : TEXCOORD0;
+             };
+  
+             struct v2f
+             {
+                 float4 vertex   : SV_POSITION;
+                 fixed4 color    : COLOR;
+                 half2 texcoord  : TEXCOORD0;
+             };
+              
+             fixed4 _Color;
+             fixed4 _TextureSampleAdd; //Added for font color support
+  
+             v2f vert(appdata_t IN)
+             {
+                 v2f OUT;
+                 OUT.vertex = UnityObjectToClipPos(IN.vertex);
+                 OUT.texcoord = IN.texcoord;
+ #ifdef UNITY_HALF_TEXEL_OFFSET
+                 OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1);
+ #endif
+                 OUT.color = IN.color * _Color;
+                 return OUT;
+             }
+  
+             sampler2D _MainTex;
+  
+             fixed4 frag(v2f IN) : SV_Target
+             {
+             half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color;  //Added for font color support
+             clip (color.a - 0.01);
+             return color;
+             }
+         ENDCG
+         }
+     }
+ }

Project Undercover/Assets/Shaders/Default_OverlayNoZTest.shader.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: a0427fb9da4c72a418dc62beaf086294
+timeCreated: 1511750787
+licenseType: Free
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Project Undercover/ProjectSettings/ProjectSettings.asset

@@ -3,9 +3,10 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 12
+  serializedVersion: 13
   productGUID: 76402d7a02fa81c4db5a1e750e046c1d
   AndroidProfiler: 0
+  AndroidFilterTouchesWhenObscured: 0
   defaultScreenOrientation: 4
   targetDevice: 2
   useOnDemandResources: 0
@@ -38,8 +39,6 @@ PlayerSettings:
     width: 1
     height: 1
   m_SplashScreenLogos: []
-  m_SplashScreenBackgroundLandscape: {fileID: 0}
-  m_SplashScreenBackgroundPortrait: {fileID: 0}
   m_VirtualRealitySplashScreen: {fileID: 0}
   m_HolographicTrackingLossScreen: {fileID: 0}
   defaultScreenWidth: 1024
@@ -49,7 +48,6 @@ PlayerSettings:
   m_StereoRenderingPath: 0
   m_ActiveColorSpace: 0
   m_MTRendering: 1
-  m_MobileMTRendering: 0
   m_StackTraceTypes: 010000000100000001000000010000000100000001000000
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
@@ -64,8 +62,10 @@ PlayerSettings:
   useOSAutorotation: 1
   use32BitDisplayBuffer: 1
   disableDepthAndStencilBuffers: 0
+  androidBlitType: 0
   defaultIsFullScreen: 1
   defaultIsNativeResolution: 1
+  macRetinaSupport: 1
   runInBackground: 0
   captureSingleScreen: 0
   muteOtherAudioSources: 0
@@ -95,6 +95,7 @@ PlayerSettings:
   xboxEnableHeadOrientation: 0
   xboxEnableGuest: 0
   xboxEnablePIXSampling: 0
+  metalFramebufferOnly: 0
   n3dsDisableStereoscopicView: 0
   n3dsEnableSharedListOpt: 1
   n3dsEnableVSync: 0
@@ -103,6 +104,7 @@ PlayerSettings:
   xboxOneMonoLoggingLevel: 0
   xboxOneLoggingLevel: 1
   xboxOneDisableEsram: 0
+  xboxOnePresentImmediateThreshold: 0
   videoMemoryForVertexBuffers: 0
   psp2PowerMode: 0
   psp2AcquireBGM: 1
@@ -134,12 +136,17 @@ PlayerSettings:
     daydream:
       depthFormat: 0
       useSustainedPerformanceMode: 0
+      enableVideoLayer: 0
+      useProtectedVideoMemory: 0
     hololens:
       depthFormat: 1
   protectGraphicsMemory: 0
   useHDRDisplay: 0
+  m_ColorGamuts: 00000000
   targetPixelDensity: 0
   resolutionScalingMode: 0
+  androidSupportedAspectRatio: 1
+  androidMaxAspectRatio: 2.1
   applicationIdentifier: {}
   buildNumber: {}
   AndroidBundleVersionCode: 1
@@ -160,10 +167,10 @@ PlayerSettings:
     serializedVersion: 2
     m_Bits: 238
   iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 
+  iOSTargetOSVersionString: 7.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 
+  tvOSTargetOSVersionString: 9.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
@@ -220,7 +227,9 @@ PlayerSettings:
   AndroidKeyaliasName: 
   AndroidTVCompatibility: 1
   AndroidIsGame: 1
+  AndroidEnableTango: 0
   androidEnableBanner: 1
+  androidUseLowAccuracyLocation: 0
   m_AndroidBanners:
   - width: 320
     height: 180
@@ -231,10 +240,14 @@ PlayerSettings:
   m_BuildTargetBatching: []
   m_BuildTargetGraphicsAPIs: []
   m_BuildTargetVRSettings: []
+  m_BuildTargetEnableVuforiaSettings: []
   openGLRequireES31: 0
   openGLRequireES31AEP: 0
-  webPlayerTemplate: APPLICATION:Default
   m_TemplateCustomTags: {}
+  mobileMTRendering:
+    Android: 1
+    iPhone: 1
+    tvOS: 1
   wiiUTitleID: 0005000011000000
   wiiUGroupID: 00010000
   wiiUCommonSaveSize: 4096

Project Undercover/ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 2017.1.1f1
+m_EditorVersion: 2017.2.0f3