hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename shader parameter uniform setter/getter methods for consistency

Browse source 
`shader_uniform` is now consistenly used across both per-shader
and per-instance shader uniform methods. This makes methods easier
to find in the class reference when looking for them.
This commit is contained in:
Hugo Locurcio 2022-04-03 19:09:09 +02:00
parent 80193260ff
commit db22b7ded0
No known key found for this signature in database
GPG key ID: 39E8F8BE30B0A49C
47 changed files with 211 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scene/resources/shader.cpp
View file

@ -103,11 +103,11 @@ String Shader::get_code() const {
return code;
}
void Shader::get_param_list(List<PropertyInfo> *p_params, bool p_get_groups) const {
void Shader::get_shader_uniform_list(List<PropertyInfo> *p_params, bool p_get_groups) const {
_update_shader();
List<PropertyInfo> local;
RenderingServer::get_singleton()->shader_get_param_list(shader, &local);
RenderingServer::get_singleton()->shader_get_shader_uniform_list(shader, &local);
params_cache.clear();
params_cache_dirty = false;
@ -176,8 +176,8 @@ bool Shader::is_text_shader() const {
return true;
}
bool Shader::has_param(const StringName &p_param) const {
return params_cache.has("shader_param/" + p_param);
bool Shader::has_uniform(const StringName &p_param) const {
return params_cache.has("shader_uniform/" + p_param);
}
void Shader::_update_shader() const {
@ -192,7 +192,7 @@ void Shader::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_default_texture_param", "param", "texture", "index"), &Shader::set_default_texture_param, DEFVAL(0));
ClassDB::bind_method(D_METHOD("get_default_texture_param", "param", "index"), &Shader::get_default_texture_param, DEFVAL(0));
ClassDB::bind_method(D_METHOD("has_param", "name"), &Shader::has_param);
ClassDB::bind_method(D_METHOD("has_uniform", "name"), &Shader::has_uniform);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "code", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), "set_code", "get_code");