Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Transmission should use FADE. (#2908)

Browse Source 
Fixed #2907.
This commit is contained in:
Philip Rideout
2020-08-03 10:51:26 -07:00
committed by GitHub
parent 2c18d7f576
commit 3ca0a8cd8d
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/gltfio/CMakeLists.txt
View File

@@ -66,7 +66,7 @@ generate_mat(ubershader specularGlossiness masked)
generate_mat(ubershader unlit fade)
generate_mat(ubershader unlit opaque)
generate_mat(ubershader unlit masked)
generate_mat(transmission lit transparent)
generate_mat(transmission lit transmission)
set(RESOURCE_BINS)
foreach (input_path ${MATERIAL_SRCS})

2
libs/gltfio/materials/transmission.mat.in
View File

@@ -2,7 +2,7 @@ material {
name : transmission_${SHADINGMODEL}_${BLENDING},
requires : [ uv0, uv1, color ],
shadingModel : ${SHADINGMODEL},
blending : ${BLENDING},
blending : fade,
depthWrite : true,
doubleSided : ${DOUBLESIDED},
flipUV : false,

2
libs/gltfio/src/MaterialGenerator.cpp
View File

@@ -388,7 +388,7 @@ Material* createMaterial(Engine* engine, const MaterialKey& config, const UvMap&
}
}
builder.blending(MaterialBuilder::BlendingMode::TRANSPARENT);
builder.blending(MaterialBuilder::BlendingMode::FADE);
builder.depthWrite(true);
} else {

2
libs/gltfio/src/UbershaderLoader.cpp
View File

@@ -135,7 +135,7 @@ Material* UbershaderLoader::getMaterial(const MaterialKey& config) const {
case MATINDEX(SPECULAR_GLOSSINESS, AlphaMode::OPAQUE, false): mMaterials[matindex] = CREATE_MATERIAL(SPECULARGLOSSINESS_OPAQUE); break;
case MATINDEX(SPECULAR_GLOSSINESS, AlphaMode::MASK, false): mMaterials[matindex] = CREATE_MATERIAL(SPECULARGLOSSINESS_MASKED); break;
case MATINDEX(SPECULAR_GLOSSINESS, AlphaMode::BLEND, false): mMaterials[matindex] = CREATE_MATERIAL(SPECULARGLOSSINESS_FADE); break;
case MATINDEX(0, 0, true): mMaterials[matindex] = CREATE_MATERIAL(LIT_TRANSPARENT); break;
case MATINDEX(0, 0, true): mMaterials[matindex] = CREATE_MATERIAL(LIT_TRANSMISSION); break;
#endif
}
if (mMaterials[matindex] == nullptr) {