[Bug] fix shadowmap material (cocos#357)

qiuguohua · Nov 25, 2020 · 9d412d0 · 9d412d0
1 parent 22468ab
commit 9d412d0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 92 deletions.
diff --git a/assets/cases/shadow-map/cocos/body-instanced.mtl b/assets/cases/shadow-map/cocos/body-instanced.mtl
@@ -15,18 +15,8 @@
       "USE_PBR_MAP": true,
       "USE_EMISSIVE_MAP": true
     },
-    {
-      "USE_INSTANCING": true,
-      "USE_NORMAL_MAP": true,
-      "HAS_SECOND_UV": true,
-      "USE_ALBEDO_MAP": true,
-      "USE_PBR_MAP": true,
-      "USE_EMISSIVE_MAP": true,
-      "USE_ALPHA_TEST": true
-    },
-    {
-      "USE_INSTANCING": true
-    }
+    {},
+    {}
   ],
   "_states": [
     {
@@ -38,24 +28,8 @@
       "depthStencilState": {},
       "rasterizerState": {}
     },
-    {
-      "blendState": {
-        "targets": [
-          {}
-        ]
-      },
-      "depthStencilState": {},
-      "rasterizerState": {}
-    },
-    {
-      "blendState": {
-        "targets": [
-          {}
-        ]
-      },
-      "depthStencilState": {},
-      "rasterizerState": {}
-    }
+    {},
+    {}
   ],
   "_props": [
     {

diff --git a/assets/cases/shadow-map/cocos/body.mtl b/assets/cases/shadow-map/cocos/body.mtl
@@ -14,18 +14,8 @@
       "USE_PBR_MAP": true,
       "USE_EMISSIVE_MAP": true
     },
-    {
-      "USE_NORMAL_MAP": true,
-      "USE_ALBEDO_MAP": true,
-      "ALBEDO_UV": "v_uv1",
-      "PBR_UV": "v_uv1",
-      "USE_PBR_MAP": true,
-      "USE_EMISSIVE_MAP": true
-    },
-    {
-      "USE_ALBEDO_MAP": true,
-      "ALBEDO_UV": "v_uv1"
-    }
+    {},
+    {}
   ],
   "_states": [
     {
@@ -37,24 +27,8 @@
       "depthStencilState": {},
       "rasterizerState": {}
     },
-    {
-      "blendState": {
-        "targets": [
-          {}
-        ]
-      },
-      "depthStencilState": {},
-      "rasterizerState": {}
-    },
-    {
-      "blendState": {
-        "targets": [
-          {}
-        ]
-      },
-      "depthStencilState": {},
-      "rasterizerState": {}
-    }
+    {},
+    {}
   ],
   "_props": [
     {

diff --git a/assets/cases/shadow-map/cocos/helmet-instanced.mtl b/assets/cases/shadow-map/cocos/helmet-instanced.mtl
@@ -12,10 +12,10 @@
       "USE_INSTANCING": true,
       "USE_NORMAL_MAP": true,
       "USE_ALBEDO_MAP": true,
-      "USE_PBR_MAP": true,
-      "OCCLUSION_CHANNEL": "b",
-      "METALLIC_CHANNEL": "r"
-    }
+      "USE_PBR_MAP": true
+    },
+    {},
+    {}
   ],
   "_states": [
     {
@@ -26,7 +26,9 @@
       },
       "depthStencilState": {},
       "rasterizerState": {}
-    }
+    },
+    {},
+    {}
   ],
   "_props": [
     {
@@ -39,6 +41,8 @@
       "pbrMap": {
         "__uuid__": "83f22f4a-e661-420e-9d43-f855964e22d3@6c48a"
       }
-    }
+    },
+    {},
+    {}
   ]
 }
diff --git a/assets/cases/shadow-map/cocos/helmet.mtl b/assets/cases/shadow-map/cocos/helmet.mtl
@@ -13,14 +13,8 @@
       "USE_ALBEDO_MAP": true,
       "USE_PBR_MAP": true
     },
-    {
-      "USE_NORMAL_MAP": true,
-      "USE_ALBEDO_MAP": true,
-      "USE_PBR_MAP": true
-    },
-    {
-      "USE_ALBEDO_MAP": true
-    }
+    {},
+    {}
   ],
   "_states": [
     {
@@ -32,24 +26,8 @@
       "depthStencilState": {},
       "rasterizerState": {}
     },
-    {
-      "blendState": {
-        "targets": [
-          {}
-        ]
-      },
-      "depthStencilState": {},
-      "rasterizerState": {}
-    },
-    {
-      "blendState": {
-        "targets": [
-          {}
-        ]
-      },
-      "depthStencilState": {},
-      "rasterizerState": {}
-    }
+    {},
+    {}
   ],
   "_props": [
     {