From 85f12dda0ed7bdee6af2999ea295adf4ad79cec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E5=8F=B3=E7=9C=8B?= <1918891542@qq.com> Date: Mon, 3 Jul 2023 00:25:38 +0800 Subject: [PATCH] minor bug fix --- Assets/Scripts/UmaViewerGlobalShader.cs | 26 ++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/Assets/Scripts/UmaViewerGlobalShader.cs b/Assets/Scripts/UmaViewerGlobalShader.cs index d08dad9..e32be48 100644 --- a/Assets/Scripts/UmaViewerGlobalShader.cs +++ b/Assets/Scripts/UmaViewerGlobalShader.cs @@ -128,19 +128,27 @@ public class UmaViewerGlobalShader : MonoBehaviour { //Used to calculate the correct outline //Outline need more adjust in live - if (UmaViewerBuilder.Instance.CurrentUMAContainer) + if (!UmaViewerUI.Instance.LiveTime) { - if (UmaViewerBuilder.Instance.CurrentUMAContainer.UpBodyBone) + if (UmaViewerBuilder.Instance.CurrentUMAContainer) { - var container = UmaViewerBuilder.Instance.CurrentUMAContainer; - var upBone = container.UpBodyBone; - var aniCamera = UmaViewerBuilder.Instance.AnimationCamera; - var camera = aniCamera.enabled ? aniCamera : Camera.main; - var distance = Vector3.Distance(camera.transform.position, upBone.transform.position); - var outlineWidth = (container.IsMini ? 20f : 40.0f) * (distance * Mathf.Tan(camera.fieldOfView * 0.5f * Mathf.Deg2Rad)); - Shader.SetGlobalFloat("_GlobalCameraFov", outlineWidth); + if (UmaViewerBuilder.Instance.CurrentUMAContainer.UpBodyBone) + { + var container = UmaViewerBuilder.Instance.CurrentUMAContainer; + var upBone = container.UpBodyBone; + var aniCamera = UmaViewerBuilder.Instance.AnimationCamera; + var camera = aniCamera.enabled ? aniCamera : Camera.main; + var distance = Vector3.Distance(camera.transform.position, upBone.transform.position); + var outlineWidth = (container.IsMini ? 20f : 40.0f) * (distance * Mathf.Tan(camera.fieldOfView * 0.5f * Mathf.Deg2Rad)); + Shader.SetGlobalFloat("_GlobalCameraFov", outlineWidth); + } } } + else + { + Shader.SetGlobalFloat("_GlobalCameraFov", 30); + } + }