2nd push on shader experimentation changes

fielddaylab · Oct 17, 2024 · 073b843 · 073b843
1 parent e5aa26e
commit 073b843
Show file tree

Hide file tree

Showing 7 changed files with 1,557 additions and 174 deletions.
diff --git a/Assets/Project/Materials/3D/temp_WS.mat b/Assets/Project/Materials/3D/temp_WS.mat
@@ -21,7 +21,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: temp_WS
-  m_Shader: {fileID: -6465566751694194690, guid: c297a34cf9102b1419a4d365fcfdf73a, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: dacd2ae6d4df46741b1478789a6eb5e5, type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
@@ -106,6 +106,7 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
+    - _Fresnel_Power: 1
     - _GlossMapScale: 1
     - _Glossiness: 3.95
     - _GlossyReflections: 1
@@ -135,7 +136,7 @@ Material:
     - _Color_Dots: {r: 0.2503115, g: 0.3393275, b: 0.4245283, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _MainColor: {r: 0.4528302, g: 0.4528302, b: 0.4528302, a: 0}
-    - _Main_Color: {r: 0.6320754, g: 0.47405657, b: 0.47405657, a: 0}
+    - _Main_Color: {r: 1, g: 1, b: 1, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _SpecularColor: {r: 0.66415095, g: 0.83797044, b: 1, a: 0}
     - _WorldSpaceLightPos0: {r: 0, g: 0, b: 0, a: 0}

diff --git a/Assets/Project/Materials/3D/temp_gray.mat b/Assets/Project/Materials/3D/temp_gray.mat
@@ -21,7 +21,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: temp_gray
-  m_Shader: {fileID: -6465566751694194690, guid: c297a34cf9102b1419a4d365fcfdf73a, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: dacd2ae6d4df46741b1478789a6eb5e5, type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
@@ -106,6 +106,7 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
+    - _Fresnel_Power: 1.5
     - _GlossMapScale: 1
     - _Glossiness: 3.95
     - _GlossyReflections: 1
@@ -116,11 +117,11 @@ Material:
     - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Scale: 4.46
+    - _Scale: 1.59
     - _Smoothness: 0.5
     - _SmoothnessTextureChannel: 0
     - _SpecBrightness: 0.7
-    - _SpecFocus: 32
+    - _SpecFocus: 30.6
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _Surface: 0
@@ -132,10 +133,10 @@ Material:
     - _BaseColor: {r: 0.42599997, g: 0.42599997, b: 0.42599997, a: 1}
     - _Color: {r: 0.42599994, g: 0.42599994, b: 0.42599994, a: 1}
     - _Color_Base: {r: 0.7264151, g: 0.29125133, b: 0.60545665, a: 0}
-    - _Color_Dots: {r: 0.509434, g: 0.47439244, b: 0.41091138, a: 0}
+    - _Color_Dots: {r: 0.4198113, g: 0.7491429, b: 1, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _MainColor: {r: 0.4528302, g: 0.4528302, b: 0.4528302, a: 0}
-    - _Main_Color: {r: 0.6320754, g: 0.47405657, b: 0.47405657, a: 0}
+    - _Main_Color: {r: 1, g: 1, b: 1, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _SpecularColor: {r: 0.66415095, g: 0.83797044, b: 1, a: 0}
     - _WorldSpaceLightPos0: {r: 0, g: 0, b: 0, a: 0}

diff --git a/Assets/Project/Materials/3D/temp_gray_2.mat b/Assets/Project/Materials/3D/temp_gray_2.mat
@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: temp_gray_2
-  m_Shader: {fileID: -6465566751694194690, guid: c297a34cf9102b1419a4d365fcfdf73a, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: dacd2ae6d4df46741b1478789a6eb5e5, type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
@@ -93,6 +93,7 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _EnvironmentReflections: 1
+    - _Fresnel_Power: 1
     - _GlossMapScale: 1
     - _Glossiness: 3.95
     - _GlossyReflections: 1
@@ -103,7 +104,7 @@ Material:
     - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Scale: 3.96
+    - _Scale: 1.4
     - _Smoothness: 0.5
     - _SmoothnessTextureChannel: 0
     - _SpecBrightness: 31.2
@@ -119,10 +120,10 @@ Material:
     - _BaseColor: {r: 0.42599997, g: 0.42599997, b: 0.42599997, a: 1}
     - _Color: {r: 0.38319683, g: 0.6105335, b: 0.9811321, a: 1}
     - _Color_Base: {r: 1, g: 1, b: 1, a: 0}
-    - _Color_Dots: {r: 0.45631897, g: 0.5648332, b: 0.6415094, a: 0}
+    - _Color_Dots: {r: 0.8301887, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _MainColor: {r: 0.4528302, g: 0.4528302, b: 0.4528302, a: 0}
-    - _Main_Color: {r: 0.9833313, g: 1, b: 0.9575472, a: 0}
+    - _Main_Color: {r: 0.82855797, g: 0.629717, b: 0.8396226, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _SpecularColor: {r: 0.66415095, g: 0.83797044, b: 1, a: 0}
   m_BuildTextureStacks: []

diff --git a/Assets/Project/Materials/3D/temp_gray_3.mat b/Assets/Project/Materials/3D/temp_gray_3.mat
@@ -119,7 +119,7 @@ Material:
     - _BaseColor: {r: 0.42599997, g: 0.42599997, b: 0.42599997, a: 1}
     - _Color: {r: 0.42599994, g: 0.42599994, b: 0.42599994, a: 1}
     - _Color_Base: {r: 0.19736555, g: 0.35132596, b: 0.9339623, a: 0}
-    - _Color_Dots: {r: 1, g: 0.025435261, b: 0, a: 0}
+    - _Color_Dots: {r: 1, g: 1, b: 1, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _MainColor: {r: 0.6415094, g: 0.6415094, b: 0.6415094, a: 0}
     - _Main_Color: {r: 1, g: 0.9575472, b: 0.9933087, a: 0}

diff --git a/Assets/Project/Materials/3D/temp_orange.mat b/Assets/Project/Materials/3D/temp_orange.mat
@@ -77,6 +77,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Texture2D:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - unity_Lightmaps:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -126,6 +130,9 @@ Material:
     m_Colors:
     - _BaseColor: {r: 0.9622641, g: 0.5930695, b: 0.23965818, a: 1}
     - _Color: {r: 0.9622641, g: 0.5930695, b: 0.23965815, a: 1}
+    - _Color_Base: {r: 0.19736555, g: 0.35132596, b: 0.9339623, a: 0}
+    - _Color_Dots: {r: 1, g: 1, b: 1, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Main_Color: {r: 0.14595938, g: 0.27640715, b: 0.75471693, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
diff --git a/Assets/Project/Materials/3D/temp_thermo.mat b/Assets/Project/Materials/3D/temp_thermo.mat
@@ -78,7 +78,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _Texture2D:
-        m_Texture: {fileID: 2800000, guid: b75b2f6a8165a1f48a999fb40b858cb4, type: 3}
+        m_Texture: {fileID: 2800000, guid: 6a008ba0ea15bf642b53599d7020ede4, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - unity_Lightmaps:
@@ -135,7 +135,7 @@ Material:
     - _Color_Dots: {r: 0.2503115, g: 0.3393275, b: 0.4245283, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _MainColor: {r: 0.4528302, g: 0.4528302, b: 0.4528302, a: 0}
-    - _Main_Color: {r: 0.6320754, g: 0.47405657, b: 0.47405657, a: 0}
+    - _Main_Color: {r: 1, g: 1, b: 1, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _SpecularColor: {r: 0.66415095, g: 0.83797044, b: 1, a: 0}
     - _WorldSpaceLightPos0: {r: 0, g: 0, b: 0, a: 0}