From b48c5c1f495443a26cfee596b769c9c0a333ef63 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 3 Oct 2017 13:36:57 -0500 Subject: [PATCH] fixed glow script --- .../.vs/Project Undercover/v15/Browse.VC.db | Bin 0 -> 241664 bytes Project Undercover/Assets/Materials/Floor.mat | 2 +- .../Assets/Materials/GlowCompositeMat.mat | 76 ++++++++++++++++++ .../Materials/GlowCompositeMat.mat.meta | 9 +++ .../Assets/Resources/CameraRig.prefab | 3 + .../Assets/Resources/NPC.prefab | 4 +- .../Assets/Resources/Spy.prefab | 2 + .../Assets/Scenes/NewCharactersTest.unity | 2 +- .../CharacterAnimator.cs | 12 +++ .../Assets/Scripts/Glow/GlowComposite.cs | 5 +- .../Assets/Scripts/Glow/GlowPrePass.cs | 5 +- .../Assets/Shaders/GlowComposite.shader | 2 +- .../ProjectSettings/EditorBuildSettings.asset | 2 +- 13 files changed, 115 insertions(+), 9 deletions(-) create mode 100644 Project Undercover/.vs/Project Undercover/v15/Browse.VC.db create mode 100644 Project Undercover/Assets/Materials/GlowCompositeMat.mat create mode 100644 Project Undercover/Assets/Materials/GlowCompositeMat.mat.meta diff --git a/Project Undercover/.vs/Project Undercover/v15/Browse.VC.db b/Project Undercover/.vs/Project Undercover/v15/Browse.VC.db new file mode 100644 index 0000000000000000000000000000000000000000..818ee2ea179a6d391180ba791ec05eb731e07e65 GIT binary patch literal 241664 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 1, Screen.height >> 1, 0); var camera = GetComponent(); - var glowShader = Shader.Find("Hidden/GlowReplace"); + //var glowShader = Shader.Find("Hidden/GlowReplace"); camera.targetTexture = PrePass; camera.SetReplacementShader(glowShader, "Glowable"); Shader.SetGlobalTexture("_GlowPrePassTex", PrePass); Shader.SetGlobalTexture("_GlowBlurredTex", Blurred); - _blurMat = new Material(Shader.Find("Hidden/Blur")); + _blurMat = new Material(blurShader); _blurMat.SetVector("_BlurSize", new Vector2(Blurred.texelSize.x * 1.5f, Blurred.texelSize.y * 1.5f)); } diff --git a/Project Undercover/Assets/Shaders/GlowComposite.shader b/Project Undercover/Assets/Shaders/GlowComposite.shader index c8ed13f..c8162c6 100644 --- a/Project Undercover/Assets/Shaders/GlowComposite.shader +++ b/Project Undercover/Assets/Shaders/GlowComposite.shader @@ -1,6 +1,6 @@ // Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' -Shader "Hidden/GlowComposite" +Shader "GlowComposite" { Properties { diff --git a/Project Undercover/ProjectSettings/EditorBuildSettings.asset b/Project Undercover/ProjectSettings/EditorBuildSettings.asset index e596428..8c6a7b3 100644 --- a/Project Undercover/ProjectSettings/EditorBuildSettings.asset +++ b/Project Undercover/ProjectSettings/EditorBuildSettings.asset @@ -11,7 +11,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Lobby.unity guid: 9d65756f3d12ef647aea0782245fc241 - - enabled: 1 + - enabled: 0 path: Assets/Scenes/scene.unity guid: b679f50ae448b0642b9887e440a00e0f - enabled: 1