diff --git a/Assets/Editor/GlobalValue.cs b/Assets/Editor/GlobalValue.cs index 26b6169..1bb504d 100644 --- a/Assets/Editor/GlobalValue.cs +++ b/Assets/Editor/GlobalValue.cs @@ -7,7 +7,7 @@ public class GlobalValue : EditorWindow { float _Global_MaxDensity = 1.0f; float _Global_MaxHeight = 10.0f; - float _GlobalOutlineOffest = 0.0f; + float _GlobalOutlineOffset = 0.0f; float _GlobalOutlineWidth = 1.0f; float _GlobalCameraFov = 0.0f; float _CylinderBlend = 0.0f; @@ -72,7 +72,7 @@ public class GlobalValue : EditorWindow //Float _Global_MaxDensity = EditorGUILayout.Slider("最低能见度", _Global_MaxDensity, 0, 1); _Global_MaxHeight = EditorGUILayout.Slider("最高可见高度", _Global_MaxHeight, 0, 10); - _GlobalOutlineOffest = EditorGUILayout.Slider("_GlobalOutlineOffest", _GlobalOutlineOffest, 0, 100); + _GlobalOutlineOffset = EditorGUILayout.Slider("_GlobalOutlineOffset", _GlobalOutlineOffset, -100, 100); _GlobalOutlineWidth = EditorGUILayout.Slider("全局轮廓线宽度", _GlobalOutlineWidth, 0, 100); _GlobalCameraFov = EditorGUILayout.Slider("_GlobalCameraFov", _GlobalCameraFov, 0, 100); _CylinderBlend = EditorGUILayout.Slider("_CylinderBlend", _CylinderBlend, 0, 100); @@ -131,7 +131,7 @@ public class GlobalValue : EditorWindow //Float Shader.SetGlobalFloat("_Global_MaxDensity", _Global_MaxDensity); Shader.SetGlobalFloat("_Global_MaxHeight", _Global_MaxHeight); - Shader.SetGlobalFloat("_GlobalOutlineOffest", _GlobalOutlineOffest); + Shader.SetGlobalFloat("_GlobalOutlineOffset", _GlobalOutlineOffset); Shader.SetGlobalFloat("_GlobalOutlineWidth", _GlobalOutlineWidth); Shader.SetGlobalFloat("_GlobalCameraFov", _GlobalCameraFov); Shader.SetGlobalFloat("_CylinderBlend", _CylinderBlend); diff --git a/Assets/Scenes/Version2.unity b/Assets/Scenes/Version2.unity index 9441f72..f39f1f6 100644 --- a/Assets/Scenes/Version2.unity +++ b/Assets/Scenes/Version2.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.43975654, g: 0.48818094, b: 0.5683994, a: 1} + m_IndirectSpecularColor: {r: 0.4397552, g: 0.48818004, b: 0.56839955, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -17775,13 +17775,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 926505643} - m_LocalRotation: {x: 0.6275069, y: 0.3686878, z: -0.52654076, w: 0.4393851} + m_LocalRotation: {x: 0.81915206, y: 0, z: 0, w: 0.57357645} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 110, y: 80, z: 0} + m_LocalEulerAnglesHint: {x: 110, y: 0, z: 0} --- !u!1 &931406425 GameObject: m_ObjectHideFlags: 0 @@ -21764,7 +21764,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1882365342} m_Direction: 2 m_Value: 1 - m_Size: 0.9250021 + m_Size: 0.925002 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -36197,9 +36197,9 @@ MonoBehaviour: m_EditorClassIdentifier: _Global_MaxDensity: 1 _Global_MaxHeight: 10 - _GlobalOutlineOffest: 0 - _GlobalOutlineWidth: 1 - _GlobalCameraFov: 0 + _GlobalOutlineOffset: 1 + _GlobalOutlineWidth: 0.14 + _GlobalCameraFov: 0.1 _CylinderBlend: 0 _GlobalToonColor: {r: 1, g: 1, b: 1, a: 0} _Global_FogColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Scripts/UmaContainer.cs b/Assets/Scripts/UmaContainer.cs index 61606b1..5009f9b 100644 --- a/Assets/Scripts/UmaContainer.cs +++ b/Assets/Scripts/UmaContainer.cs @@ -41,6 +41,8 @@ public class UmaContainer : MonoBehaviour public bool EnablePhysics = true; public List cySpringDataContainers; + [Header("Shader")] + public Material FaceMaterial; public void MergeModel() { if (!Body) return; @@ -97,6 +99,7 @@ public class UmaContainer : MonoBehaviour OverrideController = Instantiate(UmaViewerBuilder.Instance.OverrideController); UmaAnimator.runtimeAnimatorController = OverrideController; + FaceMaterial = transform.Find("M_Face").GetComponent().material; } public void SetHeight(int scale) @@ -172,5 +175,23 @@ public class UmaContainer : MonoBehaviour { FaceDrivenKeyTarget.ProcessLocator(); } + + if (!IsMini && FaceMaterial) + { + if (isAnimatorControl) + { + FaceMaterial.SetVector("_FaceForward", Vector3.zero); + FaceMaterial.SetVector("_FaceUp", Vector3.zero); + FaceMaterial.SetVector("_FaceCenterPos", Vector3.zero); + + } + else + { + //Used to calculate facial shadows + FaceMaterial.SetVector("_FaceForward", HeadBone.transform.forward); + FaceMaterial.SetVector("_FaceUp", HeadBone.transform.up); + FaceMaterial.SetVector("_FaceCenterPos", HeadBone.transform.position); + } + } } } diff --git a/Assets/Scripts/UmaViewerGlobalShader.cs b/Assets/Scripts/UmaViewerGlobalShader.cs index f415f31..b358e25 100644 --- a/Assets/Scripts/UmaViewerGlobalShader.cs +++ b/Assets/Scripts/UmaViewerGlobalShader.cs @@ -7,9 +7,9 @@ public class UmaViewerGlobalShader : MonoBehaviour //仅用于设置游戏开局shader全局变量的初始值,若想即时调整请使用Editor内部工具 public float _Global_MaxDensity = 1.0f; public float _Global_MaxHeight = 10.0f; - public float _GlobalOutlineOffest = 0.0f; + public float _GlobalOutlineOffset = 1f; public float _GlobalOutlineWidth = 1.0f; - public float _GlobalCameraFov = 0.0f; + public float _GlobalCameraFov = 0.1f; public float _CylinderBlend = 0.0f; public Color _GlobalToonColor = new Color(1, 1, 1, 0); public Color _Global_FogColor; @@ -69,7 +69,7 @@ public class UmaViewerGlobalShader : MonoBehaviour //Float Shader.SetGlobalFloat("_Global_MaxDensity", _Global_MaxDensity); Shader.SetGlobalFloat("_Global_MaxHeight", _Global_MaxHeight); - Shader.SetGlobalFloat("_GlobalOutlineOffest", _GlobalOutlineOffest); + Shader.SetGlobalFloat("_GlobalOutlineOffset", _GlobalOutlineOffset); Shader.SetGlobalFloat("_GlobalOutlineWidth", _GlobalOutlineWidth); Shader.SetGlobalFloat("_GlobalCameraFov", _GlobalCameraFov); Shader.SetGlobalFloat("_CylinderBlend", _CylinderBlend); @@ -123,4 +123,12 @@ public class UmaViewerGlobalShader : MonoBehaviour setGlobal(); } + private void FixedUpdate() + { + //Used to calculate the correct outline + _GlobalCameraFov = Camera.main.fieldOfView; + Shader.SetGlobalFloat("_GlobalCameraFov", _GlobalCameraFov); + } + + } diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset new file mode 100644 index 0000000..b4fbdb0 --- /dev/null +++ b/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60