Release Candidate. Shader fixes for various RP

umasteeringgroup · Jun 5, 2024 · b774554 · b774554
1 parent 98ce02e
commit b774554
Show file tree

Hide file tree

Showing 82 changed files with 6,271 additions and 7,657 deletions.
diff --git a/UMAProject/Assets/UMA/Content/BetterShadersSrc.zip b/UMAProject/Assets/UMA/Content/BetterShadersSrc.zip
diff --git a/UMAProject/Assets/UMA/Content/Contrib/Materials/UMA_Mesh_Hair_DoubleSided.asset b/UMAProject/Assets/UMA/Content/Contrib/Materials/UMA_Mesh_Hair_DoubleSided.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: UMA_Mesh_Hair_DoubleSided
   m_EditorClassIdentifier: 
   translateSRP: 1
+  AutoSetSRPMaterials: 1
   _material: {fileID: 2100000, guid: 9f64d6a59b10e1a4db966cf484f49622, type: 2}
   _secondPass: {fileID: 0}
   srpMaterials:
@@ -28,6 +29,12 @@ MonoBehaviour:
     alternateKeywords:
     - _BaseMap
     - _BumpMap
+  - SRP: 3
+    material: {fileID: 2100000, guid: 8146edb8bb821c34f956f820090a2adb, type: 2}
+    secondPass: {fileID: 0}
+    alternateKeywords:
+    - _BaseMap
+    - _BumpMap
   materialType: 8
   channels:
   - channelType: 3

diff --git a/UMAProject/Assets/UMA/Content/Contrib/Materials/UMA_Mesh_Hair_DoubleSided_Cutout.mat b/UMAProject/Assets/UMA/Content/Contrib/Materials/UMA_Mesh_Hair_DoubleSided_Cutout.mat
@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: UMA_Mesh_Hair_DoubleSided_Cutout
-  m_Shader: {fileID: -6465566751694194690, guid: 8b6ed7fef664d3547a898fe1f5df5bbc,
+  m_Shader: {fileID: -6465566751694194690, guid: 29a5769127ec3494b916662d265737e1,
     type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords:
@@ -25,7 +25,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: f4efbb243ca57b3448809bfbb51735dc, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -82,7 +82,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _AlphaClip: 0.5
+    - _AlphaClip: 0.42
     - _BumpScale: 0.35
     - _BumpStrength: 0.344
     - _ColorModulation: 1.299
@@ -108,6 +108,7 @@ Material:
     - _Richness: 0.721
     - _RimLightPower: 4
     - _RimLightingModulation: 0
+    - _Smoothness: 0
     - _SmoothnessAdd: 0.303
     - _SmoothnessModulation: 0.03
     - _SmoothnessStrength: 0

diff --git a/...ct/Assets/UMA/Content/Core/HumanFemale/Recipes/Base Recipes/HumanFemale Base Recipe.asset b/...ct/Assets/UMA/Content/Core/HumanFemale/Recipes/Base Recipes/HumanFemale Base Recipe.asset
diff --git a/UMAProject/Assets/UMA/Content/Core/HumanMale/Recipes/BaseRecipes/HumanMale Base Recipe.asset b/UMAProject/Assets/UMA/Content/Core/HumanMale/Recipes/BaseRecipes/HumanMale Base Recipe.asset
diff --git a/...oject/Assets/UMA/Content/Core/HumanShared/Materials/Other/Unity-URP-Hair-Shader-main.meta b/...oject/Assets/UMA/Content/Core/HumanShared/Materials/Other/Unity-URP-Hair-Shader-main.meta
diff --git a/...ontent/Core/HumanShared/Materials/Other/Unity-URP-Hair-Shader-main/FulcrumHairShader.meta b/...ontent/Core/HumanShared/Materials/Other/Unity-URP-Hair-Shader-main/FulcrumHairShader.meta
diff --git a/...Core/HumanShared/Materials/Other/Unity-URP-Hair-Shader-main/FulcrumHairShader/Hair.shader b/...Core/HumanShared/Materials/Other/Unity-URP-Hair-Shader-main/FulcrumHairShader/Hair.shader