Fix cube and floor materials using hand-drawn maps [closes #67]

Delt06 · May 7, 2023 · bb99a85 · bb99a85
1 parent 94a1477
commit bb99a85
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 11 deletions.
diff --git a/Assets/Samples/Toon RP_Cube.mat b/Assets/Samples/Toon RP_Cube.mat
@@ -9,13 +9,15 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Toon RP_Cube
   m_Shader: {fileID: 4800000, guid: 66d261cceb43446dbdd99389a7ed8411, type: 3}
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _OVERRIDE_RAMP
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
+  m_CustomRenderQueue: 2000
+  stringTagMap:
+    RenderType: Opaque
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
@@ -28,18 +30,39 @@ Material:
         m_Texture: {fileID: 10309, guid: 0000000000000000f000000000000000, type: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
-    m_Ints: []
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints:
+    - _ForwardStencilComp: 0
+    - _ForwardStencilPass: 0
+    - _ForwardStencilRef: 0
+    - _ForwardStencilWriteMask: 0
     m_Floats:
-    - _OverrideRamp: 0
-    - _OverrideRamp_Smoothness: 0.083
+    - _AlphaClipThreshold: 0.5
+    - _AlphaClipping: 0
+    - _BlendDst: 0
+    - _BlendMode: 0
+    - _BlendSrc: 1
+    - _OutlinesStencilLayer: 0
+    - _OverrideRamp: 1
+    - _OverrideRamp_RimSmoothness: 0.1
+    - _OverrideRamp_RimThreshold: 0.5
+    - _OverrideRamp_Smoothness: 0.25
     - _OverrideRamp_SpecularSmoothness: 0.005
     - _OverrideRamp_SpecularThreshold: 0.995
-    - _OverrideRamp_Threshold: 0
+    - _OverrideRamp_Threshold: 0.25
+    - _QueueOffset: 0
     - _ReceiveBlobShadows: 0
+    - _RenderFace: 2
     - _SpecularExponent: 52.31
+    - _SurfaceType: 0
+    - _ZWrite: 1
     m_Colors:
     - _AlbedoColor: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor: {r: 0, g: 0.46625757, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
     - _MainColor: {r: 0.19339621, g: 0.5844207, b: 1, a: 1}
     - _RimColor: {r: 0, g: 0, b: 0, a: 1}
     - _ShadowColor: {r: 0, g: 0, b: 0, a: 0.75}

diff --git a/Assets/Samples/Toon RP_Floor.mat b/Assets/Samples/Toon RP_Floor.mat
@@ -10,6 +10,7 @@ Material:
   m_Name: Toon RP_Floor
   m_Shader: {fileID: 4800000, guid: 66d261cceb43446dbdd99389a7ed8411, type: 3}
   m_ValidKeywords:
+  - _OVERRIDE_RAMP
   - _RECEIVE_BLOB_SHADOWS
   m_InvalidKeywords: []
   m_LightmapFlags: 4
@@ -28,7 +29,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     - _MainTexture:
         m_Texture: {fileID: 10309, guid: 0000000000000000f000000000000000, type: 0}
-        m_Scale: {x: 20, y: 20}
+        m_Scale: {x: 10, y: 10}
         m_Offset: {x: 0, y: 0}
     - _NormalMap:
         m_Texture: {fileID: 0}
@@ -42,20 +43,27 @@ Material:
     m_Floats:
     - _AlphaClipThreshold: 0.5
     - _AlphaClipping: 0
+    - _BlendDst: 0
+    - _BlendMode: 0
+    - _BlendSrc: 1
     - _OutlinesStencilLayer: 0
-    - _OverrideRamp: 0
+    - _OverrideRamp: 1
     - _OverrideRamp_RimSmoothness: 0.1
     - _OverrideRamp_RimThreshold: 0.5
-    - _OverrideRamp_Smoothness: 0.083
+    - _OverrideRamp_Smoothness: 0.25
     - _OverrideRamp_SpecularSmoothness: 0.005
     - _OverrideRamp_SpecularThreshold: 0.995
-    - _OverrideRamp_Threshold: 0
+    - _OverrideRamp_Threshold: 0.25
     - _QueueOffset: 0
     - _ReceiveBlobShadows: 1
+    - _RenderFace: 2
     - _SpecularExponent: 52.31
+    - _SurfaceType: 0
+    - _ZWrite: 1
     m_Colors:
     - _AlbedoColor: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColor: {r: 0, g: 0.46625757, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
     - _MainColor: {r: 1, g: 1, b: 1, a: 1}
     - _RimColor: {r: 0, g: 0, b: 0, a: 1}
     - _ShadowColor: {r: 0, g: 0, b: 0, a: 0.75}