From dd06f6ee70543de0cb61ed9deef568c16c51fedc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 28 Nov 2018 10:21:07 +0100 Subject: [PATCH] Fix style issues and signature mismatch --- drivers/gles2/shaders/scene.glsl | 2 -- drivers/gles3/shaders/canvas.glsl | 2 +- drivers/gles3/shaders/effect_blur.glsl | 2 +- drivers/gles3/shaders/scene.glsl | 4 ++-- editor/editor_folding.cpp | 32 ++++++++++++-------------- scene/resources/environment.cpp | 4 ++-- 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/drivers/gles2/shaders/scene.glsl b/drivers/gles2/shaders/scene.glsl index bc83b69b49..3deb4e5467 100644 --- a/drivers/gles2/shaders/scene.glsl +++ b/drivers/gles2/shaders/scene.glsl @@ -84,8 +84,6 @@ uniform highp mat4 world_transform; uniform highp float time; - - #ifdef RENDER_DEPTH uniform float light_bias; uniform float light_normal_bias; diff --git a/drivers/gles3/shaders/canvas.glsl b/drivers/gles3/shaders/canvas.glsl index 86d8cf560e..51a4edd233 100644 --- a/drivers/gles3/shaders/canvas.glsl +++ b/drivers/gles3/shaders/canvas.glsl @@ -477,7 +477,7 @@ void main() { #if defined(NORMALMAP_USED) vec3 normal_map = vec3(0.0, 0.0, 1.0); - normal_used=true; + normal_used = true; #endif /* clang-format off */ diff --git a/drivers/gles3/shaders/effect_blur.glsl b/drivers/gles3/shaders/effect_blur.glsl index 2518cd7cd0..fc15ca31b1 100644 --- a/drivers/gles3/shaders/effect_blur.glsl +++ b/drivers/gles3/shaders/effect_blur.glsl @@ -272,7 +272,7 @@ void main() { float luminance = max(frag_color.r, max(frag_color.g, frag_color.b)); float feedback = max(smoothstep(glow_hdr_threshold, glow_hdr_threshold + glow_hdr_scale, luminance), glow_bloom); - frag_color = min( frag_color * feedback, vec4(luminance_cap) ); + frag_color = min(frag_color * feedback, vec4(luminance_cap)); #endif diff --git a/drivers/gles3/shaders/scene.glsl b/drivers/gles3/shaders/scene.glsl index e2e3584304..407e7ec591 100644 --- a/drivers/gles3/shaders/scene.glsl +++ b/drivers/gles3/shaders/scene.glsl @@ -1590,8 +1590,8 @@ void main() { #endif #if defined(ENABLE_TANGENT_INTERP) || defined(ENABLE_NORMALMAP) || defined(LIGHT_USE_ANISOTROPY) - vec3 binormal = normalize(binormal_interp);// * side; - vec3 tangent = normalize(tangent_interp);// * side; + vec3 binormal = normalize(binormal_interp); + vec3 tangent = normalize(tangent_interp); #else vec3 binormal = vec3(0.0); vec3 tangent = vec3(0.0); diff --git a/editor/editor_folding.cpp b/editor/editor_folding.cpp index 776342582c..a88cd740db 100644 --- a/editor/editor_folding.cpp +++ b/editor/editor_folding.cpp @@ -1,8 +1,8 @@ #include "editor_folding.h" #include "core/os/file_access.h" -#include "editor_settings.h" #include "editor_inspector.h" +#include "editor_settings.h" PoolVector EditorFolding::_get_unfolds(const Object *p_object) { @@ -172,7 +172,6 @@ bool EditorFolding::has_folding_data(const String &p_path) { return FileAccess::exists(file); } - void EditorFolding::_do_object_unfolds(Object *p_object, Set &resources) { List plist; @@ -185,34 +184,33 @@ void EditorFolding::_do_object_unfolds(Object *p_object, Set &resources) { for (List::Element *E = plist.front(); E; E = E->next()) { if (E->get().usage & PROPERTY_USAGE_CATEGORY) { - group=""; - group_base=""; + group = ""; + group_base = ""; } if (E->get().usage & PROPERTY_USAGE_GROUP) { group = E->get().name; group_base = E->get().hint_string; if (group_base.ends_with("_")) { - group_base=group_base.substr(0,group_base.length()-1); + group_base = group_base.substr(0, group_base.length() - 1); } } //can unfold if (E->get().usage & PROPERTY_USAGE_EDITOR) { - if (group != "") { //group - if (group_base==String() || E->get().name.begins_with(group_base)) { - bool can_revert = EditorPropertyRevert::can_property_revert(p_object,E->get().name); - if (can_revert) { + if (group_base == String() || E->get().name.begins_with(group_base)) { + bool can_revert = EditorPropertyRevert::can_property_revert(p_object, E->get().name); + if (can_revert) { unfold_group.insert(group); } } } else { //path int last = E->get().name.find_last("/"); - if (last!=-1) { - bool can_revert = EditorPropertyRevert::can_property_revert(p_object,E->get().name); + if (last != -1) { + bool can_revert = EditorPropertyRevert::can_property_revert(p_object, E->get().name); if (can_revert) { - unfold_group.insert(E->get().name.substr(0,last)); + unfold_group.insert(E->get().name.substr(0, last)); } } } @@ -223,13 +221,13 @@ void EditorFolding::_do_object_unfolds(Object *p_object, Set &resources) { if (res.is_valid() && !resources.has(res) && res->get_path() != String() && !res->get_path().is_resource_file()) { resources.insert(res); - _do_object_unfolds(res.ptr(),resources); + _do_object_unfolds(res.ptr(), resources); } } } - for (Set::Element *E=unfold_group.front();E;E=E->next()) { - p_object->editor_set_section_unfold(E->get(),true); + for (Set::Element *E = unfold_group.front(); E; E = E->next()) { + p_object->editor_set_section_unfold(E->get(), true); } } @@ -243,7 +241,7 @@ void EditorFolding::_do_node_unfolds(Node *p_root, Node *p_node, Set &resou } } - _do_object_unfolds(p_node,resources); + _do_object_unfolds(p_node, resources); for (int i = 0; i < p_node->get_child_count(); i++) { _do_node_unfolds(p_root, p_node->get_child(i), resources); @@ -253,7 +251,7 @@ void EditorFolding::_do_node_unfolds(Node *p_root, Node *p_node, Set &resou void EditorFolding::unfold_scene(Node *p_scene) { Set resources; - _do_node_unfolds(p_scene,p_scene,resources); + _do_node_unfolds(p_scene, p_scene, resources); } EditorFolding::EditorFolding() { diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp index ac98b5a393..90552ebb47 100644 --- a/scene/resources/environment.cpp +++ b/scene/resources/environment.cpp @@ -585,9 +585,9 @@ float Environment::get_glow_hdr_bleed_threshold() const { return glow_hdr_bleed_threshold; } -void Environment::set_glow_hdr_luminance_cap(float p_threshold) { +void Environment::set_glow_hdr_luminance_cap(float p_amount) { - glow_hdr_luminance_cap = p_threshold; + glow_hdr_luminance_cap = p_amount; VS::get_singleton()->environment_set_glow(environment, glow_enabled, glow_levels, glow_intensity, glow_strength, glow_bloom, VS::EnvironmentGlowBlendMode(glow_blend_mode), glow_hdr_bleed_threshold, glow_hdr_bleed_threshold, glow_hdr_luminance_cap, glow_bicubic_upscale); }