Keyword cleanup, shader variant adjustments.

uwu-qwe · Nov 7, 2023 · b88d8ec · b88d8ec
1 parent 0fd071a
commit b88d8ec
Show file tree

Hide file tree

Showing 142 changed files with 1,342 additions and 23,924 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,9 @@
 [Aa]ssets/UMotionEditor.meta
 UMotionData/
 
+[Aa]ssets/ShaderControl/
+[Aa]ssets/ShaderControl.meta
+
 # Also don't push secrets from my google sheets.
 [Aa]ssets/KoboldKare/Locales/Google Sheets Service.asset
 [Aa]ssets/KoboldKare/Locales/Google Sheets Service.asset.meta
@@ -54,6 +57,8 @@ Logs/shadercompiler-AssetImportWorker0.log
 #*Lightmap-*.exr.meta
 *.blend1
 *.blend1.meta
+*.shader_backup
+*.shader_backup.meta
 #*ReflectionProbe*.exr
 #*ReflectionProbe*.exr.meta
 #*OcclusionCullingData.asset
diff --git a/Assets/AddressableAssetsData/AssetGroups/Default.Shaders.asset b/Assets/AddressableAssetsData/AssetGroups/Default.Shaders.asset
@@ -41,12 +41,6 @@ MonoBehaviour:
     m_SerializedLabels:
     - default
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: def7000896e247349bf958c5d2a9a6f2
-    m_Address: Assets/KoboldKare/Shaders/StatueShader.shader
-    m_ReadOnly: 0
-    m_SerializedLabels:
-    - default
-    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 1415f2a892abc2149addb08105206ad7
     m_Address: Assets/KoboldKare/Shaders/PachinkoShader.shader
     m_ReadOnly: 0
@@ -71,12 +65,6 @@ MonoBehaviour:
     m_SerializedLabels:
     - default
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 99d74aa18adfe114b8db023429c25ed2
-    m_Address: Assets/KoboldKare/Shaders/NipplePiercingShader.shader
-    m_ReadOnly: 0
-    m_SerializedLabels:
-    - default
-    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 42e0f16c77d25144ea2348ca1a254645
     m_Address: Assets/KoboldKare/Shaders/Leafs URP.shader
     m_ReadOnly: 0

