godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Rename uniform to parameter across the engine

Browse Source
This commit is contained in:
Yuri Rubinsky
2022-08-27 12:22:43 +03:00
parent 1c037c89d4
commit 8191b3c110
80 changed files with 1523 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
editor/plugins/texture_layered_editor_plugin.cpp
View File

@@ -68,9 +68,9 @@ void TextureLayeredEditor::_texture_changed() {
}
void TextureLayeredEditor::_update_material() {
materials[0]->set_shader_uniform("layer", layer->get_value());
materials[2]->set_shader_uniform("layer", layer->get_value());
materials[texture->get_layered_type()]->set_shader_uniform("tex", texture->get_rid());
materials[0]->set_shader_parameter("layer", layer->get_value());
materials[2]->set_shader_parameter("layer", layer->get_value());
materials[texture->get_layered_type()]->set_shader_parameter("tex", texture->get_rid());
Vector3 v(1, 1, 1);
v.normalize();
@@ -79,10 +79,10 @@ void TextureLayeredEditor::_update_material() {
b.rotate(Vector3(1, 0, 0), x_rot);
b.rotate(Vector3(0, 1, 0), y_rot);
materials[1]->set_shader_uniform("normal", v);
materials[1]->set_shader_uniform("rot", b);
materials[2]->set_shader_uniform("normal", v);
materials[2]->set_shader_uniform("rot", b);
materials[1]->set_shader_parameter("normal", v);
materials[1]->set_shader_parameter("rot", b);
materials[2]->set_shader_parameter("normal", v);
materials[2]->set_shader_parameter("rot", b);
String format = Image::get_format_name(texture->get_format());