Update effects (#9149)

This commit is contained in:
pandamicro
2021-08-06 22:16:45 +08:00
committed by GitHub
parent 333e39d100
commit 248d674c2a
5 changed files with 14 additions and 11 deletions
+7 -4
View File
@@ -343,7 +343,7 @@ export const effects = [
"shaders": [
{
"name": "standard|standard-vs|standard-fs",
"hash": 1413315494,
"hash": 3887038508,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 217, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 60 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }, { "name": "CCShadow", "defines": [] }], "samplerTextures": [{ "name": "cc_shadowMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_spotLightingMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_environment", "defines": ["CC_USE_IBL"] }] },
@@ -381,7 +381,8 @@ export const effects = [
{ "name": "EMISSIVE_UV", "type": "string", "options": ["v_uv", "v_uv1"] },
{ "name": "USE_ALPHA_TEST", "type": "boolean" },
{ "name": "ALPHA_TEST_CHANNEL", "type": "string", "options": ["a", "r"] },
{ "name": "CC_PIPELINE_TYPE", "type": "number", "range": [0, 1] }
{ "name": "CC_PIPELINE_TYPE", "type": "number", "range": [0, 1] },
{ "name": "CC_STANDARD_TRANSPARENT", "type": "boolean" }
],
"blocks": [
{"name": "Constants", "defines": [], "binding": 0, "stageFlags": 17, "members": [
@@ -487,7 +488,7 @@ export const effects = [
"shaders": [
{
"name": "terrain|terrain-vs|terrain-fs",
"hash": 3393045613,
"hash": 1309646336,
"builtins": {
"statistics": { "CC_EFFECT_USED_VERTEX_UNIFORM_VECTORS": 64, "CC_EFFECT_USED_FRAGMENT_UNIFORM_VECTORS": 55 },
"globals": { "blocks": [{ "name": "CCGlobal", "defines": [] }, { "name": "CCCamera", "defines": [] }, { "name": "CCShadow", "defines": [] }], "samplerTextures": [{ "name": "cc_shadowMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_spotLightingMap", "defines": ["CC_RECEIVE_SHADOW"] }, { "name": "cc_environment", "defines": ["CC_USE_IBL"] }] },
@@ -504,7 +505,8 @@ export const effects = [
{ "name": "CC_USE_HDR", "type": "boolean" },
{ "name": "LAYERS", "type": "number", "range": [0, 4] },
{ "name": "USE_PBR", "type": "boolean" },
{ "name": "CC_PIPELINE_TYPE", "type": "number", "range": [0, 1] }
{ "name": "CC_PIPELINE_TYPE", "type": "number", "range": [0, 1] },
{ "name": "CC_STANDARD_TRANSPARENT", "type": "boolean" }
],
"blocks": [
{"name": "TexCoords", "defines": [], "binding": 0, "stageFlags": 1, "members": [
@@ -641,6 +643,7 @@ export const effects = [
{ "name": "CC_FORWARD_ADD", "type": "boolean" },
{ "name": "CC_USE_HDR", "type": "boolean" },
{ "name": "CC_PIPELINE_TYPE", "type": "number", "range": [0, 1] },
{ "name": "CC_STANDARD_TRANSPARENT", "type": "boolean" },
{ "name": "CC_USE_FOG", "type": "number", "range": [0, 4] }
],
"blocks": [],
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -29,7 +29,7 @@
CC_APPLY_FOG(color); \
fragColorX = CCFragOutput(color); \
} \
\ \
\
#elif CC_PIPELINE_TYPE == CC_PIPELINE_TYPE_DEFERRED \
\
layout(location = 0) out vec4 fragColor0; \