Merge pull request #27 from you-ri/feature/add-outline-normal

Add outline normal
you-ri · Feb 25, 2021 · 4cd8744 · 4cd8744
2 parents b2fe445 + 3a4eb7b
commit 4cd8744
Show file tree

Hide file tree

Showing 48 changed files with 16,981 additions and 2,272 deletions.
diff --git a/Assets/Samples/Materials/BustManWreath Toon.mat b/Assets/Samples/Materials/BustManWreath Toon.mat
@@ -0,0 +1,213 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1819634281953464270
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 1
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BustManWreath Toon
+  m_Shader: {fileID: -6465566751694194690, guid: 78689600cd436f846859a8bc6bcb3ebc,
+    type: 3}
+  m_ShaderKeywords: SHADEMODEL_RAMP
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - Texture2D_11035104:
+        m_Texture: {fileID: 2800000, guid: a7d6dbe7d04d9ce438607a5a60786631, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - Texture2D_39CB185:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - Texture2D_A43E975D:
+        m_Texture: {fileID: 2800000, guid: 470c40004b504b44d81b18dc675f9941, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - Texture2D_BB515267:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - Texture2D_C1F70CCA:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - Texture2D_EF82F75B:
+        m_Texture: {fileID: 2800000, guid: 66b65b33bc005a2438552ff5e3d8c845, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - Texture2D_F3F57C2D:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - Texture2D_d5a96518bbf24f11aff81031d9fbd97d:
+        m_Texture: {fileID: 2800000, guid: 381f2320ac473644197e3b6f035e3d8c, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: 111cdac332e137041993a564160940b8, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _CustomFunction_A062B59F_ShadeRamp_17:
+        m_Texture: {fileID: 2800000, guid: a7d6dbe7d04d9ce438607a5a60786631, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _CustomFunction_bb929d0fd24b47ba9893d8a9a3b1fcae_SSSLutTexture_21:
+        m_Texture: {fileID: 2800000, guid: 63f8961755d8d5b45a64165581eb373e, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _LiliumToonLightingSmoothstepRamp_45CD7D82_Texture2DED058F03_4268568337:
+        m_Texture: {fileID: 2800000, guid: a7d6dbe7d04d9ce438607a5a60786631, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetalicMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 2800000, guid: 2630e03ae35d19c4e968c1aac885a922, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OutlineMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_1263EFA7_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 470c40004b504b44d81b18dc675f9941, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_498A2E8C_Texture:
+        m_Texture: {fileID: 2800000, guid: c460f8ebd4dad0e43af1b7b9ff2d9064, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_5673BF28_Texture:
+        m_Texture: {fileID: 2800000, guid: 470c40004b504b44d81b18dc675f9941, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_96E454D5_Texture:
+        m_Texture: {fileID: 2800000, guid: 331a012fdbf7f934796cdbc74ae62fb3, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_CD4D5A05_Texture:
+        m_Texture: {fileID: 2800000, guid: 66b65b33bc005a2438552ff5e3d8c845, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ShadeMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ShadeTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ShadowMap:
+        m_Texture: {fileID: 2800000, guid: 2630e03ae35d19c4e968c1aac885a922, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SssMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ToonLightingSmoothstepRamp_7490ec7b752e4ec8a91b1b1951ed1e45_Texture2D34e6fc2fdfc44a82b26bef41447d6d72_248187755:
+        m_Texture: {fileID: 2800000, guid: 63f8961755d8d5b45a64165581eb373e, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - BOOLEAN_5FF062BF: 0
+    - BOOLEAN_9B700AD3: 0
+    - BOOLEAN_B3D4D13: 0
+    - ENUM_BB805A98: 0
+    - SHADEMODEL: 1
+    - Vector1_309B4A83: 0
+    - Vector1_35cfdfc441464268a9a00fb3ca003d03: 0
+    - Vector1_49E9B1A1: 1
+    - Vector1_4BAB6E0C: 0.5
+    - Vector1_4FDCBCA2: 0.5
+    - Vector1_6D6B064A: 0
+    - Vector1_758139A: 0.9
+    - Vector1_D3E9BBB8: 1
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _Cull: 2
+    - _Curvature: 1.01
+    - _Cutoff: 0.5
+    - _DstBlend: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metalic: 0
+    - _Metallic: 0
+    - _OcclusionMap: 0.5
+    - _OcclusionStrength: 1
+    - _OutlineIntensity: 0.5
+    - _OutlineWidth: 1
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Shade: 1
+    - _ShadeToony: 1
+    - _Smoothness: 0
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Surface: 0
+    - _ToonyLighting: 1
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - Color_537E3FFF: {r: 0, g: 0, b: 0, a: 0}
+    - Color_76D10967: {r: 1, g: 1, b: 1, a: 1}
+    - Color_C36862AF: {r: 1, g: 1, b: 1, a: 1}
+    - Color_C83E9D68: {r: 0, g: 0, b: 0, a: 0}
+    - Color_a32378a5f4d5418aab3a9527a8517441: {r: 1, g: 1, b: 1, a: 0}
+    - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _ShadeColor: {r: 0.628699, g: 0.622241, b: 0.745283, a: 1}
+    - _ShadeEnvironmentalColor: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _SpecGlossColor: {r: 0, g: 0, b: 0, a: 0}
+    - _SssColor: {r: 0.6886792, g: 0.19815768, b: 0.32440507, a: 0}
+  m_BuildTextureStacks: []
diff --git a/...ilium.toongraph/Contents/ShaderGraph.meta → ...les/Materials/BustManWreath Toon.mat.meta b/...ilium.toongraph/Contents/ShaderGraph.meta → ...les/Materials/BustManWreath Toon.mat.meta
diff --git a/Assets/Samples/Materials/SDUnityChan Toon.mat b/Assets/Samples/Materials/SDUnityChan Toon.mat
@@ -57,6 +57,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - Texture2D_d5a96518bbf24f11aff81031d9fbd97d:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _BaseMap:
         m_Texture: {fileID: 2800000, guid: 0e6ef80ca6d7e0340a8290fe44f25832, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -133,9 +137,27 @@ Material:
         m_Texture: {fileID: 2800000, guid: 63f8961755d8d5b45a64165581eb373e, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
+    - Boolean_37E6E255: 0
+    - Vector1_1D76DC4B: 0.245
+    - Vector1_1E7071F8: -8.47
+    - Vector1_35cfdfc441464268a9a00fb3ca003d03: 0
     - Vector1_4FDCBCA2: 0.3
     - Vector1_7DE6D5AB: 0.9
+    - Vector1_AAC7233E: 0.452
+    - Vector1_BB5D899E: 1.1
     - Vector1_D9A6FB2A: 1
     - Vector1_b1c9e85843fc414190d2d722e0594503: 0
     - _AlphaClip: 0
@@ -172,14 +194,19 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
+    - Color_26F820C6: {r: 1, g: 1, b: 1, a: 1}
     - Color_76D10967: {r: 1, g: 1, b: 1, a: 1}
     - Color_8B442FA4: {r: 1, g: 1, b: 1, a: 1}
     - Color_AEA6BBA8: {r: 0, g: 0, b: 0, a: 0}
+    - Color_DB21EC25: {r: 1, g: 1, b: 1, a: 0}
     - Color_E8797B55: {r: 0.8113208, g: 0.8113208, b: 0.8113208, a: 1}
+    - Color_F7A6A262: {r: 0, g: 0, b: 0, a: 0}
+    - Color_a32378a5f4d5418aab3a9527a8517441: {r: 12.9811325, g: 15.616344, b: 64,
+        a: 0}
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ShadeColor: {r: 1, g: 1, b: 1, a: 1}
+    - _ShadeColor: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 1}
     - _ShadeEnvironmentalColor: {r: 0.62352943, g: 0.62352943, b: 0.62352943, a: 1}
     - _ShdeEnvironmentalColor: {r: 1, g: 1, b: 1, a: 1}
     - _SpecColor: {r: 0, g: 0, b: 0, a: 1}

diff --git a/Assets/Samples/Materials/Simple PBR (SSS).mat b/Assets/Samples/Materials/Simple PBR (SSS).mat
@@ -103,7 +103,7 @@ Material:
     - _Blend: 0
     - _BumpScale: 1
     - _Cull: 2
-    - _Curvature: 0.3
+    - _Curvature: 0.745
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EnvironmentReflections: 1
@@ -113,7 +113,7 @@ Material:
     - _Metalic: 0
     - _Metallic: 0
     - _OcclusionStrength: 1
-    - _OutlineWidth: 1
+    - _OutlineWidth: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Shade: 1

diff --git a/Assets/Samples/Scripts/LightingEnvironmentController.cs b/Assets/Samples/Scripts/LightingEnvironmentController.cs
@@ -26,6 +26,7 @@ IEnumerator Start()
         _reflectionProbe.refreshMode = UnityEngine.Rendering.ReflectionProbeRefreshMode.ViaScripting;
         _reflectionProbe.timeSlicingMode = UnityEngine.Rendering.ReflectionProbeTimeSlicingMode.NoTimeSlicing;
         _reflectionProbe.size = new Vector3(100, 100, 100);
+        currentIndex --;
 
         for (int i = 0; ; i++) {
             currentIndex = (++currentIndex) % lightingEnvironments.Length;