maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #42543 from clayjohn/vertex-lighting-bug

Browse source 
Force vertex shading in SpatialMaterial when used
This commit is contained in:
Rémi Verschelde 2021-05-07 00:48:32 +02:00 committed by GitHub
parent dc612a7651 0445531ced
commit 64403ddcab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scene/resources/material.cpp
View file

@ -31,6 +31,7 @@
#include "material.h"
#include "core/engine.h"
#include "core/project_settings.h"
#ifdef TOOLS_ENABLED
#include "editor/editor_settings.h"
@ -473,7 +474,7 @@ void SpatialMaterial::_update_shader() {
if (flags[FLAG_DISABLE_DEPTH_TEST]) {
code += ",depth_test_disable";
}
if (flags[FLAG_USE_VERTEX_LIGHTING]) {
if (flags[FLAG_USE_VERTEX_LIGHTING] || force_vertex_shading) {
code += ",vertex_lighting";
}
if (flags[FLAG_TRIPLANAR_USE_WORLD] && (flags[FLAG_UV1_USE_TRIPLANAR] || flags[FLAG_UV2_USE_TRIPLANAR])) {
@ -623,7 +624,7 @@ void SpatialMaterial::_update_shader() {
code += "\tPOINT_SIZE=point_size;\n";
}
if (flags[FLAG_USE_VERTEX_LIGHTING]) {
if (flags[FLAG_USE_VERTEX_LIGHTING] || force_vertex_shading) {
code += "\tROUGHNESS=roughness;\n";
}
@ -2300,6 +2301,9 @@ SpatialMaterial::SpatialMaterial() :
for (int i = 0; i < FLAG_MAX; i++) {
flags[i] = false;
}
force_vertex_shading = GLOBAL_GET("rendering/quality/shading/force_vertex_shading");
diffuse_mode = DIFFUSE_BURLEY;
specular_mode = SPECULAR_SCHLICK_GGX;

2
scene/resources/material.h
View file

@ -434,6 +434,8 @@ private:
Ref<Texture> textures[TEXTURE_MAX];
bool force_vertex_shading = false;
_FORCE_INLINE_ void _validate_feature(const String &text, Feature feature, PropertyInfo &property) const;
static const int MAX_MATERIALS_FOR_2D = 128;