diff --git a/Assets/KoboldKare/Lilith/LitheKoboldEyes.mat b/Assets/KoboldKare/Lilith/LitheKoboldEyes.mat
@@ -10,8 +10,7 @@ Material:
   m_Name: LitheKoboldEyes
   m_Shader: {fileID: 4800000, guid: 5e1d12dd9f331b94da153b99f92b9e11, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _PENETRATION_DEFORMATION_DETAIL_ON
+  m_InvalidKeywords: []
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/AgedOakWood.mat b/Assets/KoboldKare/Materials/AgedOakWood.mat
@@ -10,8 +10,7 @@ Material:
   m_Name: AgedOakWood
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _NORMALMAP_ON
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/Bomb.mat b/Assets/KoboldKare/Materials/Bomb.mat
@@ -10,10 +10,7 @@ Material:
   m_Name: Bomb
   m_Shader: {fileID: 4800000, guid: c74e1808ddaac6745ac169265a87048e, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _EMISSION
-  - _METALLICSPECGLOSSMAP
-  - _NORMALMAP
+  m_InvalidKeywords: []
   m_LightmapFlags: 2
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/BucketWater.mat b/Assets/KoboldKare/Materials/BucketWater.mat
@@ -10,10 +10,7 @@ Material:
   m_Name: BucketWater
   m_Shader: {fileID: 4800000, guid: a9cde6543f2604b4cbd3023847cb9c0b, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _BLENDMODE_ALPHA
-  - _ENABLE_FOG_ON_TRANSPARENT
-  - _SURFACE_TYPE_TRANSPARENT
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/Casino/BarrelOil.mat b/Assets/KoboldKare/Materials/Casino/BarrelOil.mat
@@ -22,11 +22,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: BarrelOil
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
-  m_ValidKeywords:
-  - _ENVIRONMENTREFLECTIONS_OFF
-  m_InvalidKeywords:
-  - _NORMALMAP
-  - _NORMALMAP_ON
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/Casino/BlackedOut.mat b/Assets/KoboldKare/Materials/Casino/BlackedOut.mat
@@ -9,9 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: BlackedOut
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
-  m_ValidKeywords:
-  - _ENVIRONMENTREFLECTIONS_OFF
-  - _SPECULARHIGHLIGHTS_OFF
+  m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0

diff --git a/Assets/KoboldKare/Materials/Casino/CasinoLongRug.mat b/Assets/KoboldKare/Materials/Casino/CasinoLongRug.mat
@@ -9,8 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: CasinoLongRug
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
-  m_ValidKeywords:
-  - _ENVIRONMENTREFLECTIONS_OFF
+  m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0

diff --git a/Assets/KoboldKare/Materials/Casino/CasinoPigIron.mat b/Assets/KoboldKare/Materials/Casino/CasinoPigIron.mat
@@ -22,11 +22,7 @@ Material:
   m_Name: CasinoPigIron
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _METALLICGLOSSMAP_ON
-  - _METALLICSPECGLOSSMAP
-  - _NORMALMAP
-  - _NORMALMAP_ON
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/Casino/CasinoRoundRug.mat b/Assets/KoboldKare/Materials/Casino/CasinoRoundRug.mat
@@ -10,9 +10,7 @@ Material:
   m_Name: CasinoRoundRug
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _METALLICGLOSSMAP_ON
-  - _METALLICSPECGLOSSMAP
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/Casino/CasinoWalls.mat b/Assets/KoboldKare/Materials/Casino/CasinoWalls.mat
@@ -10,9 +10,7 @@ Material:
   m_Name: CasinoWalls
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _METALLICSPECGLOSSMAP
-  - _NORMALMAP
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/Casino/GlossyDarkTile.mat b/Assets/KoboldKare/Materials/Casino/GlossyDarkTile.mat
@@ -23,9 +23,7 @@ Material:
   m_Name: GlossyDarkTile
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _METALLICSPECGLOSSMAP
-  - _NORMALMAP
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/Casino/TexturedBrass.mat b/Assets/KoboldKare/Materials/Casino/TexturedBrass.mat
@@ -23,10 +23,7 @@ Material:
   m_Name: TexturedBrass
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - ETC1_EXTERNAL_ALPHA
-  - _METALLICGLOSSMAP_ON
-  - _NORMALMAP_ON
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/Casino/TexturedBrassLitCheat.mat b/Assets/KoboldKare/Materials/Casino/TexturedBrassLitCheat.mat
@@ -23,10 +23,7 @@ Material:
   m_Name: TexturedBrassLitCheat
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - ETC1_EXTERNAL_ALPHA
-  - _METALLICGLOSSMAP_ON
-  - _NORMALMAP_ON
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/CasinoStatue.mat b/Assets/KoboldKare/Materials/CasinoStatue.mat
@@ -8,11 +8,9 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: CasinoStatue
-  m_Shader: {fileID: 4800000, guid: def7000896e247349bf958c5d2a9a6f2, type: 3}
+  m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _METALLICSPECGLOSSMAP
-  - _NORMALMAP
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -27,13 +25,17 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: d5c584b67ceac5b4091792287ad880ce, type: 3}
+        m_Texture: {fileID: 2800000, guid: 239fcb087d0d9ed43b00d56d65a0fe65, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
         m_Texture: {fileID: 2800000, guid: 36b991cc26140d347911bd6551a1e5ec, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DecalColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _EmissionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -47,7 +49,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
-        m_Texture: {fileID: 2800000, guid: 14a404288a962d44a970f91cf82141a2, type: 3}
+        m_Texture: {fileID: 2800000, guid: 57078855b91c0fb44a829e52f7db3f7a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _Normal:
@@ -116,7 +118,7 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.3531061, g: 0.6509434, b: 0.49749133, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.3333037, g: 0.6603774, b: 0.37870046, a: 1}
     - _Color0: {r: 0.2706924, g: 0.7264151, b: 0.6900828, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

diff --git a/Assets/KoboldKare/Materials/Egg.mat b/Assets/KoboldKare/Materials/Egg.mat
@@ -10,12 +10,7 @@ Material:
   m_Name: Egg
   m_Shader: {fileID: 4800000, guid: a3a4b45780bd450459e93b3068a3fdf5, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _DISABLE_SSR
-  - _DOUBLESIDED_ON
-  - _MASKMAP
-  - _NORMALMAP
-  - _NORMALMAP_TANGENT_SPACE
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
@@ -48,8 +43,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
-        m_Texture: {fileID: 8941042731460528134, guid: 3034a39973236e94e9df49e1d4459f9b,
-          type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _CoatMaskMap:
@@ -101,8 +95,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 5237496738794762702, guid: 3034a39973236e94e9df49e1d4459f9b,
-          type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MaskMap:

diff --git a/Assets/KoboldKare/Materials/EquineDildo.mat b/Assets/KoboldKare/Materials/EquineDildo.mat
@@ -23,10 +23,7 @@ Material:
   m_Name: EquineDildo
   m_Shader: {fileID: 4800000, guid: a3a4b45780bd450459e93b3068a3fdf5, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _DEFORM_BALLS_ON
-  - _METALLICSPECGLOSSMAP
-  - _NORMALMAP
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/FarmFence.mat b/Assets/KoboldKare/Materials/FarmFence.mat
@@ -23,11 +23,7 @@ Material:
   m_Name: FarmFence
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _METALLICGLOSSMAP_ON
-  - _METALLICSPECGLOSSMAP
-  - _NORMALMAP
-  - _NORMALMAP_ON
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/Hay.mat b/Assets/KoboldKare/Materials/Hay.mat
@@ -23,9 +23,7 @@ Material:
   m_Name: Hay
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _METALLICGLOSSMAP_ON
-  - _NORMALMAP_ON
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/HayTransparent.mat b/Assets/KoboldKare/Materials/HayTransparent.mat
@@ -23,9 +23,7 @@ Material:
   m_Name: HayTransparent
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _METALLICGLOSSMAP_ON
-  - _NORMALMAP_ON
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/HumanoidPenis.mat b/Assets/KoboldKare/Materials/HumanoidPenis.mat
@@ -23,10 +23,7 @@ Material:
   m_Name: HumanoidPenis
   m_Shader: {fileID: 4800000, guid: a3a4b45780bd450459e93b3068a3fdf5, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _DEFORM_BALLS_ON
-  - _METALLICSPECGLOSSMAP
-  - _NORMALMAP
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/JapaneseBrick.mat b/Assets/KoboldKare/Materials/JapaneseBrick.mat
@@ -10,9 +10,7 @@ Material:
   m_Name: JapaneseBrick
   m_Shader: {fileID: 4800000, guid: 9360c483d0aebd74f89a07886916938c, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _METALLICGLOSSMAP_ON
-  - _NORMALMAP_ON
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/KandiDickFlared.mat b/Assets/KoboldKare/Materials/KandiDickFlared.mat
@@ -10,20 +10,7 @@ Material:
   m_Name: KandiDickFlared
   m_Shader: {fileID: 4800000, guid: a3a4b45780bd450459e93b3068a3fdf5, type: 3}
   m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _DEFORM_BALLS_ON
-  - _DISABLE_SSR
-  - _DISPLACEMENT_LOCK_TILING_SCALE
-  - _EMISSION
-  - _MASKMAP
-  - _MATERIAL_FEATURE_SUBSURFACE_SCATTERING
-  - _MATERIAL_FEATURE_TRANSMISSION
-  - _METALLICGLOSSMAP
-  - _NORMALMAP
-  - _NORMALMAP_TANGENT_SPACE
-  - _THICKNESSMAP
-  - _VERTEX_DISPLACEMENT
-  - _VERTEX_DISPLACEMENT_LOCK_OBJECT_SCALE
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0

diff --git a/Assets/KoboldKare/Materials/Kobold.mat b/Assets/KoboldKare/Materials/Kobold.mat
@@ -11,18 +11,8 @@ Material:
   m_Shader: {fileID: 4800000, guid: bc0a95306787ee14c8cba6b6697de1e1, type: 3}
   m_ValidKeywords:
   - _PENETRATION_DEFORMATION_DETAIL_ON
-  m_InvalidKeywords:
-  - _DISPLACEMENT_LOCK_TILING_SCALE
-  - _EMISSION
-  - _MASKMAP
-  - _MATERIAL_FEATURE_SUBSURFACE_SCATTERING
-  - _MATERIAL_FEATURE_TRANSMISSION
-  - _METALLICGLOSSMAP
-  - _NORMALMAP
-  - _NORMALMAP_TANGENT_SPACE
-  - _THICKNESSMAP
-  - _VERTEX_DISPLACEMENT
-  - _VERTEX_DISPLACEMENT_LOCK_OBJECT_SCALE
+  - _PENETRATION_DEFORMATION_ON
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0