diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-20 11:14:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-20 11:14:31 +0100 |
| commit | 2c44b2cee4e7f52fcbf5bfe69927017125da3575 (patch) | |
| tree | 8b89d1c85f5ca7e9821b3ef18dbf41b5dc54c626 | |
| parent | 4b562aaf0c734bd774aeec0763056ff218a7fda6 (diff) | |
| parent | b5e4f637fc6d2ef9d1dec28bfdb9df9e3515e759 (diff) | |
Merge pull request #16718 from Chaosus/triplanarfix
Add refraction possibility when triplanar uv mode enabled
| -rw-r--r-- | scene/resources/material.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 8a1978cf85..ceac65ffa7 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -737,15 +737,18 @@ void SpatialMaterial::_update_shader() { } } - if (features[FEATURE_REFRACTION] && !flags[FLAG_UV1_USE_TRIPLANAR]) { //refraction not supported with triplanar + if (features[FEATURE_REFRACTION]) { if (features[FEATURE_NORMAL_MAPPING]) { code += "\tvec3 ref_normal = normalize( mix(NORMAL,TANGENT * NORMALMAP.x + BINORMAL * NORMALMAP.y + NORMAL * NORMALMAP.z,NORMALMAP_DEPTH) );\n"; } else { code += "\tvec3 ref_normal = NORMAL;\n"; } - - code += "\tvec2 ref_ofs = SCREEN_UV - ref_normal.xy * dot(texture(texture_refraction,base_uv),refraction_texture_channel) * refraction;\n"; + if (flags[FLAG_UV1_USE_TRIPLANAR]) { + code += "\tvec2 ref_ofs = SCREEN_UV - ref_normal.xy * dot(triplanar_texture(texture_refraction,uv1_power_normal,uv1_triplanar_pos),refraction_texture_channel) * refraction;\n"; + } else { + code += "\tvec2 ref_ofs = SCREEN_UV - ref_normal.xy * dot(texture(texture_refraction,base_uv),refraction_texture_channel) * refraction;\n"; + } code += "\tfloat ref_amount = 1.0 - albedo.a * albedo_tex.a;\n"; code += "\tEMISSION += textureLod(SCREEN_TEXTURE,ref_ofs,ROUGHNESS * 8.0).rgb * ref_amount;\n"; code += "\tALBEDO *= 1.0 - ref_amount;\n"; |