diff options
| author | Rémi Verschelde | 2017-03-05 16:44:50 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-03-05 16:44:50 +0100 |
| commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
| tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /scene/3d/scenario_fx.cpp | |
| parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff) | |
| download | godot-5dbf180.tar.gz godot-5dbf180.tar.zst godot-5dbf180.zip | |
A Whole New World (clang-format edition)
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?
I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon
A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format
A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
Diffstat (limited to '')
| -rw-r--r-- | scene/3d/scenario_fx.cpp | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/scene/3d/scenario_fx.cpp b/scene/3d/scenario_fx.cpp index 145242ba7..92ee608f7 100644 --- a/scene/3d/scenario_fx.cpp +++ b/scene/3d/scenario_fx.cpp @@ -28,49 +28,42 @@ /*************************************************************************/ #include "scenario_fx.h" - - void WorldEnvironment::_notification(int p_what) { - - if (p_what==NOTIFICATION_ENTER_WORLD) { + if (p_what == NOTIFICATION_ENTER_WORLD) { if (environment.is_valid()) { if (get_world()->get_environment().is_valid()) { WARN_PRINT("World already has an environment (Another WorldEnvironment?), overriding."); } get_world()->set_environment(environment); - add_to_group("_world_environment_"+itos(get_world()->get_scenario().get_id())); - + add_to_group("_world_environment_" + itos(get_world()->get_scenario().get_id())); } - } else if (p_what==NOTIFICATION_EXIT_WORLD) { + } else if (p_what == NOTIFICATION_EXIT_WORLD) { - if (environment.is_valid() && get_world()->get_environment()==environment) { + if (environment.is_valid() && get_world()->get_environment() == environment) { get_world()->set_environment(Ref<Environment>()); - remove_from_group("_world_environment_"+itos(get_world()->get_scenario().get_id())); - + remove_from_group("_world_environment_" + itos(get_world()->get_scenario().get_id())); } } } -void WorldEnvironment::set_environment(const Ref<Environment>& p_environment) { +void WorldEnvironment::set_environment(const Ref<Environment> &p_environment) { - if (is_inside_world() && environment.is_valid() && get_world()->get_environment()==environment) { + if (is_inside_world() && environment.is_valid() && get_world()->get_environment() == environment) { get_world()->set_environment(Ref<Environment>()); - remove_from_group("_world_environment_"+itos(get_world()->get_scenario().get_id())); + remove_from_group("_world_environment_" + itos(get_world()->get_scenario().get_id())); //clean up } - - environment=p_environment; + environment = p_environment; if (is_inside_world() && environment.is_valid()) { if (get_world()->get_environment().is_valid()) { WARN_PRINT("World already has an environment (Another WorldEnvironment?), overriding."); } get_world()->set_environment(environment); - add_to_group("_world_environment_"+itos(get_world()->get_scenario().get_id())); - + add_to_group("_world_environment_" + itos(get_world()->get_scenario().get_id())); } update_configuration_warning(); @@ -86,29 +79,22 @@ String WorldEnvironment::get_configuration_warning() const { if (!is_visible_in_tree() || !is_inside_tree() || !environment.is_valid()) return String(); - List<Node*> nodes; - get_tree()->get_nodes_in_group("_world_environment_"+itos(get_world()->get_scenario().get_id()),&nodes); + List<Node *> nodes; + get_tree()->get_nodes_in_group("_world_environment_" + itos(get_world()->get_scenario().get_id()), &nodes); - if (nodes.size()>1) { + if (nodes.size() > 1) { return TTR("Only one WorldEnvironment is allowed per scene (or set of instanced scenes)."); } return String(); } - void WorldEnvironment::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_environment","env:Environment"),&WorldEnvironment::set_environment); - ClassDB::bind_method(D_METHOD("get_environment:Environment"),&WorldEnvironment::get_environment); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT,"environment",PROPERTY_HINT_RESOURCE_TYPE,"Environment"),"set_environment","get_environment"); - + ClassDB::bind_method(D_METHOD("set_environment", "env:Environment"), &WorldEnvironment::set_environment); + ClassDB::bind_method(D_METHOD("get_environment:Environment"), &WorldEnvironment::get_environment); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, "Environment"), "set_environment", "get_environment"); } - WorldEnvironment::WorldEnvironment() { - - } - - |
