godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-25 15:37:42 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
scene/2d/canvas_modulate.cpp
View File

@@ -28,52 +28,48 @@
/*************************************************************************/
#include "canvas_modulate.h"
void CanvasModulate::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_CANVAS) {
if (p_what == NOTIFICATION_ENTER_CANVAS) {
if (is_visible()) {
VS::get_singleton()->canvas_set_modulate(get_canvas(),color);
add_to_group("_canvas_modulate_"+itos(get_canvas().get_id()));
VS::get_singleton()->canvas_set_modulate(get_canvas(), color);
add_to_group("_canvas_modulate_" + itos(get_canvas().get_id()));
}
} else if (p_what==NOTIFICATION_EXIT_CANVAS) {
} else if (p_what == NOTIFICATION_EXIT_CANVAS) {
if (is_visible()) {
VS::get_singleton()->canvas_set_modulate(get_canvas(),Color(1,1,1,1));
remove_from_group("_canvas_modulate_"+itos(get_canvas().get_id()));
VS::get_singleton()->canvas_set_modulate(get_canvas(), Color(1, 1, 1, 1));
remove_from_group("_canvas_modulate_" + itos(get_canvas().get_id()));
}
} else if (p_what==NOTIFICATION_VISIBILITY_CHANGED) {
} else if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {
if (is_visible()) {
VS::get_singleton()->canvas_set_modulate(get_canvas(),color);
add_to_group("_canvas_modulate_"+itos(get_canvas().get_id()));
VS::get_singleton()->canvas_set_modulate(get_canvas(), color);
add_to_group("_canvas_modulate_" + itos(get_canvas().get_id()));
} else {
VS::get_singleton()->canvas_set_modulate(get_canvas(),Color(1,1,1,1));
remove_from_group("_canvas_modulate_"+itos(get_canvas().get_id()));
VS::get_singleton()->canvas_set_modulate(get_canvas(), Color(1, 1, 1, 1));
remove_from_group("_canvas_modulate_" + itos(get_canvas().get_id()));
}
update_configuration_warning();
}
}
void CanvasModulate::_bind_methods(){
void CanvasModulate::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_color","color"),&CanvasModulate::set_color);
ObjectTypeDB::bind_method(_MD("get_color"),&CanvasModulate::get_color);
ObjectTypeDB::bind_method(_MD("set_color", "color"), &CanvasModulate::set_color);
ObjectTypeDB::bind_method(_MD("get_color"), &CanvasModulate::get_color);
ADD_PROPERTY(PropertyInfo(Variant::COLOR,"color"),_SCS("set_color"),_SCS("get_color"));
ADD_PROPERTY(PropertyInfo(Variant::COLOR, "color"), _SCS("set_color"), _SCS("get_color"));
}
void CanvasModulate::set_color(const Color &p_color) {
void CanvasModulate::set_color(const Color& p_color){
color=p_color;
color = p_color;
if (is_inside_tree()) {
VS::get_singleton()->canvas_set_modulate(get_canvas(),color);
VS::get_singleton()->canvas_set_modulate(get_canvas(), color);
}
}
Color CanvasModulate::get_color() const {
@@ -86,23 +82,19 @@ String CanvasModulate::get_configuration_warning() const {
if (!is_visible() || !is_inside_tree())
return String();
List<Node*> nodes;
get_tree()->get_nodes_in_group("_canvas_modulate_"+itos(get_canvas().get_id()),&nodes);
List<Node *> nodes;
get_tree()->get_nodes_in_group("_canvas_modulate_" + itos(get_canvas().get_id()), &nodes);
if (nodes.size()>1) {
if (nodes.size() > 1) {
return TTR("Only one visible CanvasModulate is allowed per scene (or set of instanced scenes). The first created one will work, while the rest will be ignored.");
}
return String();
}
CanvasModulate::CanvasModulate()
{
color=Color(1,1,1,1);
CanvasModulate::CanvasModulate() {
color = Color(1, 1, 1, 1);
}
CanvasModulate::~CanvasModulate()
{
CanvasModulate::~CanvasModulate() {
}