From ad5dd56de312dbad2e62d0aa55f9878f1f312fac Mon Sep 17 00:00:00 2001
From: Jenny Crowe <jakobwcrowe@berkeley.edu>
Date: Mon, 7 Mar 2022 17:21:27 -0700
Subject: [PATCH] Flash now relegated to its own layer

---
 Assets/Resources/Prefabs/Cameras.prefab | 2 +-
 Assets/Scripts/GameManager.cs           | 1 +
 Assets/Scripts/Games/Global/Flash.cs    | 1 +
 ProjectSettings/GraphicsSettings.asset  | 2 +-
 ProjectSettings/TagManager.asset        | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Assets/Resources/Prefabs/Cameras.prefab b/Assets/Resources/Prefabs/Cameras.prefab
index 0a71ffaf..99d67e41 100644
--- a/Assets/Resources/Prefabs/Cameras.prefab
+++ b/Assets/Resources/Prefabs/Cameras.prefab
@@ -138,7 +138,7 @@ Camera:
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 535
+    m_Bits: 2583
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0
diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
index 9109a5f6..3f5afd88 100644
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@@ -62,6 +62,7 @@ namespace RhythmHeavenMania
             sp.color = Color.black;
             sp.sprite = Resources.Load<Sprite>("Sprites/GeneralPurpose/Square");
             sp.sortingOrder = 30000;
+            gameObject.layer = LayerMask.NameToLayer("Flash");
 
             GameObject fade = new GameObject();
             this.fade = fade.AddComponent<Games.Global.Flash>();
diff --git a/Assets/Scripts/Games/Global/Flash.cs b/Assets/Scripts/Games/Global/Flash.cs
index 7737918a..666d296f 100644
--- a/Assets/Scripts/Games/Global/Flash.cs
+++ b/Assets/Scripts/Games/Global/Flash.cs
@@ -27,6 +27,7 @@ namespace RhythmHeavenMania.Games.Global
         private void Start()
         {
             this.gameObject.transform.SetParent(GameManager.instance.gameObject.transform);
+            gameObject.layer = LayerMask.NameToLayer("Flash");
             this.gameObject.transform.localScale = new Vector3(1, 1);
 
             spriteRenderer = this.gameObject.AddComponent<SpriteRenderer>();
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index dcc5a443..c165afb2 100644
--- a/ProjectSettings/GraphicsSettings.asset
+++ b/ProjectSettings/GraphicsSettings.asset
@@ -39,7 +39,7 @@ GraphicsSettings:
   - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_CustomRenderPipeline: {fileID: 11400000, guid: 101cb6f0eda36514fa0bb49e41c8fae1, type: 2}
+  m_CustomRenderPipeline: {fileID: 0}
   m_TransparencySortMode: 0
   m_TransparencySortAxis: {x: 0, y: 0, z: 1}
   m_DefaultRenderingPath: 1
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 688b3fae..7a55c047 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -16,7 +16,7 @@ TagManager:
   - EventProperties
   - RenderTextures
   - 3DDefault
-  - 
+  - Flash
   - 
   - 
   -