godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-19 14:31:59 +00:00
Code Releases Wiki Activity

Merge pull request #60803 from Chaosus/shader_hint_rename

Browse Source 
Rename `hint_albedo`, `hint_white/black` in shaders
This commit is contained in:
Rémi Verschelde
2022-05-24 08:15:33 +02:00
committed by GitHub
parent db5a86339b a8bbe570ca
commit 1314e6cbcc
11 changed files with 199 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/resources/particles_material.cpp
View File

@@ -197,14 +197,14 @@ void ParticlesMaterial::_update_shader() {
code += "uniform vec3 emission_box_extents;\n";
} break;
case EMISSION_SHAPE_DIRECTED_POINTS: {
code += "uniform sampler2D emission_texture_normal : hint_black;\n";
code += "uniform sampler2D emission_texture_normal : hint_default_black;\n";
[[fallthrough]];
}
case EMISSION_SHAPE_POINTS: {
code += "uniform sampler2D emission_texture_points : hint_black;\n";
code += "uniform sampler2D emission_texture_points : hint_default_black;\n";
code += "uniform int emission_texture_point_count;\n";
if (emission_color_texture.is_valid()) {
code += "uniform sampler2D emission_texture_color : hint_white;\n";
code += "uniform sampler2D emission_texture_color : hint_default_white;\n";
}
} break;
case EMISSION_SHAPE_RING: {
@@ -228,7 +228,7 @@ void ParticlesMaterial::_update_shader() {
code += "uniform bool sub_emitter_keep_velocity;\n";
}
code += "uniform vec4 color_value : hint_color;\n";
code += "uniform vec4 color_value : source_color;\n";
code += "uniform vec3 gravity;\n";