Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 00:21:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Style: clang-format: Disable AllowShortIfStatementsOnASingleLine

Browse source
This commit is contained in:
Rémi Verschelde 2021-05-04 14:28:27 +02:00
parent 6e600cb3f0
commit 3d15f04668
No known key found for this signature in database
GPG key ID: C3336907360768E1
128 changed files with 872 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

42
editor/plugins/spatial_editor_plugin.cpp
View file

@ -708,9 +708,11 @@ void SpatialEditorViewport::_select_region() {
item = sel;
}
if (selected.find(item) != -1) continue;
if (selected.find(item) != -1)
continue;
if (_is_node_locked(item)) continue;
if (_is_node_locked(item))
continue;
Ref<EditorSpatialGizmo> seg = sp->get_gizmo();
@ -1349,7 +1351,8 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
if (cursor.region_select) {
if (!clicked_wants_append) _clear_selected();
if (!clicked_wants_append)
_clear_selected();
_select_region();
cursor.region_select = false;
@ -2042,7 +2045,8 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
}
if (k->get_scancode() == KEY_SPACE) {
if (!k->is_pressed()) emit_signal("toggle_maximize_view", this);
if (!k->is_pressed())
emit_signal("toggle_maximize_view", this);
}
}
@ -4616,7 +4620,8 @@ Dictionary SpatialEditor::get_state() const {
Dictionary gizmos_status;
for (int i = 0; i < gizmo_plugins_by_name.size(); i++) {
if (!gizmo_plugins_by_name[i]->can_be_hidden()) continue;
if (!gizmo_plugins_by_name[i]->can_be_hidden())
continue;
int state = gizmos_menu->get_item_state(gizmos_menu->get_item_index(i));
String name = gizmo_plugins_by_name[i]->get_name();
gizmos_status[name] = state;
@ -4710,7 +4715,8 @@ void SpatialEditor::set_state(const Dictionary &p_state) {
gizmos_status.get_key_list(&keys);
for (int j = 0; j < gizmo_plugins_by_name.size(); ++j) {
if (!gizmo_plugins_by_name[j]->can_be_hidden()) continue;
if (!gizmo_plugins_by_name[j]->can_be_hidden())
continue;
int state = EditorSpatialGizmoPlugin::VISIBLE;
for (int i = 0; i < keys.size(); i++) {
if (gizmo_plugins_by_name.write[j]->get_name() == keys[i]) {
@ -5612,7 +5618,8 @@ void SpatialEditor::_update_gizmos_menu() {
gizmos_menu->clear();
for (int i = 0; i < gizmo_plugins_by_name.size(); ++i) {
if (!gizmo_plugins_by_name[i]->can_be_hidden()) continue;
if (!gizmo_plugins_by_name[i]->can_be_hidden())
continue;
String plugin_name = gizmo_plugins_by_name[i]->get_name();
const int plugin_state = gizmo_plugins_by_name[i]->get_state();
gizmos_menu->add_multistate_item(TTR(plugin_name), 3, plugin_state, i);
@ -5636,7 +5643,8 @@ void SpatialEditor::_update_gizmos_menu() {
void SpatialEditor::_update_gizmos_menu_theme() {
for (int i = 0; i < gizmo_plugins_by_name.size(); ++i) {
if (!gizmo_plugins_by_name[i]->can_be_hidden()) continue;
if (!gizmo_plugins_by_name[i]->can_be_hidden())
continue;
const int plugin_state = gizmo_plugins_by_name[i]->get_state();
const int idx = gizmos_menu->get_item_index(i);
switch (plugin_state) {
@ -6163,9 +6171,11 @@ void SpatialEditor::_request_gizmo(Object *p_obj) {
}
void SpatialEditor::_toggle_maximize_view(Object *p_viewport) {
if (!p_viewport) return;
if (!p_viewport)
return;
SpatialEditorViewport *current_viewport = Object::cast_to<SpatialEditorViewport>(p_viewport);
if (!current_viewport) return;
if (!current_viewport)
return;
int index = -1;
bool maximized = false;
@ -6177,7 +6187,8 @@ void SpatialEditor::_toggle_maximize_view(Object *p_viewport) {
break;
}
}
if (index == -1) return;
if (index == -1)
return;
if (!maximized) {
@ -6904,7 +6915,8 @@ Ref<SpatialMaterial> EditorSpatialGizmoPlugin::get_material(const String &p_name
ERR_FAIL_COND_V(!materials.has(p_name), Ref<SpatialMaterial>());
ERR_FAIL_COND_V(materials[p_name].size() == 0, Ref<SpatialMaterial>());
if (p_gizmo.is_null() || materials[p_name].size() == 1) return materials[p_name][0];
if (p_gizmo.is_null() || materials[p_name].size() == 1)
return materials[p_name][0];
int index = (p_gizmo->is_selected() ? 1 : 0) + (p_gizmo->is_editable() ? 2 : 0);
@ -6941,7 +6953,8 @@ Ref<EditorSpatialGizmo> EditorSpatialGizmoPlugin::get_gizmo(Spatial *p_spatial)
Ref<EditorSpatialGizmo> ref = create_gizmo(p_spatial);
if (ref.is_null()) return ref;
if (ref.is_null())
return ref;
ref->set_plugin(this);
ref->set_spatial_node(p_spatial);
@ -7000,7 +7013,8 @@ Ref<EditorSpatialGizmo> EditorSpatialGizmoPlugin::create_gizmo(Spatial *p_spatia
}
Ref<EditorSpatialGizmo> ref;
if (has_gizmo(p_spatial)) ref.instance();
if (has_gizmo(p_spatial))
ref.instance();
return ref;
}