From 3ca0a8cd8dbe069f097f2cfd6f1f231bd51d4dd3 Mon Sep 17 00:00:00 2001 From: Philip Rideout Date: Mon, 3 Aug 2020 10:51:26 -0700 Subject: [PATCH] Transmission should use FADE. (#2908) Fixed #2907. --- libs/gltfio/CMakeLists.txt | 2 +- libs/gltfio/materials/transmission.mat.in | 2 +- libs/gltfio/src/MaterialGenerator.cpp | 2 +- libs/gltfio/src/UbershaderLoader.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/gltfio/CMakeLists.txt b/libs/gltfio/CMakeLists.txt index 5f4519ee1a..65bf14300a 100644 --- a/libs/gltfio/CMakeLists.txt +++ b/libs/gltfio/CMakeLists.txt @@ -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}) diff --git a/libs/gltfio/materials/transmission.mat.in b/libs/gltfio/materials/transmission.mat.in index a74c849eda..9380d30a31 100644 --- a/libs/gltfio/materials/transmission.mat.in +++ b/libs/gltfio/materials/transmission.mat.in @@ -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, diff --git a/libs/gltfio/src/MaterialGenerator.cpp b/libs/gltfio/src/MaterialGenerator.cpp index e9f0738081..825483251a 100644 --- a/libs/gltfio/src/MaterialGenerator.cpp +++ b/libs/gltfio/src/MaterialGenerator.cpp @@ -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 { diff --git a/libs/gltfio/src/UbershaderLoader.cpp b/libs/gltfio/src/UbershaderLoader.cpp index a3e4c72551..f38d73a182 100644 --- a/libs/gltfio/src/UbershaderLoader.cpp +++ b/libs/gltfio/src/UbershaderLoader.cpp @@ -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) {