diff options
Diffstat (limited to 'editor/property_editor.cpp')
| -rw-r--r-- | editor/property_editor.cpp | 3137 |
1 files changed, 1455 insertions, 1682 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 533a5b156b..f8234d93fd 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -28,37 +28,36 @@ /*************************************************************************/ #include "property_editor.h" -#include "scene/gui/label.h" -#include "io/resource_loader.h" +#include "array_property_edit.h" +#include "class_db.h" +#include "create_dialog.h" +#include "editor_export.h" +#include "editor_file_system.h" +#include "editor_help.h" +#include "editor_node.h" +#include "editor_settings.h" +#include "global_config.h" +#include "global_config.h" #include "io/image_loader.h" +#include "io/resource_loader.h" +#include "multi_node_edit.h" #include "os/input.h" #include "os/keyboard.h" -#include "class_db.h" +#include "pair.h" #include "print_string.h" -#include "global_config.h" +#include "property_selector.h" +#include "scene/gui/label.h" +#include "scene/main/viewport.h" #include "scene/resources/font.h" -#include "pair.h" -#include "scene/scene_string_names.h" -#include "editor_settings.h" -#include "editor_export.h" -#include "editor_node.h" -#include "multi_node_edit.h" -#include "array_property_edit.h" -#include "editor_help.h" #include "scene/resources/packed_scene.h" -#include "scene/main/viewport.h" -#include "editor_file_system.h" -#include "create_dialog.h" -#include "property_selector.h" -#include "global_config.h" +#include "scene/scene_string_names.h" void CustomPropertyEditor::_notification(int p_what) { - - if (p_what==NOTIFICATION_DRAW) { + if (p_what == NOTIFICATION_DRAW) { RID ci = get_canvas_item(); - get_stylebox("panel","PopupMenu")->draw(ci,Rect2(Point2(),get_size())); + get_stylebox("panel", "PopupMenu")->draw(ci, Rect2(Point2(), get_size())); /* if (v.get_type()==Variant::COLOR) { @@ -67,68 +66,63 @@ void CustomPropertyEditor::_notification(int p_what) { } } - void CustomPropertyEditor::_menu_option(int p_which) { - - switch(type) { + switch (type) { case Variant::INT: { - if (hint==PROPERTY_HINT_FLAGS) { + if (hint == PROPERTY_HINT_FLAGS) { int val = v; - if (val&(1<<p_which)) { + if (val & (1 << p_which)) { - val&=~(1<<p_which); + val &= ~(1 << p_which); } else { - val|=(1<<p_which); + val |= (1 << p_which); } - v=val; + v = val; emit_signal("variant_changed"); - } else if (hint==PROPERTY_HINT_ENUM) { + } else if (hint == PROPERTY_HINT_ENUM) { - v=p_which; + v = p_which; emit_signal("variant_changed"); - } } break; case Variant::STRING: { - if (hint==PROPERTY_HINT_ENUM) { + if (hint == PROPERTY_HINT_ENUM) { - v=hint_text.get_slice(",",p_which); + v = hint_text.get_slice(",", p_which); emit_signal("variant_changed"); - } } break; case Variant::OBJECT: { - switch(p_which) { + switch (p_which) { case OBJ_MENU_LOAD: { file->set_mode(EditorFileDialog::MODE_OPEN_FILE); - String type=(hint==PROPERTY_HINT_RESOURCE_TYPE)?hint_text:String(); + String type = (hint == PROPERTY_HINT_RESOURCE_TYPE) ? hint_text : String(); List<String> extensions; - for (int i=0;i<type.get_slice_count(",");i++) { + for (int i = 0; i < type.get_slice_count(","); i++) { - ResourceLoader::get_recognized_extensions_for_type(type.get_slice(",",i),&extensions); + ResourceLoader::get_recognized_extensions_for_type(type.get_slice(",", i), &extensions); } Set<String> valid_extensions; - for (List<String>::Element *E=extensions.front();E;E=E->next()) { - print_line("found: "+E->get()); + for (List<String>::Element *E = extensions.front(); E; E = E->next()) { + print_line("found: " + E->get()); valid_extensions.insert(E->get()); } file->clear_filters(); - for (Set<String>::Element *E=valid_extensions.front();E;E=E->next()) { - - file->add_filter("*."+E->get()+" ; "+E->get().to_upper() ); + for (Set<String>::Element *E = valid_extensions.front(); E; E = E->next()) { + file->add_filter("*." + E->get() + " ; " + E->get().to_upper()); } file->popup_centered_ratio(); @@ -136,7 +130,7 @@ void CustomPropertyEditor::_menu_option(int p_which) { case OBJ_MENU_EDIT: { - RefPtr RefPtr=v; + RefPtr RefPtr = v; if (!RefPtr.is_null()) { @@ -146,32 +140,30 @@ void CustomPropertyEditor::_menu_option(int p_which) { } break; case OBJ_MENU_CLEAR: { - - v=Variant(); + v = Variant(); emit_signal("variant_changed"); hide(); } break; case OBJ_MENU_MAKE_UNIQUE: { - - RefPtr RefPtr=v; + RefPtr RefPtr = v; Ref<Resource> res_orig = RefPtr; if (res_orig.is_null()) return; List<PropertyInfo> property_list; res_orig->get_property_list(&property_list); - List< Pair<String,Variant> > propvalues; + List<Pair<String, Variant> > propvalues; - for(List<PropertyInfo>::Element *E=property_list.front();E;E=E->next()) { + for (List<PropertyInfo>::Element *E = property_list.front(); E; E = E->next()) { - Pair<String,Variant> p; + Pair<String, Variant> p; PropertyInfo &pi = E->get(); - if (pi.usage&PROPERTY_USAGE_STORAGE) { + if (pi.usage & PROPERTY_USAGE_STORAGE) { - p.first=pi.name; - p.second=res_orig->get(pi.name); + p.first = pi.name; + p.second = res_orig->get(pi.name); } propvalues.push_back(p); @@ -179,19 +171,19 @@ void CustomPropertyEditor::_menu_option(int p_which) { String orig_type = res_orig->get_class(); - Object *inst = ClassDB::instance( orig_type ); + Object *inst = ClassDB::instance(orig_type); - Ref<Resource> res = Ref<Resource>( inst->cast_to<Resource>() ); + Ref<Resource> res = Ref<Resource>(inst->cast_to<Resource>()); ERR_FAIL_COND(res.is_null()); - for(List< Pair<String,Variant> >::Element *E=propvalues.front();E;E=E->next()) { + for (List<Pair<String, Variant> >::Element *E = propvalues.front(); E; E = E->next()) { - Pair<String,Variant> &p=E->get(); - res->set(p.first,p.second); + Pair<String, Variant> &p = E->get(); + res->set(p.first, p.second); } - v=res.get_ref_ptr(); + v = res.get_ref_ptr(); emit_signal("variant_changed"); hide(); } break; @@ -203,14 +195,14 @@ void CustomPropertyEditor::_menu_option(int p_which) { } break; case OBJ_MENU_PASTE: { - v=EditorSettings::get_singleton()->get_resource_clipboard(); + v = EditorSettings::get_singleton()->get_resource_clipboard(); emit_signal("variant_changed"); } break; case OBJ_MENU_REIMPORT: { - RES r=v; -/* if (r.is_valid() && r->get_import_metadata().is_valid()) { + RES r = v; + /* if (r.is_valid() && r->get_import_metadata().is_valid()) { Ref<ResourceImportMetadata> rimd = r->get_import_metadata(); Ref<EditorImportPlugin> eip = EditorImportExport::get_singleton()->get_import_plugin_by_name(rimd->get_editor()); if (eip.is_valid()) { @@ -225,53 +217,45 @@ void CustomPropertyEditor::_menu_option(int p_which) { } break; case OBJ_MENU_SHOW_IN_FILE_SYSTEM: { - RES r=v; - FileSystemDock *file_system_dock=EditorNode::get_singleton()->get_filesystem_dock(); + RES r = v; + FileSystemDock *file_system_dock = EditorNode::get_singleton()->get_filesystem_dock(); file_system_dock->navigate_to_path(r->get_path()); // Ensure that the FileSystem dock is visible. - TabContainer* tab_container=(TabContainer*)file_system_dock->get_parent_control(); + TabContainer *tab_container = (TabContainer *)file_system_dock->get_parent_control(); tab_container->set_current_tab(file_system_dock->get_position_in_parent()); } break; default: { + ERR_FAIL_COND(inheritors_array.empty()); - ERR_FAIL_COND( inheritors_array.empty() ); - + String intype = inheritors_array[p_which - TYPE_BASE_ID]; - - - String intype=inheritors_array[p_which-TYPE_BASE_ID]; - - if (intype=="ViewportTexture") { + if (intype == "ViewportTexture") { scene_tree->set_title(TTR("Pick a Viewport")); scene_tree->popup_centered_ratio(); - picking_viewport=true; + picking_viewport = true; return; - } Object *obj = ClassDB::instance(intype); - ERR_BREAK( !obj ); - Resource *res=obj->cast_to<Resource>(); - ERR_BREAK( !res ); - if (owner && hint==PROPERTY_HINT_RESOURCE_TYPE && hint_text=="Script") { + ERR_BREAK(!obj); + Resource *res = obj->cast_to<Resource>(); + ERR_BREAK(!res); + if (owner && hint == PROPERTY_HINT_RESOURCE_TYPE && hint_text == "Script") { //make visual script the right type - res->call("set_instance_base_type",owner->get_class()); + res->call("set_instance_base_type", owner->get_class()); } - v=Ref<Resource>(res).get_ref_ptr(); + v = Ref<Resource>(res).get_ref_ptr(); emit_signal("variant_changed"); } break; } - } break; - default:{} + default: {} } - - } void CustomPropertyEditor::hide_menu() { @@ -288,15 +272,15 @@ String CustomPropertyEditor::get_name() const { return name; } -bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Type p_type, const Variant& p_variant,int p_hint,String p_hint_text) { +bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::Type p_type, const Variant &p_variant, int p_hint, String p_hint_text) { - owner=p_owner; - updating=true; - name=p_name; - v=p_variant; + owner = p_owner; + updating = true; + name = p_name; + v = p_variant; field_names.clear(); - hint=p_hint; - hint_text=p_hint_text; + hint = p_hint; + hint_text = p_hint_text; type_button->hide(); if (color_picker) color_picker->hide(); @@ -307,245 +291,251 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty spinbox->hide(); slider->hide(); - for (int i=0;i<MAX_VALUE_EDITORS;i++) { + for (int i = 0; i < MAX_VALUE_EDITORS; i++) { value_editor[i]->hide(); value_label[i]->hide(); - if (i<4) + if (i < 4) scroll[i]->hide(); } - for (int i=0;i<MAX_ACTION_BUTTONS;i++) { + for (int i = 0; i < MAX_ACTION_BUTTONS; i++) { action_buttons[i]->hide(); } checks20gc->hide(); - for(int i=0;i<20;i++) + for (int i = 0; i < 20; i++) checks20[i]->hide(); - type = (p_variant.get_type()!=Variant::NIL && p_variant.get_type()!=Variant::_RID && p_type!=Variant::OBJECT)? p_variant.get_type() : p_type; + type = (p_variant.get_type() != Variant::NIL && p_variant.get_type() != Variant::_RID && p_type != Variant::OBJECT) ? p_variant.get_type() : p_type; - - switch(type) { + switch (type) { case Variant::BOOL: { checks20gc->show(); - CheckBox *c=checks20[0]; + CheckBox *c = checks20[0]; c->set_text("True"); - checks20gc->set_pos(Vector2(4,4)); + checks20gc->set_pos(Vector2(4, 4)); c->set_pressed(v); c->show(); checks20gc->set_size(checks20gc->get_minimum_size()); - set_size(checks20gc->get_pos()+checks20gc->get_size()+Vector2(4,4)*EDSCALE); + set_size(checks20gc->get_pos() + checks20gc->get_size() + Vector2(4, 4) * EDSCALE); } break; case Variant::INT: case Variant::REAL: { - if (hint==PROPERTY_HINT_RANGE) { + if (hint == PROPERTY_HINT_RANGE) { int c = hint_text.get_slice_count(","); - float min=0,max=100,step=1; - if (c>=1) { + float min = 0, max = 100, step = 1; + if (c >= 1) { - if (!hint_text.get_slice(",",0).empty()) - min=hint_text.get_slice(",",0).to_double(); + if (!hint_text.get_slice(",", 0).empty()) + min = hint_text.get_slice(",", 0).to_double(); } - if (c>=2) { + if (c >= 2) { - if (!hint_text.get_slice(",",1).empty()) - max=hint_text.get_slice(",",1).to_double(); + if (!hint_text.get_slice(",", 1).empty()) + max = hint_text.get_slice(",", 1).to_double(); } - if (c>=3) { + if (c >= 3) { - if (!hint_text.get_slice(",",2).empty()) - step= hint_text.get_slice(",",2).to_double(); + if (!hint_text.get_slice(",", 2).empty()) + step = hint_text.get_slice(",", 2).to_double(); } - if (c>=4 && hint_text.get_slice(",",3)=="slider") { + if (c >= 4 && hint_text.get_slice(",", 3) == "slider") { slider->set_min(min); slider->set_max(max); slider->set_step(step); slider->set_value(v); slider->show(); - set_size(Size2(110,30)*EDSCALE); + set_size(Size2(110, 30) * EDSCALE); } else { spinbox->set_min(min); spinbox->set_max(max); spinbox->set_step(step); spinbox->set_value(v); spinbox->show(); - set_size(Size2(70,35)*EDSCALE); + set_size(Size2(70, 35) * EDSCALE); } - } else if (hint==PROPERTY_HINT_ENUM) { + } else if (hint == PROPERTY_HINT_ENUM) { menu->clear(); Vector<String> options = hint_text.split(","); - for(int i=0;i<options.size();i++) { - menu->add_item(options[i],i); + for (int i = 0; i < options.size(); i++) { + menu->add_item(options[i], i); } menu->set_pos(get_pos()); menu->popup(); hide(); - updating=false; + updating = false; return false; - - } else if (hint==PROPERTY_HINT_LAYERS_2D_PHYSICS || hint==PROPERTY_HINT_LAYERS_2D_RENDER || hint==PROPERTY_HINT_LAYERS_3D_PHYSICS || hint==PROPERTY_HINT_LAYERS_3D_RENDER) { - + } else if (hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || hint == PROPERTY_HINT_LAYERS_2D_RENDER || hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || hint == PROPERTY_HINT_LAYERS_3D_RENDER) { String title; String basename; switch (hint) { - case PROPERTY_HINT_LAYERS_2D_RENDER: basename="layer_names/2d_render"; title="2D Render Layers"; break; - case PROPERTY_HINT_LAYERS_2D_PHYSICS: basename="layer_names/2d_physics"; title="2D Physics Layers"; break; - case PROPERTY_HINT_LAYERS_3D_RENDER: basename="layer_names/3d_render"; title="3D Render Layers"; break; - case PROPERTY_HINT_LAYERS_3D_PHYSICS: basename="layer_names/3d_physics";title="3D Physics Layers"; break; + case PROPERTY_HINT_LAYERS_2D_RENDER: + basename = "layer_names/2d_render"; + title = "2D Render Layers"; + break; + case PROPERTY_HINT_LAYERS_2D_PHYSICS: + basename = "layer_names/2d_physics"; + title = "2D Physics Layers"; + break; + case PROPERTY_HINT_LAYERS_3D_RENDER: + basename = "layer_names/3d_render"; + title = "3D Render Layers"; + break; + case PROPERTY_HINT_LAYERS_3D_PHYSICS: + basename = "layer_names/3d_physics"; + title = "3D Physics Layers"; + break; } checks20gc->show(); uint32_t flgs = v; - for(int i=0;i<2;i++) { + for (int i = 0; i < 2; i++) { - Point2 ofs(4,4); - ofs.y+=22*i; - for(int j=0;j<10;j++) { + Point2 ofs(4, 4); + ofs.y += 22 * i; + for (int j = 0; j < 10; j++) { - int idx = i*10+j; - CheckBox *c=checks20[idx]; - c->set_text(GlobalConfig::get_singleton()->get(basename+"/layer_"+itos(idx+1))); - c->set_pressed( flgs & (1<<(i*10+j)) ); + int idx = i * 10 + j; + CheckBox *c = checks20[idx]; + c->set_text(GlobalConfig::get_singleton()->get(basename + "/layer_" + itos(idx + 1))); + c->set_pressed(flgs & (1 << (i * 10 + j))); c->show(); } - - } show(); value_label[0]->set_text(title); value_label[0]->show(); - value_label[0]->set_pos(Vector2(4,4)*EDSCALE); + value_label[0]->set_pos(Vector2(4, 4) * EDSCALE); - checks20gc->set_pos(Vector2(4,4)*EDSCALE+Vector2(0,value_label[0]->get_size().height+4*EDSCALE)); + checks20gc->set_pos(Vector2(4, 4) * EDSCALE + Vector2(0, value_label[0]->get_size().height + 4 * EDSCALE)); checks20gc->set_size(checks20gc->get_minimum_size()); - set_size(Vector2(4,4)*EDSCALE+checks20gc->get_pos()+checks20gc->get_size()); + set_size(Vector2(4, 4) * EDSCALE + checks20gc->get_pos() + checks20gc->get_size()); + } else if (hint == PROPERTY_HINT_EXP_EASING) { - } else if (hint==PROPERTY_HINT_EXP_EASING) { - - easing_draw->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN,5); - easing_draw->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,5); - easing_draw->set_anchor_and_margin(MARGIN_TOP,ANCHOR_BEGIN,5); - easing_draw->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,30); - type_button->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_BEGIN,3); - type_button->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,3); - type_button->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,25); - type_button->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,7); + easing_draw->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_BEGIN, 5); + easing_draw->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 5); + easing_draw->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 5); + easing_draw->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 30); + type_button->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_BEGIN, 3); + type_button->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 3); + type_button->set_anchor_and_margin(MARGIN_TOP, ANCHOR_END, 25); + type_button->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 7); type_button->set_text(TTR("Preset..")); type_button->get_popup()->clear(); - type_button->get_popup()->add_item(TTR("Linear"),EASING_LINEAR); - type_button->get_popup()->add_item(TTR("Ease In"),EASING_EASE_IN); - type_button->get_popup()->add_item(TTR("Ease Out"),EASING_EASE_OUT); - if (hint_text!="attenuation") { - type_button->get_popup()->add_item(TTR("Zero"),EASING_ZERO); - type_button->get_popup()->add_item(TTR("Easing In-Out"),EASING_IN_OUT); - type_button->get_popup()->add_item(TTR("Easing Out-In"),EASING_OUT_IN); + type_button->get_popup()->add_item(TTR("Linear"), EASING_LINEAR); + type_button->get_popup()->add_item(TTR("Ease In"), EASING_EASE_IN); + type_button->get_popup()->add_item(TTR("Ease Out"), EASING_EASE_OUT); + if (hint_text != "attenuation") { + type_button->get_popup()->add_item(TTR("Zero"), EASING_ZERO); + type_button->get_popup()->add_item(TTR("Easing In-Out"), EASING_IN_OUT); + type_button->get_popup()->add_item(TTR("Easing Out-In"), EASING_OUT_IN); } type_button->show(); easing_draw->show(); - set_size(Size2(200,150)*EDSCALE); - } else if (hint==PROPERTY_HINT_FLAGS) { + set_size(Size2(200, 150) * EDSCALE); + } else if (hint == PROPERTY_HINT_FLAGS) { menu->clear(); Vector<String> flags = hint_text.split(","); - for(int i=0;i<flags.size();i++) { + for (int i = 0; i < flags.size(); i++) { String flag = flags[i]; - if (flag=="") + if (flag == "") continue; - menu->add_check_item(flag,i); + menu->add_check_item(flag, i); int f = v; - if (f&(1<<i)) - menu->set_item_checked(menu->get_item_index(i),true); + if (f & (1 << i)) + menu->set_item_checked(menu->get_item_index(i), true); } menu->set_pos(get_pos()); menu->popup(); hide(); - updating=false; + updating = false; return false; } else { List<String> names; names.push_back("value:"); - config_value_editors(1,1,50,names); - value_editor[0]->set_text( String::num(v) ); + config_value_editors(1, 1, 50, names); + value_editor[0]->set_text(String::num(v)); } } break; case Variant::STRING: { - if (hint==PROPERTY_HINT_FILE || hint==PROPERTY_HINT_GLOBAL_FILE) { + if (hint == PROPERTY_HINT_FILE || hint == PROPERTY_HINT_GLOBAL_FILE) { List<String> names; names.push_back(TTR("File..")); names.push_back(TTR("Clear")); config_action_buttons(names); - } else if (hint==PROPERTY_HINT_DIR || hint==PROPERTY_HINT_GLOBAL_DIR) { + } else if (hint == PROPERTY_HINT_DIR || hint == PROPERTY_HINT_GLOBAL_DIR) { List<String> names; names.push_back(TTR("Dir..")); names.push_back(TTR("Clear")); config_action_buttons(names); - } else if (hint==PROPERTY_HINT_ENUM) { + } else if (hint == PROPERTY_HINT_ENUM) { menu->clear(); Vector<String> options = hint_text.split(","); - for(int i=0;i<options.size();i++) { - menu->add_item(options[i],i); + for (int i = 0; i < options.size(); i++) { + menu->add_item(options[i], i); } menu->set_pos(get_pos()); menu->popup(); hide(); - updating=false; + updating = false; return false; - } else if (hint==PROPERTY_HINT_MULTILINE_TEXT) { + } else if (hint == PROPERTY_HINT_MULTILINE_TEXT) { text_edit->show(); text_edit->set_text(v); //action_buttons[0]; - int button_margin = get_constant("button_margin","Dialogs"); - int margin = get_constant("margin","Dialogs"); + int button_margin = get_constant("button_margin", "Dialogs"); + int margin = get_constant("margin", "Dialogs"); - action_buttons[0]->set_anchor( MARGIN_LEFT, ANCHOR_END ); - action_buttons[0]->set_anchor( MARGIN_TOP, ANCHOR_END ); - action_buttons[0]->set_anchor( MARGIN_RIGHT, ANCHOR_END ); - action_buttons[0]->set_anchor( MARGIN_BOTTOM, ANCHOR_END ); - action_buttons[0]->set_begin( Point2( 70, button_margin-5 ) ); - action_buttons[0]->set_end( Point2( margin, margin ) ); + action_buttons[0]->set_anchor(MARGIN_LEFT, ANCHOR_END); + action_buttons[0]->set_anchor(MARGIN_TOP, ANCHOR_END); + action_buttons[0]->set_anchor(MARGIN_RIGHT, ANCHOR_END); + action_buttons[0]->set_anchor(MARGIN_BOTTOM, ANCHOR_END); + action_buttons[0]->set_begin(Point2(70, button_margin - 5)); + action_buttons[0]->set_end(Point2(margin, margin)); action_buttons[0]->set_text(TTR("Close")); action_buttons[0]->show(); - } else if (hint==PROPERTY_HINT_TYPE_STRING) { + } else if (hint == PROPERTY_HINT_TYPE_STRING) { /* FIXME: This is repeated twice, with slightly different behavior! Which one? Check line 644 */ if (!create_dialog) { - create_dialog = memnew( CreateDialog ); - create_dialog->connect("create",this,"_create_dialog_callback"); + create_dialog = memnew(CreateDialog); + create_dialog->connect("create", this, "_create_dialog_callback"); add_child(create_dialog); } - if (hint_text!=String()) { + if (hint_text != String()) { create_dialog->set_base_type(hint_text); } else { create_dialog->set_base_type("Object"); @@ -553,119 +543,124 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty create_dialog->popup(false); hide(); - updating=false; + updating = false; return false; - - } else if (hint==PROPERTY_HINT_METHOD_OF_VARIANT_TYPE) { -#define MAKE_PROPSELECT if (!property_select) { property_select = memnew(PropertySelector); property_select->connect("selected",this,"_create_selected_property"); add_child(property_select); } hide(); + } else if (hint == PROPERTY_HINT_METHOD_OF_VARIANT_TYPE) { +#define MAKE_PROPSELECT \ + if (!property_select) { \ + property_select = memnew(PropertySelector); \ + property_select->connect("selected", this, "_create_selected_property"); \ + add_child(property_select); \ + } \ + hide(); MAKE_PROPSELECT; - Variant::Type type=Variant::NIL; - for(int i=0;i<Variant::VARIANT_MAX;i++) { - if (hint_text==Variant::get_type_name(Variant::Type(i))) { - type=Variant::Type(i); + Variant::Type type = Variant::NIL; + for (int i = 0; i < Variant::VARIANT_MAX; i++) { + if (hint_text == Variant::get_type_name(Variant::Type(i))) { + type = Variant::Type(i); } } if (type) - property_select->select_method_from_basic_type(type,v); - updating=false; + property_select->select_method_from_basic_type(type, v); + updating = false; return false; - } else if (hint==PROPERTY_HINT_METHOD_OF_BASE_TYPE) { + } else if (hint == PROPERTY_HINT_METHOD_OF_BASE_TYPE) { MAKE_PROPSELECT - property_select->select_method_from_base_type(hint_text,v); + property_select->select_method_from_base_type(hint_text, v); - updating=false; + updating = false; return false; - } else if (hint==PROPERTY_HINT_METHOD_OF_INSTANCE) { + } else if (hint == PROPERTY_HINT_METHOD_OF_INSTANCE) { MAKE_PROPSELECT Object *instance = ObjectDB::get_instance(hint_text.to_int64()); if (instance) - property_select->select_method_from_instance(instance,v); - updating=false; + property_select->select_method_from_instance(instance, v); + updating = false; return false; - } else if (hint==PROPERTY_HINT_METHOD_OF_SCRIPT) { + } else if (hint == PROPERTY_HINT_METHOD_OF_SCRIPT) { MAKE_PROPSELECT Object *obj = ObjectDB::get_instance(hint_text.to_int64()); if (obj && obj->cast_to<Script>()) { - property_select->select_method_from_script(obj->cast_to<Script>(),v); + property_select->select_method_from_script(obj->cast_to<Script>(), v); } - updating=false; + updating = false; return false; - } else if (hint==PROPERTY_HINT_PROPERTY_OF_VARIANT_TYPE) { + } else if (hint == PROPERTY_HINT_PROPERTY_OF_VARIANT_TYPE) { MAKE_PROPSELECT - Variant::Type type=Variant::NIL; - String tname=hint_text; - if (tname.find(".")!=-1) - tname=tname.get_slice(".",0); - for(int i=0;i<Variant::VARIANT_MAX;i++) { - if (tname==Variant::get_type_name(Variant::Type(i))) { - type=Variant::Type(Variant::Type(i)); + Variant::Type type = Variant::NIL; + String tname = hint_text; + if (tname.find(".") != -1) + tname = tname.get_slice(".", 0); + for (int i = 0; i < Variant::VARIANT_MAX; i++) { + if (tname == Variant::get_type_name(Variant::Type(i))) { + type = Variant::Type(Variant::Type(i)); } } InputEvent::Type iet = InputEvent::NONE; - if (hint_text.find(".")!=-1) { - iet=InputEvent::Type(int(hint_text.get_slice(".",1).to_int())); + if (hint_text.find(".") != -1) { + iet = InputEvent::Type(int(hint_text.get_slice(".", 1).to_int())); } if (type) - property_select->select_property_from_basic_type(type,iet,v); + property_select->select_property_from_basic_type(type, iet, v); - updating=false; + updating = false; return false; - } else if (hint==PROPERTY_HINT_PROPERTY_OF_BASE_TYPE) { + } else if (hint == PROPERTY_HINT_PROPERTY_OF_BASE_TYPE) { MAKE_PROPSELECT - property_select->select_property_from_base_type(hint_text,v); + property_select->select_property_from_base_type(hint_text, v); - updating=false; + updating = false; return false; - } else if (hint==PROPERTY_HINT_PROPERTY_OF_INSTANCE) { + } else if (hint == PROPERTY_HINT_PROPERTY_OF_INSTANCE) { Object *instance = ObjectDB::get_instance(hint_text.to_int64()); if (instance) - property_select->select_property_from_instance(instance,v); + property_select->select_property_from_instance(instance, v); - updating=false; + updating = false; return false; - } else if (hint==PROPERTY_HINT_PROPERTY_OF_SCRIPT) { + } else if (hint == PROPERTY_HINT_PROPERTY_OF_SCRIPT) { MAKE_PROPSELECT Object *obj = ObjectDB::get_instance(hint_text.to_int64()); if (obj && obj->cast_to<Script>()) { - property_select->select_property_from_script(obj->cast_to<Script>(),v); + property_select->select_property_from_script(obj->cast_to<Script>(), v); } - updating=false; + updating = false; return false; - } else if (hint==PROPERTY_HINT_TYPE_STRING) { + } else if (hint == PROPERTY_HINT_TYPE_STRING) { if (!create_dialog) { /* FIXME: ... and here. See line 529 */ - create_dialog = memnew( CreateDialog ); - create_dialog->connect("create",this,"_create_dialog_callback"); + create_dialog = memnew(CreateDialog); + create_dialog->connect("create", this, "_create_dialog_callback"); add_child(create_dialog); } } else { List<String> names; names.push_back("string:"); - config_value_editors(1,1,50,names); - value_editor[0]->set_text( v ); + config_value_editors(1, 1, 50, names); + value_editor[0]->set_text(v); } } break; @@ -673,10 +668,10 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty field_names.push_back("x"); field_names.push_back("y"); - config_value_editors(2,2,10,field_names); - Vector2 vec=v; - value_editor[0]->set_text( String::num( vec.x) ); - value_editor[1]->set_text( String::num( vec.y) ); + config_value_editors(2, 2, 10, field_names); + Vector2 vec = v; + value_editor[0]->set_text(String::num(vec.x)); + value_editor[1]->set_text(String::num(vec.y)); } break; case Variant::RECT2: { @@ -684,23 +679,23 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty field_names.push_back("y"); field_names.push_back("w"); field_names.push_back("h"); - config_value_editors(4,4,10,field_names); - Rect2 r=v; - value_editor[0]->set_text( String::num( r.pos.x) ); - value_editor[1]->set_text( String::num( r.pos.y) ); - value_editor[2]->set_text( String::num( r.size.x) ); - value_editor[3]->set_text( String::num( r.size.y) ); + config_value_editors(4, 4, 10, field_names); + Rect2 r = v; + value_editor[0]->set_text(String::num(r.pos.x)); + value_editor[1]->set_text(String::num(r.pos.y)); + value_editor[2]->set_text(String::num(r.size.x)); + value_editor[3]->set_text(String::num(r.size.y)); } break; case Variant::VECTOR3: { field_names.push_back("x"); field_names.push_back("y"); field_names.push_back("z"); - config_value_editors(3,3,10,field_names); - Vector3 vec=v; - value_editor[0]->set_text( String::num( vec.x) ); - value_editor[1]->set_text( String::num( vec.y) ); - value_editor[2]->set_text( String::num( vec.z) ); + config_value_editors(3, 3, 10, field_names); + Vector3 vec = v; + value_editor[0]->set_text(String::num(vec.x)); + value_editor[1]->set_text(String::num(vec.y)); + value_editor[2]->set_text(String::num(vec.z)); } break; case Variant::PLANE: { @@ -708,12 +703,12 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty field_names.push_back("y"); field_names.push_back("z"); field_names.push_back("d"); - config_value_editors(4,4,10,field_names); - Plane plane=v; - value_editor[0]->set_text( String::num( plane.normal.x ) ); - value_editor[1]->set_text( String::num( plane.normal.y ) ); - value_editor[2]->set_text( String::num( plane.normal.z ) ); - value_editor[3]->set_text( String::num( plane.d ) ); + config_value_editors(4, 4, 10, field_names); + Plane plane = v; + value_editor[0]->set_text(String::num(plane.normal.x)); + value_editor[1]->set_text(String::num(plane.normal.y)); + value_editor[2]->set_text(String::num(plane.normal.z)); + value_editor[3]->set_text(String::num(plane.d)); } break; case Variant::QUAT: { @@ -722,12 +717,12 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty field_names.push_back("y"); field_names.push_back("z"); field_names.push_back("w"); - config_value_editors(4,4,10,field_names); - Quat q=v; - value_editor[0]->set_text( String::num( q.x ) ); - value_editor[1]->set_text( String::num( q.y ) ); - value_editor[2]->set_text( String::num( q.z ) ); - value_editor[3]->set_text( String::num( q.w ) ); + config_value_editors(4, 4, 10, field_names); + Quat q = v; + value_editor[0]->set_text(String::num(q.x)); + value_editor[1]->set_text(String::num(q.y)); + value_editor[2]->set_text(String::num(q.z)); + value_editor[3]->set_text(String::num(q.w)); } break; case Variant::RECT3: { @@ -738,15 +733,15 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty field_names.push_back("sx"); field_names.push_back("sy"); field_names.push_back("sz"); - config_value_editors(6,3,16,field_names); + config_value_editors(6, 3, 16, field_names); - Rect3 aabb=v; - value_editor[0]->set_text( String::num( aabb.pos.x ) ); - value_editor[1]->set_text( String::num( aabb.pos.y ) ); - value_editor[2]->set_text( String::num( aabb.pos.z ) ); - value_editor[3]->set_text( String::num( aabb.size.x ) ); - value_editor[4]->set_text( String::num( aabb.size.y ) ); - value_editor[5]->set_text( String::num( aabb.size.z ) ); + Rect3 aabb = v; + value_editor[0]->set_text(String::num(aabb.pos.x)); + value_editor[1]->set_text(String::num(aabb.pos.y)); + value_editor[2]->set_text(String::num(aabb.pos.z)); + value_editor[3]->set_text(String::num(aabb.size.x)); + value_editor[4]->set_text(String::num(aabb.size.y)); + value_editor[5]->set_text(String::num(aabb.size.z)); } break; case Variant::TRANSFORM2D: { @@ -757,12 +752,12 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty field_names.push_back("yy"); field_names.push_back("ox"); field_names.push_back("oy"); - config_value_editors(6,2,16,field_names); + config_value_editors(6, 2, 16, field_names); - Transform2D basis=v; - for(int i=0;i<6;i++) { + Transform2D basis = v; + for (int i = 0; i < 6; i++) { - value_editor[i]->set_text( String::num( basis.elements[i/2][i%2] ) ); + value_editor[i]->set_text(String::num(basis.elements[i / 2][i % 2])); } } break; @@ -777,18 +772,17 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty field_names.push_back("zx"); field_names.push_back("zy"); field_names.push_back("zz"); - config_value_editors(9,3,16,field_names); + config_value_editors(9, 3, 16, field_names); - Basis basis=v; - for(int i=0;i<9;i++) { + Basis basis = v; + for (int i = 0; i < 9; i++) { - value_editor[i]->set_text( String::num( basis.elements[i/3][i%3] ) ); + value_editor[i]->set_text(String::num(basis.elements[i / 3][i % 3])); } } break; case Variant::TRANSFORM: { - field_names.push_back("xx"); field_names.push_back("xy"); field_names.push_back("xz"); @@ -801,36 +795,36 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty field_names.push_back("zy"); field_names.push_back("zz"); field_names.push_back("zo"); - config_value_editors(12,4,16,field_names); + config_value_editors(12, 4, 16, field_names); - Transform tr=v; - for(int i=0;i<9;i++) { + Transform tr = v; + for (int i = 0; i < 9; i++) { - value_editor[(i/3)*4+i%3]->set_text( String::num( tr.basis.elements[i/3][i%3] ) ); + value_editor[(i / 3) * 4 + i % 3]->set_text(String::num(tr.basis.elements[i / 3][i % 3])); } - value_editor[3]->set_text( String::num( tr.origin.x ) ); - value_editor[7]->set_text( String::num( tr.origin.y ) ); - value_editor[11]->set_text( String::num( tr.origin.z ) ); + value_editor[3]->set_text(String::num(tr.origin.x)); + value_editor[7]->set_text(String::num(tr.origin.y)); + value_editor[11]->set_text(String::num(tr.origin.z)); } break; case Variant::COLOR: { if (!color_picker) { //late init for performance - color_picker = memnew( ColorPicker ); + color_picker = memnew(ColorPicker); add_child(color_picker); color_picker->hide(); color_picker->set_area_as_parent_rect(); - for(int i=0;i<4;i++) - color_picker->set_margin((Margin)i,5); - color_picker->connect("color_changed",this,"_color_changed"); + for (int i = 0; i < 4; i++) + color_picker->set_margin((Margin)i, 5); + color_picker->connect("color_changed", this, "_color_changed"); } color_picker->show(); - color_picker->set_edit_alpha(hint!=PROPERTY_HINT_COLOR_NO_ALPHA); + color_picker->set_edit_alpha(hint != PROPERTY_HINT_COLOR_NO_ALPHA); color_picker->set_pick_color(v); - set_size( Size2(300*EDSCALE, color_picker->get_combined_minimum_size().height+10*EDSCALE)); + set_size(Size2(300 * EDSCALE, color_picker->get_combined_minimum_size().height + 10 * EDSCALE)); color_picker->set_focus_on_line_edit(); /* int ofs=80; @@ -886,69 +880,62 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty } break; case Variant::OBJECT: { - if (hint!=PROPERTY_HINT_RESOURCE_TYPE) + if (hint != PROPERTY_HINT_RESOURCE_TYPE) break; - menu->clear(); - menu->set_size(Size2(1,1)); + menu->set_size(Size2(1, 1)); - if (p_name=="script" && hint_text=="Script" && owner->cast_to<Node>()) { - menu->add_icon_item(get_icon("Script","EditorIcons"),TTR("New Script"),OBJ_MENU_NEW_SCRIPT); + if (p_name == "script" && hint_text == "Script" && owner->cast_to<Node>()) { + menu->add_icon_item(get_icon("Script", "EditorIcons"), TTR("New Script"), OBJ_MENU_NEW_SCRIPT); menu->add_separator(); - } else if (hint_text!="") { - int idx=0; - - for(int i=0;i<hint_text.get_slice_count(",");i++) { + } else if (hint_text != "") { + int idx = 0; + for (int i = 0; i < hint_text.get_slice_count(","); i++) { - - String base=hint_text.get_slice(",",i); + String base = hint_text.get_slice(",", i); Set<String> valid_inheritors; valid_inheritors.insert(base); List<StringName> inheritors; - ClassDB::get_inheriters_from_class(base.strip_edges(),&inheritors); - List<StringName>::Element *E=inheritors.front(); - while(E) { + ClassDB::get_inheriters_from_class(base.strip_edges(), &inheritors); + List<StringName>::Element *E = inheritors.front(); + while (E) { valid_inheritors.insert(E->get()); - E=E->next(); + E = E->next(); } - for(Set<String>::Element *E=valid_inheritors.front();E;E=E->next()) { + for (Set<String>::Element *E = valid_inheritors.front(); E; E = E->next()) { String t = E->get(); if (!ClassDB::can_instance(t)) continue; inheritors_array.push_back(t); - int id = TYPE_BASE_ID+idx; - if (has_icon(t,"EditorIcons")) { + int id = TYPE_BASE_ID + idx; + if (has_icon(t, "EditorIcons")) { - menu->add_icon_item(get_icon(t,"EditorIcons"),TTR("New")+" "+t,id); + menu->add_icon_item(get_icon(t, "EditorIcons"), TTR("New") + " " + t, id); } else { - menu->add_item(TTR("New")+" "+t,id); + menu->add_item(TTR("New") + " " + t, id); } idx++; } - - } if (menu->get_item_count()) menu->add_separator(); } - menu->add_icon_item(get_icon("Load","EditorIcons"),"Load",OBJ_MENU_LOAD); + menu->add_icon_item(get_icon("Load", "EditorIcons"), "Load", OBJ_MENU_LOAD); if (!RES(v).is_null()) { - - - menu->add_icon_item(get_icon("EditResource","EditorIcons"),"Edit",OBJ_MENU_EDIT); - menu->add_icon_item(get_icon("Del","EditorIcons"),"Clear",OBJ_MENU_CLEAR); - menu->add_icon_item(get_icon("Duplicate","EditorIcons"),"Make Unique",OBJ_MENU_MAKE_UNIQUE); + menu->add_icon_item(get_icon("EditResource", "EditorIcons"), "Edit", OBJ_MENU_EDIT); + menu->add_icon_item(get_icon("Del", "EditorIcons"), "Clear", OBJ_MENU_CLEAR); + menu->add_icon_item(get_icon("Duplicate", "EditorIcons"), "Make Unique", OBJ_MENU_MAKE_UNIQUE); RES r = v; if (r.is_valid() && r->get_path().is_resource_file()) { /*if (r->get_import_metadata().is_valid()) { @@ -956,7 +943,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty menu->add_icon_item(get_icon("ReloadSmall","EditorIcons"),"Re-Import",OBJ_MENU_REIMPORT); }*/ menu->add_separator(); - menu->add_item(TTR("Show in File System"),OBJ_MENU_SHOW_IN_FILE_SYSTEM); + menu->add_item(TTR("Show in File System"), OBJ_MENU_SHOW_IN_FILE_SYSTEM); } /*if (r.is_valid() && r->get_path().is_resource_file()) { menu->set_item_tooltip(1,r->get_path()); @@ -964,19 +951,17 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty menu->set_item_tooltip(1,r->get_name()+" ("+r->get_type()+")"); }*/ } else { - } - - RES cb=EditorSettings::get_singleton()->get_resource_clipboard(); - bool paste_valid=false; + RES cb = EditorSettings::get_singleton()->get_resource_clipboard(); + bool paste_valid = false; if (cb.is_valid()) { - if (hint_text=="") - paste_valid=true; + if (hint_text == "") + paste_valid = true; else - for (int i = 0; i < hint_text.get_slice_count(",");i++) - if (ClassDB::is_parent_class(cb->get_class(),hint_text.get_slice(",",i))) { - paste_valid=true; + for (int i = 0; i < hint_text.get_slice_count(","); i++) + if (ClassDB::is_parent_class(cb->get_class(), hint_text.get_slice(",", i))) { + paste_valid = true; break; } } @@ -984,64 +969,52 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty if (!RES(v).is_null() || paste_valid) { menu->add_separator(); - if (!RES(v).is_null()) { - menu->add_item(TTR("Copy"),OBJ_MENU_COPY); + menu->add_item(TTR("Copy"), OBJ_MENU_COPY); } if (paste_valid) { - menu->add_item(TTR("Paste"),OBJ_MENU_PASTE); + menu->add_item(TTR("Paste"), OBJ_MENU_PASTE); } } - - menu->set_pos(get_pos()); menu->popup(); hide(); - updating=false; + updating = false; return false; - } break; case Variant::INPUT_EVENT: { - } break; case Variant::DICTIONARY: { - } break; case Variant::POOL_BYTE_ARRAY: { - } break; case Variant::POOL_INT_ARRAY: { - } break; case Variant::POOL_REAL_ARRAY: { - } break; case Variant::POOL_STRING_ARRAY: { - } break; case Variant::POOL_VECTOR3_ARRAY: { - } break; case Variant::POOL_COLOR_ARRAY: { - } break; default: {} } - updating=false; + updating = false; return true; } @@ -1055,20 +1028,20 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty void CustomPropertyEditor::_file_selected(String p_file) { - switch(type) { + switch (type) { case Variant::STRING: { - if (hint==PROPERTY_HINT_FILE || hint==PROPERTY_HINT_DIR) { + if (hint == PROPERTY_HINT_FILE || hint == PROPERTY_HINT_DIR) { - v=GlobalConfig::get_singleton()->localize_path(p_file); + v = GlobalConfig::get_singleton()->localize_path(p_file); emit_signal("variant_changed"); hide(); } - if (hint==PROPERTY_HINT_GLOBAL_FILE || hint==PROPERTY_HINT_GLOBAL_DIR) { + if (hint == PROPERTY_HINT_GLOBAL_FILE || hint == PROPERTY_HINT_GLOBAL_DIR) { - v=p_file; + v = p_file; emit_signal("variant_changed"); hide(); } @@ -1076,25 +1049,25 @@ void CustomPropertyEditor::_file_selected(String p_file) { } break; case Variant::OBJECT: { - String type=(hint==PROPERTY_HINT_RESOURCE_TYPE)?hint_text:String(); + String type = (hint == PROPERTY_HINT_RESOURCE_TYPE) ? hint_text : String(); - RES res = ResourceLoader::load(p_file,type); + RES res = ResourceLoader::load(p_file, type); if (res.is_null()) { error->set_text(TTR("Error loading file: Not a resource!")); error->popup_centered_minsize(); break; } - v=res.get_ref_ptr(); + v = res.get_ref_ptr(); emit_signal("variant_changed"); hide(); } break; case Variant::IMAGE: { Image image; - Error err = ImageLoader::load_image(p_file,&image); + Error err = ImageLoader::load_image(p_file, &image); ERR_EXPLAIN(TTR("Couldn't load image")); ERR_FAIL_COND(err); - v=image; + v = image; emit_signal("variant_changed"); hide(); } break; @@ -1104,80 +1077,74 @@ void CustomPropertyEditor::_file_selected(String p_file) { void CustomPropertyEditor::_type_create_selected(int p_idx) { + if (type == Variant::INT || type == Variant::REAL) { - if (type==Variant::INT || type==Variant::REAL) { - - - float newval=0; - switch(p_idx) { + float newval = 0; + switch (p_idx) { case EASING_LINEAR: { - newval=1; + newval = 1; } break; case EASING_EASE_IN: { - newval=2.0; + newval = 2.0; } break; case EASING_EASE_OUT: { - newval=0.5; + newval = 0.5; } break; case EASING_ZERO: { - newval=0; + newval = 0; } break; case EASING_IN_OUT: { - newval=-0.5; + newval = -0.5; } break; case EASING_OUT_IN: { - newval=-2.0; + newval = -2.0; } break; } - v=newval; + v = newval; emit_signal("variant_changed"); easing_draw->update(); - } else if (type==Variant::OBJECT) { + } else if (type == Variant::OBJECT) { - ERR_FAIL_INDEX(p_idx,inheritors_array.size()); + ERR_FAIL_INDEX(p_idx, inheritors_array.size()); //List<String> inheritors; //ClassDB::get_inheriters_from(hint_text,&inheritors); //inheritors.push_front(hint_text); //ERR_FAIL_INDEX( p_idx, inheritors.size() ); - String intype=inheritors_array[p_idx]; + String intype = inheritors_array[p_idx]; Object *obj = ClassDB::instance(intype); - ERR_FAIL_COND( !obj ); - + ERR_FAIL_COND(!obj); - Resource *res=obj->cast_to<Resource>(); - ERR_FAIL_COND( !res ); + Resource *res = obj->cast_to<Resource>(); + ERR_FAIL_COND(!res); - v=Ref<Resource>(res).get_ref_ptr(); + v = Ref<Resource>(res).get_ref_ptr(); emit_signal("variant_changed"); hide(); } - } +void CustomPropertyEditor::_color_changed(const Color &p_color) { -void CustomPropertyEditor::_color_changed(const Color& p_color) { - - v=p_color; + v = p_color; emit_signal("variant_changed"); - } void CustomPropertyEditor::_node_path_selected(NodePath p_path) { if (picking_viewport) { - Node* to_node=get_node(p_path); + Node *to_node = get_node(p_path); if (!to_node->cast_to<Viewport>()) { EditorNode::get_singleton()->show_warning("Selected node is not a Viewport!"); return; @@ -1187,86 +1154,84 @@ void CustomPropertyEditor::_node_path_selected(NodePath p_path) { vt.instance(); vt->set_viewport_path_in_scene(get_tree()->get_edited_scene_root()->get_path_to(to_node)); vt->setup_local_to_scene(); - v=vt; + v = vt; emit_signal("variant_changed"); return; } - if (hint==PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE && hint_text!=String()) { + if (hint == PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE && hint_text != String()) { - Node* node=get_node(hint_text); + Node *node = get_node(hint_text); if (node) { - Node *tonode=node->get_node(p_path); + Node *tonode = node->get_node(p_path); if (tonode) { - p_path=node->get_path_to(tonode); + p_path = node->get_path_to(tonode); } } } else if (owner) { - Node *node=NULL; + Node *node = NULL; - if (owner->is_class("Node")) + if (owner->is_class("Node")) node = owner->cast_to<Node>(); else if (owner->is_class("ArrayPropertyEdit")) node = owner->cast_to<ArrayPropertyEdit>()->get_node(); if (!node) { - v=p_path; + v = p_path; emit_signal("variant_changed"); call_deferred("hide"); //to not mess with dialogs return; } - Node *tonode=node->get_node(p_path); + Node *tonode = node->get_node(p_path); if (tonode) { - p_path=node->get_path_to(tonode); + p_path = node->get_path_to(tonode); } } - v=p_path; + v = p_path; emit_signal("variant_changed"); call_deferred("hide"); //to not mess with dialogs - } void CustomPropertyEditor::_action_pressed(int p_which) { - if (updating) return; - switch(type) { + switch (type) { case Variant::BOOL: { - v=checks20[0]->is_pressed(); + v = checks20[0]->is_pressed(); emit_signal("variant_changed"); } break; case Variant::INT: { - if (hint==PROPERTY_HINT_LAYERS_2D_PHYSICS || hint==PROPERTY_HINT_LAYERS_2D_RENDER || hint==PROPERTY_HINT_LAYERS_3D_PHYSICS || hint==PROPERTY_HINT_LAYERS_3D_RENDER) { + if (hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || hint == PROPERTY_HINT_LAYERS_2D_RENDER || hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || hint == PROPERTY_HINT_LAYERS_3D_RENDER) { uint32_t f = v; if (checks20[p_which]->is_pressed()) - f|=(1<<p_which); + f |= (1 << p_which); else - f&=~(1<<p_which); + f &= ~(1 << p_which); - v=f; + v = f; emit_signal("variant_changed"); } } break; case Variant::STRING: { - if (hint==PROPERTY_HINT_MULTILINE_TEXT) { + if (hint == PROPERTY_HINT_MULTILINE_TEXT) { hide(); - } else if (hint==PROPERTY_HINT_FILE || hint==PROPERTY_HINT_GLOBAL_FILE) { - if (p_which==0) { + } else if (hint == PROPERTY_HINT_FILE || hint == PROPERTY_HINT_GLOBAL_FILE) { + if (p_which == 0) { - if (hint==PROPERTY_HINT_FILE) + if (hint == PROPERTY_HINT_FILE) file->set_access(EditorFileDialog::ACCESS_RESOURCES); else file->set_access(EditorFileDialog::ACCESS_FILESYSTEM); @@ -1276,36 +1241,32 @@ void CustomPropertyEditor::_action_pressed(int p_which) { file->clear_filters(); - - if (hint_text!="") { - Vector<String> extensions=hint_text.split(","); - for(int i=0;i<extensions.size();i++) { + if (hint_text != "") { + Vector<String> extensions = hint_text.split(","); + for (int i = 0; i < extensions.size(); i++) { String filter = extensions[i]; if (filter.begins_with(".")) - filter="*"+extensions[i]; + filter = "*" + extensions[i]; else if (!filter.begins_with("*")) - filter="*."+extensions[i]; - - - file->add_filter(filter+" ; "+extensions[i].to_upper() ); + filter = "*." + extensions[i]; + file->add_filter(filter + " ; " + extensions[i].to_upper()); } } file->popup_centered_ratio(); } else { - v=""; + v = ""; emit_signal("variant_changed"); hide(); - } - } else if (hint==PROPERTY_HINT_DIR || hint==PROPERTY_HINT_GLOBAL_DIR) { + } else if (hint == PROPERTY_HINT_DIR || hint == PROPERTY_HINT_GLOBAL_DIR) { - if (p_which==0) { + if (p_which == 0) { - if (hint==PROPERTY_HINT_DIR) + if (hint == PROPERTY_HINT_DIR) file->set_access(EditorFileDialog::ACCESS_RESOURCES); else file->set_access(EditorFileDialog::ACCESS_FILESYSTEM); @@ -1314,73 +1275,66 @@ void CustomPropertyEditor::_action_pressed(int p_which) { file->popup_centered_ratio(); } else { - v=""; + v = ""; emit_signal("variant_changed"); hide(); - } - } } break; case Variant::NODE_PATH: { - if (p_which==0) { + if (p_which == 0) { - picking_viewport=false; + picking_viewport = false; scene_tree->set_title(TTR("Pick a Node")); scene_tree->popup_centered_ratio(); - } else if (p_which==1) { - + } else if (p_which == 1) { - v=NodePath(); + v = NodePath(); emit_signal("variant_changed"); hide(); } } break; case Variant::OBJECT: { - if (p_which==0) { + if (p_which == 0) { + ERR_FAIL_COND(inheritors_array.empty()); - ERR_FAIL_COND( inheritors_array.empty() ); + String intype = inheritors_array[0]; - String intype=inheritors_array[0]; - - - if (hint==PROPERTY_HINT_RESOURCE_TYPE) { + if (hint == PROPERTY_HINT_RESOURCE_TYPE) { Object *obj = ClassDB::instance(intype); - ERR_BREAK( !obj ); - Resource *res=obj->cast_to<Resource>(); - ERR_BREAK( !res ); + ERR_BREAK(!obj); + Resource *res = obj->cast_to<Resource>(); + ERR_BREAK(!res); - v=Ref<Resource>(res).get_ref_ptr(); + v = Ref<Resource>(res).get_ref_ptr(); emit_signal("variant_changed"); hide(); - } - } else if (p_which==1) { + } else if (p_which == 1) { file->set_access(EditorFileDialog::ACCESS_RESOURCES); file->set_mode(EditorFileDialog::MODE_OPEN_FILE); List<String> extensions; - String type=(hint==PROPERTY_HINT_RESOURCE_TYPE)?hint_text:String(); + String type = (hint == PROPERTY_HINT_RESOURCE_TYPE) ? hint_text : String(); - ResourceLoader::get_recognized_extensions_for_type(type,&extensions); + ResourceLoader::get_recognized_extensions_for_type(type, &extensions); file->clear_filters(); - for (List<String>::Element *E=extensions.front();E;E=E->next()) { - - file->add_filter("*."+E->get()+" ; "+E->get().to_upper() ); + for (List<String>::Element *E = extensions.front(); E; E = E->next()) { + file->add_filter("*." + E->get() + " ; " + E->get().to_upper()); } file->popup_centered_ratio(); - } else if (p_which==2) { + } else if (p_which == 2) { - RefPtr RefPtr=v; + RefPtr RefPtr = v; if (!RefPtr.is_null()) { @@ -1388,48 +1342,46 @@ void CustomPropertyEditor::_action_pressed(int p_which) { hide(); } - } else if (p_which==3) { - + } else if (p_which == 3) { - v=Variant(); + v = Variant(); emit_signal("variant_changed"); hide(); - } else if (p_which==4) { + } else if (p_which == 4) { - - RefPtr RefPtr=v; + RefPtr RefPtr = v; Ref<Resource> res_orig = RefPtr; if (res_orig.is_null()) return; List<PropertyInfo> property_list; res_orig->get_property_list(&property_list); - List< Pair<String,Variant> > propvalues; + List<Pair<String, Variant> > propvalues; - for(List<PropertyInfo>::Element *E=property_list.front();E;E=E->next()) { + for (List<PropertyInfo>::Element *E = property_list.front(); E; E = E->next()) { - Pair<String,Variant> p; + Pair<String, Variant> p; PropertyInfo &pi = E->get(); - if (pi.usage&PROPERTY_USAGE_STORAGE) { + if (pi.usage & PROPERTY_USAGE_STORAGE) { - p.first=pi.name; - p.second=res_orig->get(pi.name); + p.first = pi.name; + p.second = res_orig->get(pi.name); } propvalues.push_back(p); } - Ref<Resource> res = Ref<Resource>( ClassDB::instance( res_orig->get_class() )); + Ref<Resource> res = Ref<Resource>(ClassDB::instance(res_orig->get_class())); ERR_FAIL_COND(res.is_null()); - for(List< Pair<String,Variant> >::Element *E=propvalues.front();E;E=E->next()) { + for (List<Pair<String, Variant> >::Element *E = propvalues.front(); E; E = E->next()) { - Pair<String,Variant> &p=E->get(); - res->set(p.first,p.second); + Pair<String, Variant> &p = E->get(); + res->set(p.first, p.second); } - v=res.get_ref_ptr(); + v = res.get_ref_ptr(); emit_signal("variant_changed"); hide(); } @@ -1437,11 +1389,11 @@ void CustomPropertyEditor::_action_pressed(int p_which) { } break; case Variant::IMAGE: { - if (p_which==0) { + if (p_which == 0) { //new image too difficult ERR_PRINT("New Image Unimplemented"); - } else if (p_which==1) { + } else if (p_which == 1) { file->set_access(EditorFileDialog::ACCESS_RESOURCES); file->set_mode(EditorFileDialog::MODE_OPEN_FILE); @@ -1450,17 +1402,16 @@ void CustomPropertyEditor::_action_pressed(int p_which) { file->clear_filters(); - for (List<String>::Element *E=extensions.front();E;E=E->next()) { - - file->add_filter("*."+E->get()+" ; "+E->get().to_upper() ); + for (List<String>::Element *E = extensions.front(); E; E = E->next()) { + file->add_filter("*." + E->get() + " ; " + E->get().to_upper()); } file->popup_centered_ratio(); - } else if (p_which==2) { + } else if (p_which == 2) { - v=Image(); + v = Image(); emit_signal("variant_changed"); hide(); } @@ -1468,7 +1419,6 @@ void CustomPropertyEditor::_action_pressed(int p_which) { } break; default: {}; } - } void CustomPropertyEditor::_scroll_modified(double p_value) { @@ -1498,107 +1448,96 @@ void CustomPropertyEditor::_scroll_modified(double p_value) { */ } +void CustomPropertyEditor::_drag_easing(const InputEvent &p_ev) { -void CustomPropertyEditor::_drag_easing(const InputEvent& p_ev) { - - - if (p_ev.type==InputEvent::MOUSE_MOTION && p_ev.mouse_motion.button_mask&BUTTON_MASK_LEFT) { + if (p_ev.type == InputEvent::MOUSE_MOTION && p_ev.mouse_motion.button_mask & BUTTON_MASK_LEFT) { float rel = p_ev.mouse_motion.relative_x; - if (rel==0) + if (rel == 0) return; - bool flip=hint_text=="attenuation"; + bool flip = hint_text == "attenuation"; if (flip) - rel=-rel; + rel = -rel; float val = v; - if (val==0) + if (val == 0) return; bool sg = val < 0; val = Math::absf(val); - val = Math::log(val)/Math::log((float)2.0); + val = Math::log(val) / Math::log((float)2.0); //logspace - val+=rel*0.05; + val += rel * 0.05; // - val = Math::pow(2.0f,val); + val = Math::pow(2.0f, val); if (sg) - val=-val; + val = -val; - v=val; + v = val; easing_draw->update(); //emit_signal("variant_changed"); emit_signal("variant_changed"); } - if (p_ev.type==InputEvent::MOUSE_BUTTON && p_ev.mouse_button.button_index==BUTTON_LEFT) { - - + if (p_ev.type == InputEvent::MOUSE_BUTTON && p_ev.mouse_button.button_index == BUTTON_LEFT) { } - } - void CustomPropertyEditor::_draw_easing() { - RID ci = easing_draw->get_canvas_item(); Size2 s = easing_draw->get_size(); - Rect2 r(Point2(),s); - r=r.grow(3); - get_stylebox("normal","LineEdit")->draw(ci,r); + Rect2 r(Point2(), s); + r = r.grow(3); + get_stylebox("normal", "LineEdit")->draw(ci, r); //VisualServer::get_singleton()->canvas_item_add - int points = 48; - float prev=1.0; - float exp=v; - bool flip=hint_text=="attenuation"; + float prev = 1.0; + float exp = v; + bool flip = hint_text == "attenuation"; - Ref<Font> f = get_font("font","Label"); - Color color = get_color("font_color","Label"); + Ref<Font> f = get_font("font", "Label"); + Color color = get_color("font_color", "Label"); - for(int i=1;i<=points;i++) { + for (int i = 1; i <= points; i++) { - float ifl = i/float(points); - float iflp = (i-1)/float(points); + float ifl = i / float(points); + float iflp = (i - 1) / float(points); - float h = 1.0-Math::ease(ifl,exp); + float h = 1.0 - Math::ease(ifl, exp); if (flip) { - ifl=1.0-ifl; - iflp=1.0-iflp; + ifl = 1.0 - ifl; + iflp = 1.0 - iflp; } - VisualServer::get_singleton()->canvas_item_add_line(ci,Point2(iflp*s.width,prev*s.height),Point2(ifl*s.width,h*s.height),color); - prev=h; + VisualServer::get_singleton()->canvas_item_add_line(ci, Point2(iflp * s.width, prev * s.height), Point2(ifl * s.width, h * s.height), color); + prev = h; } - f->draw(ci,Point2(10,10+f->get_ascent()),String::num(exp,2),color); + f->draw(ci, Point2(10, 10 + f->get_ascent()), String::num(exp, 2), color); } void CustomPropertyEditor::_text_edit_changed() { - v=text_edit->get_text(); + v = text_edit->get_text(); emit_signal("variant_changed"); - } void CustomPropertyEditor::_create_dialog_callback() { - - v=create_dialog->get_selected_type(); + v = create_dialog->get_selected_type(); emit_signal("variant_changed"); } -void CustomPropertyEditor::_create_selected_property(const String& p_prop) { - +void CustomPropertyEditor::_create_selected_property(const String &p_prop) { - v=p_prop; + v = p_prop; emit_signal("variant_changed"); } @@ -1606,46 +1545,44 @@ void CustomPropertyEditor::_modified(String p_string) { if (updating) return; - updating=true; - switch(type) { + updating = true; + switch (type) { case Variant::INT: { if (evaluator) - v=evaluator->eval(value_editor[0]->get_text()); + v = evaluator->eval(value_editor[0]->get_text()); else - v=value_editor[0]->get_text().to_int(); + v = value_editor[0]->get_text().to_int(); emit_signal("variant_changed"); - } break; case Variant::REAL: { - if (hint!=PROPERTY_HINT_EXP_EASING) { + if (hint != PROPERTY_HINT_EXP_EASING) { if (evaluator) - v=evaluator->eval(value_editor[0]->get_text()); + v = evaluator->eval(value_editor[0]->get_text()); else - v=value_editor[0]->get_text().to_double(); + v = value_editor[0]->get_text().to_double(); emit_signal("variant_changed"); - } } break; case Variant::STRING: { - v=value_editor[0]->get_text(); + v = value_editor[0]->get_text(); emit_signal("variant_changed"); } break; case Variant::VECTOR2: { Vector2 vec; if (evaluator) { - vec.x=evaluator->eval(value_editor[0]->get_text()); - vec.y=evaluator->eval(value_editor[1]->get_text()); + vec.x = evaluator->eval(value_editor[0]->get_text()); + vec.y = evaluator->eval(value_editor[1]->get_text()); } else { - vec.x=value_editor[0]->get_text().to_double(); - vec.y=value_editor[1]->get_text().to_double(); + vec.x = value_editor[0]->get_text().to_double(); + vec.y = value_editor[1]->get_text().to_double(); } - v=vec; + v = vec; _emit_changed_whole_or_field(); } break; @@ -1653,17 +1590,17 @@ void CustomPropertyEditor::_modified(String p_string) { Rect2 r2; if (evaluator) { - r2.pos.x=evaluator->eval(value_editor[0]->get_text()); - r2.pos.y=evaluator->eval(value_editor[1]->get_text()); - r2.size.x=evaluator->eval(value_editor[2]->get_text()); - r2.size.y=evaluator->eval(value_editor[3]->get_text()); + r2.pos.x = evaluator->eval(value_editor[0]->get_text()); + r2.pos.y = evaluator->eval(value_editor[1]->get_text()); + r2.size.x = evaluator->eval(value_editor[2]->get_text()); + r2.size.y = evaluator->eval(value_editor[3]->get_text()); } else { - r2.pos.x=value_editor[0]->get_text().to_double(); - r2.pos.y=value_editor[1]->get_text().to_double(); - r2.size.x=value_editor[2]->get_text().to_double(); - r2.size.y=value_editor[3]->get_text().to_double(); + r2.pos.x = value_editor[0]->get_text().to_double(); + r2.pos.y = value_editor[1]->get_text().to_double(); + r2.size.x = value_editor[2]->get_text().to_double(); + r2.size.y = value_editor[3]->get_text().to_double(); } - v=r2; + v = r2; _emit_changed_whole_or_field(); } break; @@ -1672,15 +1609,15 @@ void CustomPropertyEditor::_modified(String p_string) { Vector3 vec; if (evaluator) { - vec.x=evaluator->eval(value_editor[0]->get_text()); - vec.y=evaluator->eval(value_editor[1]->get_text()); - vec.z=evaluator->eval(value_editor[2]->get_text()); + vec.x = evaluator->eval(value_editor[0]->get_text()); + vec.y = evaluator->eval(value_editor[1]->get_text()); + vec.z = evaluator->eval(value_editor[2]->get_text()); } else { - vec.x=value_editor[0]->get_text().to_double(); - vec.y=value_editor[1]->get_text().to_double(); - vec.z=value_editor[2]->get_text().to_double(); + vec.x = value_editor[0]->get_text().to_double(); + vec.y = value_editor[1]->get_text().to_double(); + vec.z = value_editor[2]->get_text().to_double(); } - v=vec; + v = vec; _emit_changed_whole_or_field(); } break; @@ -1688,17 +1625,17 @@ void CustomPropertyEditor::_modified(String p_string) { Plane pl; if (evaluator) { - pl.normal.x=evaluator->eval(value_editor[0]->get_text()); - pl.normal.y=evaluator->eval(value_editor[1]->get_text()); - pl.normal.z=evaluator->eval(value_editor[2]->get_text()); - pl.d=evaluator->eval(value_editor[3]->get_text()); + pl.normal.x = evaluator->eval(value_editor[0]->get_text()); + pl.normal.y = evaluator->eval(value_editor[1]->get_text()); + pl.normal.z = evaluator->eval(value_editor[2]->get_text()); + pl.d = evaluator->eval(value_editor[3]->get_text()); } else { - pl.normal.x=value_editor[0]->get_text().to_double(); - pl.normal.y=value_editor[1]->get_text().to_double(); - pl.normal.z=value_editor[2]->get_text().to_double(); - pl.d=value_editor[3]->get_text().to_double(); + pl.normal.x = value_editor[0]->get_text().to_double(); + pl.normal.y = value_editor[1]->get_text().to_double(); + pl.normal.z = value_editor[2]->get_text().to_double(); + pl.d = value_editor[3]->get_text().to_double(); } - v=pl; + v = pl; _emit_changed_whole_or_field(); } break; @@ -1706,17 +1643,17 @@ void CustomPropertyEditor::_modified(String p_string) { Quat q; if (evaluator) { - q.x=evaluator->eval(value_editor[0]->get_text()); - q.y=evaluator->eval(value_editor[1]->get_text()); - q.z=evaluator->eval(value_editor[2]->get_text()); - q.w=evaluator->eval(value_editor[3]->get_text()); + q.x = evaluator->eval(value_editor[0]->get_text()); + q.y = evaluator->eval(value_editor[1]->get_text()); + q.z = evaluator->eval(value_editor[2]->get_text()); + q.w = evaluator->eval(value_editor[3]->get_text()); } else { - q.x=value_editor[0]->get_text().to_double(); - q.y=value_editor[1]->get_text().to_double(); - q.z=value_editor[2]->get_text().to_double(); - q.w=value_editor[3]->get_text().to_double(); + q.x = value_editor[0]->get_text().to_double(); + q.y = value_editor[1]->get_text().to_double(); + q.z = value_editor[2]->get_text().to_double(); + q.w = value_editor[3]->get_text().to_double(); } - v=q; + v = q; _emit_changed_whole_or_field(); } break; @@ -1726,83 +1663,82 @@ void CustomPropertyEditor::_modified(String p_string) { Vector3 size; if (evaluator) { - pos.x=evaluator->eval(value_editor[0]->get_text()); - pos.y=evaluator->eval(value_editor[1]->get_text()); - pos.z=evaluator->eval(value_editor[2]->get_text()); - size.x=evaluator->eval(value_editor[3]->get_text()); - size.y=evaluator->eval(value_editor[4]->get_text()); - size.z=evaluator->eval(value_editor[5]->get_text()); + pos.x = evaluator->eval(value_editor[0]->get_text()); + pos.y = evaluator->eval(value_editor[1]->get_text()); + pos.z = evaluator->eval(value_editor[2]->get_text()); + size.x = evaluator->eval(value_editor[3]->get_text()); + size.y = evaluator->eval(value_editor[4]->get_text()); + size.z = evaluator->eval(value_editor[5]->get_text()); } else { - pos.x=value_editor[0]->get_text().to_double(); - pos.y=value_editor[1]->get_text().to_double(); - pos.z=value_editor[2]->get_text().to_double(); - size.x=value_editor[3]->get_text().to_double(); - size.y=value_editor[4]->get_text().to_double(); - size.z=value_editor[5]->get_text().to_double(); + pos.x = value_editor[0]->get_text().to_double(); + pos.y = value_editor[1]->get_text().to_double(); + pos.z = value_editor[2]->get_text().to_double(); + size.x = value_editor[3]->get_text().to_double(); + size.y = value_editor[4]->get_text().to_double(); + size.z = value_editor[5]->get_text().to_double(); } - v=Rect3(pos,size); + v = Rect3(pos, size); _emit_changed_whole_or_field(); } break; case Variant::TRANSFORM2D: { Transform2D m; - for(int i=0;i<6;i++) { + for (int i = 0; i < 6; i++) { if (evaluator) { - m.elements[i/2][i%2]=evaluator->eval(value_editor[i]->get_text()); + m.elements[i / 2][i % 2] = evaluator->eval(value_editor[i]->get_text()); } else { - m.elements[i/2][i%2]=value_editor[i]->get_text().to_double(); + m.elements[i / 2][i % 2] = value_editor[i]->get_text().to_double(); } } - v=m; + v = m; _emit_changed_whole_or_field(); } break; case Variant::BASIS: { Basis m; - for(int i=0;i<9;i++) { + for (int i = 0; i < 9; i++) { if (evaluator) { - m.elements[i/3][i%3]=evaluator->eval(value_editor[i]->get_text()); + m.elements[i / 3][i % 3] = evaluator->eval(value_editor[i]->get_text()); } else { - m.elements[i/3][i%3]=value_editor[i]->get_text().to_double(); + m.elements[i / 3][i % 3] = value_editor[i]->get_text().to_double(); } } - v=m; + v = m; _emit_changed_whole_or_field(); } break; case Variant::TRANSFORM: { Basis basis; - for(int i=0;i<9;i++) { + for (int i = 0; i < 9; i++) { if (evaluator) { - basis.elements[i/3][i%3]=evaluator->eval(value_editor[(i/3)*4+i%3]->get_text()); + basis.elements[i / 3][i % 3] = evaluator->eval(value_editor[(i / 3) * 4 + i % 3]->get_text()); } else { - basis.elements[i/3][i%3]=value_editor[(i/3)*4+i%3]->get_text().to_double(); + basis.elements[i / 3][i % 3] = value_editor[(i / 3) * 4 + i % 3]->get_text().to_double(); } } Vector3 origin; if (evaluator) { - origin.x=evaluator->eval(value_editor[3]->get_text()); - origin.y=evaluator->eval(value_editor[7]->get_text()); - origin.z=evaluator->eval(value_editor[11]->get_text()); + origin.x = evaluator->eval(value_editor[3]->get_text()); + origin.y = evaluator->eval(value_editor[7]->get_text()); + origin.z = evaluator->eval(value_editor[11]->get_text()); } else { - origin.x=value_editor[3]->get_text().to_double(); - origin.y=value_editor[7]->get_text().to_double(); - origin.z=value_editor[11]->get_text().to_double(); + origin.x = value_editor[3]->get_text().to_double(); + origin.y = value_editor[7]->get_text().to_double(); + origin.z = value_editor[11]->get_text().to_double(); } - v=Transform(basis,origin); + v = Transform(basis, origin); _emit_changed_whole_or_field(); - } break; case Variant::COLOR: { /* @@ -1822,49 +1758,40 @@ void CustomPropertyEditor::_modified(String p_string) { } break; case Variant::IMAGE: { - } break; case Variant::NODE_PATH: { - v=NodePath(value_editor[0]->get_text()); + v = NodePath(value_editor[0]->get_text()); emit_signal("variant_changed"); } break; case Variant::INPUT_EVENT: { - } break; case Variant::DICTIONARY: { - } break; case Variant::POOL_BYTE_ARRAY: { - } break; case Variant::POOL_INT_ARRAY: { - } break; case Variant::POOL_REAL_ARRAY: { - } break; case Variant::POOL_STRING_ARRAY: { - } break; case Variant::POOL_VECTOR3_ARRAY: { - } break; case Variant::POOL_COLOR_ARRAY: { - } break; default: {} } - updating=false; + updating = false; } void CustomPropertyEditor::_emit_changed_whole_or_field() { @@ -1872,18 +1799,17 @@ void CustomPropertyEditor::_emit_changed_whole_or_field() { if (!Input::get_singleton()->is_key_pressed(KEY_SHIFT)) { emit_signal("variant_changed"); } else { - emit_signal("variant_field_changed",field_names[focused_value_editor]); + emit_signal("variant_field_changed", field_names[focused_value_editor]); } } -void CustomPropertyEditor::_range_modified(double p_value) -{ - v=p_value; +void CustomPropertyEditor::_range_modified(double p_value) { + v = p_value; emit_signal("variant_changed"); } void CustomPropertyEditor::_focus_enter() { - switch(type) { + switch (type) { case Variant::REAL: case Variant::STRING: case Variant::VECTOR2: @@ -1895,9 +1821,9 @@ void CustomPropertyEditor::_focus_enter() { case Variant::TRANSFORM2D: case Variant::BASIS: case Variant::TRANSFORM: { - for (int i=0;i<MAX_VALUE_EDITORS;++i) { + for (int i = 0; i < MAX_VALUE_EDITORS; ++i) { if (value_editor[i]->has_focus()) { - focused_value_editor=i; + focused_value_editor = i; value_editor[i]->select_all(); break; } @@ -1905,11 +1831,10 @@ void CustomPropertyEditor::_focus_enter() { } break; default: {} } - } void CustomPropertyEditor::_focus_exit() { - switch(type) { + switch (type) { case Variant::REAL: case Variant::STRING: case Variant::VECTOR2: @@ -1921,225 +1846,211 @@ void CustomPropertyEditor::_focus_exit() { case Variant::TRANSFORM2D: case Variant::BASIS: case Variant::TRANSFORM: { - for (int i=0;i<MAX_VALUE_EDITORS;++i) { + for (int i = 0; i < MAX_VALUE_EDITORS; ++i) { value_editor[i]->select(0, 0); } } break; default: {} } - } -void CustomPropertyEditor::config_action_buttons(const List<String>& p_strings) { +void CustomPropertyEditor::config_action_buttons(const List<String> &p_strings) { - int w=100; - int h=18; - int m=5; + int w = 100; + int h = 18; + int m = 5; - set_size( Size2( w, m*2+(h+m)*p_strings.size() ) ); + set_size(Size2(w, m * 2 + (h + m) * p_strings.size())); - for (int i=0;i<MAX_ACTION_BUTTONS;i++) { + for (int i = 0; i < MAX_ACTION_BUTTONS; i++) { - if (i<p_strings.size()) { + if (i < p_strings.size()) { action_buttons[i]->show(); action_buttons[i]->set_text(p_strings[i]); - action_buttons[i]->set_pos( Point2( m, m+i*(h+m) )); - action_buttons[i]->set_size( Size2( w-m*2, h ) ); + action_buttons[i]->set_pos(Point2(m, m + i * (h + m))); + action_buttons[i]->set_size(Size2(w - m * 2, h)); action_buttons[i]->set_flat(true); } else { action_buttons[i]->hide(); } } - - } -void CustomPropertyEditor::config_value_editors(int p_amount, int p_columns,int p_label_w,const List<String>& p_strings) { +void CustomPropertyEditor::config_value_editors(int p_amount, int p_columns, int p_label_w, const List<String> &p_strings) { - int w=80; - int h=20; - int m=10; + int w = 80; + int h = 20; + int m = 10; - int rows=((p_amount-1)/p_columns)+1; + int rows = ((p_amount - 1) / p_columns) + 1; - set_size( Size2( m*(1+p_columns)+(w+p_label_w)*p_columns, m*(1+rows)+h*rows ) ); + set_size(Size2(m * (1 + p_columns) + (w + p_label_w) * p_columns, m * (1 + rows) + h * rows)); - for (int i=0;i<MAX_VALUE_EDITORS;i++) { + for (int i = 0; i < MAX_VALUE_EDITORS; i++) { - int c=i%p_columns; - int r=i/p_columns; + int c = i % p_columns; + int r = i / p_columns; - if (i<p_amount) { + if (i < p_amount) { value_editor[i]->show(); value_label[i]->show(); - value_label[i]->set_text(i<p_strings.size()?p_strings[i]:String("")); - value_editor[i]->set_pos( Point2( m+p_label_w+c*(w+m+p_label_w), m+r*(h+m) )); - value_editor[i]->set_size( Size2( w, h ) ); - value_label[i]->set_pos( Point2( m+c*(w+m+p_label_w), m+r*(h+m) ) ); + value_label[i]->set_text(i < p_strings.size() ? p_strings[i] : String("")); + value_editor[i]->set_pos(Point2(m + p_label_w + c * (w + m + p_label_w), m + r * (h + m))); + value_editor[i]->set_size(Size2(w, h)); + value_label[i]->set_pos(Point2(m + c * (w + m + p_label_w), m + r * (h + m))); value_editor[i]->set_editable(!read_only); } else { value_editor[i]->hide(); value_label[i]->hide(); } } - - - } - void CustomPropertyEditor::_bind_methods() { ClassDB::bind_method("_focus_enter", &CustomPropertyEditor::_focus_enter); ClassDB::bind_method("_focus_exit", &CustomPropertyEditor::_focus_exit); - ClassDB::bind_method("_modified",&CustomPropertyEditor::_modified); + ClassDB::bind_method("_modified", &CustomPropertyEditor::_modified); ClassDB::bind_method("_range_modified", &CustomPropertyEditor::_range_modified); - ClassDB::bind_method("_scroll_modified",&CustomPropertyEditor::_scroll_modified); - ClassDB::bind_method("_action_pressed",&CustomPropertyEditor::_action_pressed); - ClassDB::bind_method("_file_selected",&CustomPropertyEditor::_file_selected); - ClassDB::bind_method("_type_create_selected",&CustomPropertyEditor::_type_create_selected); - ClassDB::bind_method("_node_path_selected",&CustomPropertyEditor::_node_path_selected); - ClassDB::bind_method("_color_changed",&CustomPropertyEditor::_color_changed); - ClassDB::bind_method("_draw_easing",&CustomPropertyEditor::_draw_easing); - ClassDB::bind_method("_drag_easing",&CustomPropertyEditor::_drag_easing); - ClassDB::bind_method( "_text_edit_changed",&CustomPropertyEditor::_text_edit_changed); - ClassDB::bind_method( "_menu_option",&CustomPropertyEditor::_menu_option); - ClassDB::bind_method( "_create_dialog_callback",&CustomPropertyEditor::_create_dialog_callback); - ClassDB::bind_method( "_create_selected_property",&CustomPropertyEditor::_create_selected_property); - - - - ADD_SIGNAL( MethodInfo("variant_changed") ); - ADD_SIGNAL( MethodInfo("variant_field_changed",PropertyInfo(Variant::STRING,"field")) ); - ADD_SIGNAL( MethodInfo("resource_edit_request") ); + ClassDB::bind_method("_scroll_modified", &CustomPropertyEditor::_scroll_modified); + ClassDB::bind_method("_action_pressed", &CustomPropertyEditor::_action_pressed); + ClassDB::bind_method("_file_selected", &CustomPropertyEditor::_file_selected); + ClassDB::bind_method("_type_create_selected", &CustomPropertyEditor::_type_create_selected); + ClassDB::bind_method("_node_path_selected", &CustomPropertyEditor::_node_path_selected); + ClassDB::bind_method("_color_changed", &CustomPropertyEditor::_color_changed); + ClassDB::bind_method("_draw_easing", &CustomPropertyEditor::_draw_easing); + ClassDB::bind_method("_drag_easing", &CustomPropertyEditor::_drag_easing); + ClassDB::bind_method("_text_edit_changed", &CustomPropertyEditor::_text_edit_changed); + ClassDB::bind_method("_menu_option", &CustomPropertyEditor::_menu_option); + ClassDB::bind_method("_create_dialog_callback", &CustomPropertyEditor::_create_dialog_callback); + ClassDB::bind_method("_create_selected_property", &CustomPropertyEditor::_create_selected_property); + + ADD_SIGNAL(MethodInfo("variant_changed")); + ADD_SIGNAL(MethodInfo("variant_field_changed", PropertyInfo(Variant::STRING, "field"))); + ADD_SIGNAL(MethodInfo("resource_edit_request")); } CustomPropertyEditor::CustomPropertyEditor() { + read_only = false; + updating = false; - read_only=false; - updating=false; - - for (int i=0;i<MAX_VALUE_EDITORS;i++) { + for (int i = 0; i < MAX_VALUE_EDITORS; i++) { - value_editor[i]=memnew( LineEdit ); - add_child( value_editor[i] ); - value_label[i]=memnew( Label ); - add_child( value_label[i] ); + value_editor[i] = memnew(LineEdit); + add_child(value_editor[i]); + value_label[i] = memnew(Label); + add_child(value_label[i]); value_editor[i]->hide(); value_label[i]->hide(); - value_editor[i]->connect("text_entered", this,"_modified"); + value_editor[i]->connect("text_entered", this, "_modified"); value_editor[i]->connect("focus_entered", this, "_focus_enter"); value_editor[i]->connect("focus_exited", this, "_focus_exit"); } - focused_value_editor=-1; + focused_value_editor = -1; - for(int i=0;i<4;i++) { + for (int i = 0; i < 4; i++) { - scroll[i] = memnew( HScrollBar ); + scroll[i] = memnew(HScrollBar); scroll[i]->hide(); scroll[i]->set_min(0); scroll[i]->set_max(1.0); scroll[i]->set_step(0.01); add_child(scroll[i]); - scroll[i]->connect("value_changed", this,"_scroll_modified"); - + scroll[i]->connect("value_changed", this, "_scroll_modified"); } - checks20gc = memnew( GridContainer ); + checks20gc = memnew(GridContainer); add_child(checks20gc); checks20gc->set_columns(11); - for(int i=0;i<20;i++) { - if (i==5 || i==15) { - Control *space = memnew( Control ); - space->set_custom_minimum_size(Size2(20,0)*EDSCALE); + for (int i = 0; i < 20; i++) { + if (i == 5 || i == 15) { + Control *space = memnew(Control); + space->set_custom_minimum_size(Size2(20, 0) * EDSCALE); checks20gc->add_child(space); } - checks20[i]=memnew( CheckBox ); + checks20[i] = memnew(CheckBox); checks20[i]->set_toggle_mode(true); - checks20[i]->set_focus_mode(FOCUS_NONE); + checks20[i]->set_focus_mode(FOCUS_NONE); checks20gc->add_child(checks20[i]); checks20[i]->hide(); - checks20[i]->connect("pressed",this,"_action_pressed",make_binds(i)); - checks20[i]->set_tooltip(vformat(TTR("Bit %d, val %d."), i, 1<<i)); + checks20[i]->connect("pressed", this, "_action_pressed", make_binds(i)); + checks20[i]->set_tooltip(vformat(TTR("Bit %d, val %d."), i, 1 << i)); } - text_edit = memnew( TextEdit ); + text_edit = memnew(TextEdit); add_child(text_edit); text_edit->set_area_as_parent_rect(); - for(int i=0;i<4;i++) - text_edit->set_margin((Margin)i,5); - text_edit->set_margin(MARGIN_BOTTOM,30); + for (int i = 0; i < 4; i++) + text_edit->set_margin((Margin)i, 5); + text_edit->set_margin(MARGIN_BOTTOM, 30); text_edit->hide(); - text_edit->connect("text_changed",this,"_text_edit_changed"); + text_edit->connect("text_changed", this, "_text_edit_changed"); - for (int i=0;i<MAX_ACTION_BUTTONS;i++) { + for (int i = 0; i < MAX_ACTION_BUTTONS; i++) { - action_buttons[i]=memnew(Button); + action_buttons[i] = memnew(Button); action_buttons[i]->hide(); add_child(action_buttons[i]); Vector<Variant> binds; binds.push_back(i); - action_buttons[i]->connect("pressed", this,"_action_pressed",binds); + action_buttons[i]->connect("pressed", this, "_action_pressed", binds); } - color_picker=NULL; - - + color_picker = NULL; set_as_toplevel(true); - file = memnew ( EditorFileDialog ); + file = memnew(EditorFileDialog); add_child(file); file->hide(); - file->connect("file_selected", this,"_file_selected"); - file->connect("dir_selected", this,"_file_selected"); + file->connect("file_selected", this, "_file_selected"); + file->connect("dir_selected", this, "_file_selected"); - error = memnew( ConfirmationDialog ); + error = memnew(ConfirmationDialog); error->set_title(TTR("Error!")); add_child(error); //error->get_cancel()->hide(); - type_button = memnew( MenuButton ); + type_button = memnew(MenuButton); add_child(type_button); type_button->hide(); - type_button->get_popup()->connect("id_pressed", this,"_type_create_selected"); + type_button->get_popup()->connect("id_pressed", this, "_type_create_selected"); - - scene_tree = memnew( SceneTreeDialog ); + scene_tree = memnew(SceneTreeDialog); add_child(scene_tree); - scene_tree->connect("selected", this,"_node_path_selected"); + scene_tree->connect("selected", this, "_node_path_selected"); scene_tree->get_scene_tree()->set_show_enabled_subscene(true); - texture_preview = memnew( TextureRect ); - add_child( texture_preview); + texture_preview = memnew(TextureRect); + add_child(texture_preview); texture_preview->hide(); - easing_draw=memnew( Control ); + easing_draw = memnew(Control); add_child(easing_draw); easing_draw->hide(); - easing_draw->connect("draw",this,"_draw_easing"); - easing_draw->connect("gui_input",this,"_drag_easing"); + easing_draw->connect("draw", this, "_draw_easing"); + easing_draw->connect("gui_input", this, "_drag_easing"); //easing_draw->emit_signal(SceneStringNames::get_singleton()->input_event,InputEvent()); easing_draw->set_default_cursor_shape(Control::CURSOR_MOVE); menu = memnew(PopupMenu); add_child(menu); - menu->connect("id_pressed",this,"_menu_option"); + menu->connect("id_pressed", this, "_menu_option"); evaluator = NULL; - spinbox = memnew ( SpinBox ); + spinbox = memnew(SpinBox); add_child(spinbox); spinbox->set_area_as_parent_rect(5); - spinbox->connect("value_changed",this,"_range_modified"); + spinbox->connect("value_changed", this, "_range_modified"); - slider = memnew ( HSlider ); + slider = memnew(HSlider); add_child(slider); slider->set_area_as_parent_rect(5); - slider->connect("value_changed",this,"_range_modified"); + slider->connect("value_changed", this, "_range_modified"); create_dialog = NULL; property_select = NULL; @@ -2152,56 +2063,54 @@ bool PropertyEditor::_might_be_in_instance() { Node *node = obj->cast_to<Node>(); - Node* edited_scene =EditorNode::get_singleton()->get_edited_scene(); + Node *edited_scene = EditorNode::get_singleton()->get_edited_scene(); - bool might_be=false; + bool might_be = false; - while(node) { + while (node) { if (node->get_scene_instance_state().is_valid()) { - might_be=true; + might_be = true; break; } - if (node==edited_scene) { + if (node == edited_scene) { if (node->get_scene_inherited_state().is_valid()) { - might_be=true; + might_be = true; break; } - might_be=false; + might_be = false; break; } - node=node->get_owner(); + node = node->get_owner(); } return might_be; - } -bool PropertyEditor::_get_instanced_node_original_property(const StringName& p_prop, Variant& value) { +bool PropertyEditor::_get_instanced_node_original_property(const StringName &p_prop, Variant &value) { Node *node = obj->cast_to<Node>(); if (!node) return false; - Node *orig=node; + Node *orig = node; - Node* edited_scene =EditorNode::get_singleton()->get_edited_scene(); + Node *edited_scene = EditorNode::get_singleton()->get_edited_scene(); - bool found=false; + bool found = false; //print_line("for prop - "+String(p_prop)); - - while(node) { + while (node) { Ref<SceneState> ss; - if (node==edited_scene) { - ss=node->get_scene_inherited_state(); + if (node == edited_scene) { + ss = node->get_scene_inherited_state(); } else { - ss=node->get_scene_instance_state(); + ss = node->get_scene_instance_state(); } //print_line("at - "+String(edited_scene->get_path_to(node))); @@ -2210,239 +2119,223 @@ bool PropertyEditor::_get_instanced_node_original_property(const StringName& p_p NodePath np = node->get_path_to(orig); int node_idx = ss->find_node_by_path(np); //print_line("\t valid, nodeidx "+itos(node_idx)); - if (node_idx>=0) { - bool lfound=false; + if (node_idx >= 0) { + bool lfound = false; Variant lvar; - lvar=ss->get_property_value(node_idx,p_prop,lfound); + lvar = ss->get_property_value(node_idx, p_prop, lfound); if (lfound) { - found=true; - value=lvar; + found = true; + value = lvar; //print_line("\t found value "+String(value)); } } } - if (node==edited_scene) { + if (node == edited_scene) { //just in case break; } - node=node->get_owner(); - + node = node->get_owner(); } return found; } -bool PropertyEditor::_is_property_different(const Variant& p_current, const Variant& p_orig,int p_usage) { - +bool PropertyEditor::_is_property_different(const Variant &p_current, const Variant &p_orig, int p_usage) { { Node *node = obj->cast_to<Node>(); if (!node) return false; - Node* edited_scene =EditorNode::get_singleton()->get_edited_scene(); - bool found_state=false; + Node *edited_scene = EditorNode::get_singleton()->get_edited_scene(); + bool found_state = false; //print_line("for prop - "+String(p_prop)); - - while(node) { + while (node) { Ref<SceneState> ss; - if (node==edited_scene) { - ss=node->get_scene_inherited_state(); + if (node == edited_scene) { + ss = node->get_scene_inherited_state(); } else { - ss=node->get_scene_instance_state(); + ss = node->get_scene_instance_state(); } if (ss.is_valid()) { - found_state=true; + found_state = true; } - if (node==edited_scene) { + if (node == edited_scene) { //just in case break; } - node=node->get_owner(); + node = node->get_owner(); } if (!found_state) return false; //pointless to check if we are not comparing against anything. } - if (p_orig.get_type()==Variant::NIL) { - - + if (p_orig.get_type() == Variant::NIL) { //special cases - if (p_current.is_zero() && p_usage&PROPERTY_USAGE_STORE_IF_NONZERO) + if (p_current.is_zero() && p_usage & PROPERTY_USAGE_STORE_IF_NONZERO) return false; - if (p_current.is_one() && p_usage&PROPERTY_USAGE_STORE_IF_NONONE) + if (p_current.is_one() && p_usage & PROPERTY_USAGE_STORE_IF_NONONE) return false; } - if (p_current.get_type()==Variant::REAL && p_orig.get_type()==Variant::REAL) { + if (p_current.get_type() == Variant::REAL && p_orig.get_type() == Variant::REAL) { float a = p_current; float b = p_orig; - return Math::abs(a-b)>CMP_EPSILON; //this must be done because, as some scenes save as text, there might be a tiny difference in floats due to numerical error + return Math::abs(a - b) > CMP_EPSILON; //this must be done because, as some scenes save as text, there might be a tiny difference in floats due to numerical error } - return bool(Variant::evaluate(Variant::OP_NOT_EQUAL,p_current,p_orig)); + return bool(Variant::evaluate(Variant::OP_NOT_EQUAL, p_current, p_orig)); } -TreeItem *PropertyEditor::find_item(TreeItem *p_item,const String& p_name) { - +TreeItem *PropertyEditor::find_item(TreeItem *p_item, const String &p_name) { if (!p_item) return NULL; String name = p_item->get_metadata(1); - if (name==p_name) { + if (name == p_name) { return p_item; } - TreeItem *c=p_item->get_children(); + TreeItem *c = p_item->get_children(); while (c) { - TreeItem *found = find_item(c,p_name); + TreeItem *found = find_item(c, p_name); if (found) return found; - c=c->get_next(); + c = c->get_next(); } return NULL; } +void PropertyEditor::_changed_callback(Object *p_changed, const char *p_prop) { -void PropertyEditor::_changed_callback(Object *p_changed,const char * p_prop) { - - - _changed_callbacks(p_changed,p_prop); + _changed_callbacks(p_changed, p_prop); } -void PropertyEditor::_changed_callbacks(Object *p_changed,const String& p_prop) { +void PropertyEditor::_changed_callbacks(Object *p_changed, const String &p_prop) { - - if (p_changed!=obj) + if (p_changed != obj) return; if (changing) return; - if (p_prop==String()) - update_tree_pending=true; + if (p_prop == String()) + update_tree_pending = true; else { - pending[p_prop]=p_prop; - + pending[p_prop] = p_prop; } } -void PropertyEditor::update_property(const String& p_prop) { +void PropertyEditor::update_property(const String &p_prop) { if (obj) - _changed_callbacks(obj,p_prop); + _changed_callbacks(obj, p_prop); } +void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String &p_name, int p_hint, const String &p_hint_text) { -void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p_name, int p_hint, const String& p_hint_text) { - - switch( p_type ) { + switch (p_type) { case Variant::BOOL: { - p_item->set_checked( 1, obj->get( p_name ) ); + p_item->set_checked(1, obj->get(p_name)); } break; case Variant::REAL: case Variant::INT: { - if (p_hint==PROPERTY_HINT_LAYERS_2D_PHYSICS || p_hint==PROPERTY_HINT_LAYERS_2D_RENDER || p_hint==PROPERTY_HINT_LAYERS_3D_PHYSICS || p_hint==PROPERTY_HINT_LAYERS_3D_RENDER) { + if (p_hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || p_hint == PROPERTY_HINT_LAYERS_2D_RENDER || p_hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || p_hint == PROPERTY_HINT_LAYERS_3D_RENDER) { tree->update(); break; } - if (p_hint==PROPERTY_HINT_FLAGS) { + if (p_hint == PROPERTY_HINT_FLAGS) { Vector<String> values = p_hint_text.split(","); String flags; int val = obj->get(p_name); - for(int i=0;i<values.size();i++) { + for (int i = 0; i < values.size(); i++) { String v = values[i]; - if (v=="") + if (v == "") continue; - if (!(val&(1<<i))) + if (!(val & (1 << i))) continue; - if (flags!="") - flags+=", "; - flags+=v; + if (flags != "") + flags += ", "; + flags += v; } - p_item->set_text(1, flags ); + p_item->set_text(1, flags); break; } - if (p_hint==PROPERTY_HINT_EXP_EASING) { + if (p_hint == PROPERTY_HINT_EXP_EASING) { - p_item->set_text(1, String::num(obj->get( p_name ),2) ); + p_item->set_text(1, String::num(obj->get(p_name), 2)); break; } - //p_item->set_cell_mode( 1, TreeItem::CELL_MODE_RANGE ); - if (p_type==Variant::REAL) { - p_item->set_range(1, obj->get( p_name ) ); + if (p_type == Variant::REAL) { + p_item->set_range(1, obj->get(p_name)); } else { /* FIXME: Why are both statements equal? */ - p_item->set_range(1, obj->get( p_name ) ); + p_item->set_range(1, obj->get(p_name)); } - - p_item->set_editable(1,!read_only); - + p_item->set_editable(1, !read_only); } break; case Variant::STRING: + if (p_hint == PROPERTY_HINT_TYPE_STRING) { - if (p_hint==PROPERTY_HINT_TYPE_STRING) { - - p_item->set_text(1,obj->get(p_name)); + p_item->set_text(1, obj->get(p_name)); } - if ( p_hint==PROPERTY_HINT_METHOD_OF_VARIANT_TYPE || - p_hint==PROPERTY_HINT_METHOD_OF_BASE_TYPE || - p_hint==PROPERTY_HINT_METHOD_OF_INSTANCE || - p_hint==PROPERTY_HINT_METHOD_OF_SCRIPT || - p_hint==PROPERTY_HINT_PROPERTY_OF_VARIANT_TYPE || - p_hint==PROPERTY_HINT_PROPERTY_OF_BASE_TYPE || - p_hint==PROPERTY_HINT_PROPERTY_OF_INSTANCE || - p_hint==PROPERTY_HINT_PROPERTY_OF_SCRIPT ) { + if (p_hint == PROPERTY_HINT_METHOD_OF_VARIANT_TYPE || + p_hint == PROPERTY_HINT_METHOD_OF_BASE_TYPE || + p_hint == PROPERTY_HINT_METHOD_OF_INSTANCE || + p_hint == PROPERTY_HINT_METHOD_OF_SCRIPT || + p_hint == PROPERTY_HINT_PROPERTY_OF_VARIANT_TYPE || + p_hint == PROPERTY_HINT_PROPERTY_OF_BASE_TYPE || + p_hint == PROPERTY_HINT_PROPERTY_OF_INSTANCE || + p_hint == PROPERTY_HINT_PROPERTY_OF_SCRIPT) { - p_item->set_text(1,obj->get(p_name)); + p_item->set_text(1, obj->get(p_name)); } - - if (p_hint==PROPERTY_HINT_ENUM) { + if (p_hint == PROPERTY_HINT_ENUM) { Vector<String> strings = p_hint_text.split(","); String current = obj->get(p_name); - int idx=0; - for(int x=0;x<strings.size();x++) { - if (strings[x]==current) { - idx=x; + int idx = 0; + for (int x = 0; x < strings.size(); x++) { + if (strings[x] == current) { + idx = x; break; } } p_item->set_text(1, p_hint_text); - p_item->set_range(1,idx); + p_item->set_range(1, idx); break; } @@ -2455,7 +2348,7 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p case Variant::BASIS: case Variant::TRANSFORM: { - p_item->set_text(1,obj->get(p_name)); + p_item->set_text(1, obj->get(p_name)); } break; case Variant::COLOR: { @@ -2466,209 +2359,188 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p } break; case Variant::IMAGE: { - Image img = obj->get( p_name ); + Image img = obj->get(p_name); if (img.empty()) - p_item->set_text(1,"[Image (empty)]"); + p_item->set_text(1, "[Image (empty)]"); else - p_item->set_text(1,"[Image "+itos(img.get_width())+"x"+itos(img.get_height())+"-"+String(Image::get_format_name(img.get_format()))+"]"); + p_item->set_text(1, "[Image " + itos(img.get_width()) + "x" + itos(img.get_height()) + "-" + String(Image::get_format_name(img.get_format())) + "]"); } break; case Variant::NODE_PATH: { - p_item->set_text(1,obj->get(p_name)); + p_item->set_text(1, obj->get(p_name)); } break; case Variant::OBJECT: { - - if (obj->get( p_name ).get_type() == Variant::NIL || obj->get( p_name ).operator RefPtr().is_null()) { - p_item->set_text(1,"<null>"); - p_item->set_icon(1,Ref<Texture>()); + if (obj->get(p_name).get_type() == Variant::NIL || obj->get(p_name).operator RefPtr().is_null()) { + p_item->set_text(1, "<null>"); + p_item->set_icon(1, Ref<Texture>()); Dictionary d = p_item->get_metadata(0); - int hint=d.has("hint")?d["hint"].operator int():-1; - String hint_text=d.has("hint_text")?d["hint_text"]:""; - if (hint==PROPERTY_HINT_RESOURCE_TYPE && hint_text == "Texture") { - p_item->set_icon(1,NULL); + int hint = d.has("hint") ? d["hint"].operator int() : -1; + String hint_text = d.has("hint_text") ? d["hint_text"] : ""; + if (hint == PROPERTY_HINT_RESOURCE_TYPE && hint_text == "Texture") { + p_item->set_icon(1, NULL); } } else { - RES res = obj->get( p_name ).operator RefPtr(); + RES res = obj->get(p_name).operator RefPtr(); if (res->is_class("Texture")) { int tw = EditorSettings::get_singleton()->get("docks/property_editor/texture_preview_width"); - p_item->set_icon_max_width(1,tw); - p_item->set_icon(1,res); - p_item->set_text(1,""); + p_item->set_icon_max_width(1, tw); + p_item->set_icon(1, res); + p_item->set_text(1, ""); } else if (res->get_name() != "") { p_item->set_text(1, res->get_name()); - } else if (res->get_path()!="" && !res->get_path().begins_with("local://")) { + } else if (res->get_path() != "" && !res->get_path().begins_with("local://")) { p_item->set_text(1, res->get_path().get_file()); } else { - p_item->set_text(1,"<"+res->get_class()+">"); + p_item->set_text(1, "<" + res->get_class() + ">"); }; - if (res.is_valid() && res->get_path().is_resource_file()) { - p_item->set_tooltip(1,res->get_path()); + p_item->set_tooltip(1, res->get_path()); } else if (res.is_valid()) { - p_item->set_tooltip(1,res->get_name()+" ("+res->get_class()+")"); + p_item->set_tooltip(1, res->get_name() + " (" + res->get_class() + ")"); } + if (has_icon(res->get_class(), "EditorIcons")) { - if (has_icon(res->get_class(),"EditorIcons")) { - - p_item->set_icon(0,get_icon(res->get_class(),"EditorIcons")); + p_item->set_icon(0, get_icon(res->get_class(), "EditorIcons")); } else { Dictionary d = p_item->get_metadata(0); - int hint=d.has("hint")?d["hint"].operator int():-1; - String hint_text=d.has("hint_text")?d["hint_text"]:""; - if (hint==PROPERTY_HINT_RESOURCE_TYPE) { + int hint = d.has("hint") ? d["hint"].operator int() : -1; + String hint_text = d.has("hint_text") ? d["hint_text"] : ""; + if (hint == PROPERTY_HINT_RESOURCE_TYPE) { - if (has_icon(hint_text,"EditorIcons")) { + if (has_icon(hint_text, "EditorIcons")) { - p_item->set_icon(0,get_icon(hint_text,"EditorIcons")); + p_item->set_icon(0, get_icon(hint_text, "EditorIcons")); } else { - p_item->set_icon(0,get_icon("Object","EditorIcons")); - + p_item->set_icon(0, get_icon("Object", "EditorIcons")); } } } if (!res->is_class("Texture")) { //texture already previews via itself - EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res,this,"_resource_preview_done",p_item->get_instance_ID()); + EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res, this, "_resource_preview_done", p_item->get_instance_ID()); } - - - } - } break; default: {}; } - } +void PropertyEditor::_check_reload_status(const String &p_name, TreeItem *item) { -void PropertyEditor::_check_reload_status(const String&p_name, TreeItem* item) { - - bool has_reload=false; - int found=-1; - bool is_disabled=false; + bool has_reload = false; + int found = -1; + bool is_disabled = false; - for(int i=0;i<item->get_button_count(1);i++) { + for (int i = 0; i < item->get_button_count(1); i++) { - if (item->get_button_id(1,i)==3) { - found=i; - is_disabled=item->is_button_disabled(1,i); + if (item->get_button_id(1, i) == 3) { + found = i; + is_disabled = item->is_button_disabled(1, i); break; } } if (_might_be_in_instance()) { - Variant vorig; - Dictionary d=item->get_metadata(0); - int usage = d.has("usage")?int(int(d["usage"])&(PROPERTY_USAGE_STORE_IF_NONONE|PROPERTY_USAGE_STORE_IF_NONZERO)):0; - + Dictionary d = item->get_metadata(0); + int usage = d.has("usage") ? int(int(d["usage"]) & (PROPERTY_USAGE_STORE_IF_NONONE | PROPERTY_USAGE_STORE_IF_NONZERO)) : 0; - if (_get_instanced_node_original_property(p_name,vorig) || usage) { + if (_get_instanced_node_original_property(p_name, vorig) || usage) { Variant v = obj->get(p_name); - - bool changed = _is_property_different(v,vorig,usage); + bool changed = _is_property_different(v, vorig, usage); //if ((found!=-1 && !is_disabled)!=changed) { - if (changed) { + if (changed) { - has_reload=true; - } else { - - } + has_reload = true; + } else { + } //} - } - } - if (obj->call("property_can_revert",p_name).operator bool()) { + if (obj->call("property_can_revert", p_name).operator bool()) { - has_reload=true; + has_reload = true; } - if (!has_reload && !obj->get_script().is_null()) { Ref<Script> scr = obj->get_script(); Variant orig_value; - if (scr->get_property_default_value(p_name,orig_value)) { - if (orig_value!=obj->get(p_name)) { - has_reload=true; + if (scr->get_property_default_value(p_name, orig_value)) { + if (orig_value != obj->get(p_name)) { + has_reload = true; } } } //print_line("found: "+itos(found)+" has reload: "+itos(has_reload)+" is_disabled "+itos(is_disabled)); - if (found!=-1 && !has_reload) { + if (found != -1 && !has_reload) { if (!is_disabled) { - item->erase_button(1,found); - if (item->get_cell_mode(1)==TreeItem::CELL_MODE_RANGE && item->get_text(1)==String()) { - item->add_button(1,get_icon("ReloadEmpty","EditorIcons"),3,true); + item->erase_button(1, found); + if (item->get_cell_mode(1) == TreeItem::CELL_MODE_RANGE && item->get_text(1) == String()) { + item->add_button(1, get_icon("ReloadEmpty", "EditorIcons"), 3, true); } } - } else if (found==-1 && has_reload) { - item->add_button(1,get_icon("ReloadSmall","EditorIcons"),3); - } else if (found!=-1 && has_reload && is_disabled) { - item->erase_button(1,found); - item->add_button(1,get_icon("ReloadSmall","EditorIcons"),3); + } else if (found == -1 && has_reload) { + item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3); + } else if (found != -1 && has_reload && is_disabled) { + item->erase_button(1, found); + item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3); } } - - -bool PropertyEditor::_is_drop_valid(const Dictionary& p_drag_data, const Dictionary& p_item_data) const { +bool PropertyEditor::_is_drop_valid(const Dictionary &p_drag_data, const Dictionary &p_item_data) const { Dictionary d = p_item_data; if (d.has("type")) { int type = d["type"]; - if (type==Variant::OBJECT && d.has("hint") && d.has("hint_text") && int(d["hint"])==PROPERTY_HINT_RESOURCE_TYPE) { + if (type == Variant::OBJECT && d.has("hint") && d.has("hint_text") && int(d["hint"]) == PROPERTY_HINT_RESOURCE_TYPE) { - - String allowed_type=d["hint_text"]; + String allowed_type = d["hint_text"]; Dictionary drag_data = p_drag_data; - if (drag_data.has("type") && String(drag_data["type"])=="resource") { + if (drag_data.has("type") && String(drag_data["type"]) == "resource") { Ref<Resource> res = drag_data["resource"]; - for(int i=0;i<allowed_type.get_slice_count(",");i++) { - String at = allowed_type.get_slice(",",i).strip_edges(); - if (res.is_valid() && ClassDB::is_parent_class(res->get_class(),at)) { + for (int i = 0; i < allowed_type.get_slice_count(","); i++) { + String at = allowed_type.get_slice(",", i).strip_edges(); + if (res.is_valid() && ClassDB::is_parent_class(res->get_class(), at)) { return true; } } - } - if (drag_data.has("type") && String(drag_data["type"])=="files") { + if (drag_data.has("type") && String(drag_data["type"]) == "files") { Vector<String> files = drag_data["files"]; - if (files.size()==1) { + if (files.size() == 1) { String file = files[0]; String ftype = EditorFileSystem::get_singleton()->get_file_type(file); - if (ftype!="") { + if (ftype != "") { - for(int i=0;i<allowed_type.get_slice_count(",");i++) { - String at = allowed_type.get_slice(",",i).strip_edges(); - if (ClassDB::is_parent_class(ftype,at)) { + for (int i = 0; i < allowed_type.get_slice_count(","); i++) { + String at = allowed_type.get_slice(",", i).strip_edges(); + if (ClassDB::is_parent_class(ftype, at)) { return true; } } @@ -2678,14 +2550,12 @@ bool PropertyEditor::_is_drop_valid(const Dictionary& p_drag_data, const Diction } } - return false; - } -void PropertyEditor::_mark_drop_fields(TreeItem* p_at) { +void PropertyEditor::_mark_drop_fields(TreeItem *p_at) { - if (_is_drop_valid(get_viewport()->gui_get_drag_data(),p_at->get_metadata(0))) - p_at->set_custom_bg_color(1,Color(0.7,0.5,0.2),true); + if (_is_drop_valid(get_viewport()->gui_get_drag_data(), p_at->get_metadata(0))) + p_at->set_custom_bg_color(1, Color(0.7, 0.5, 0.2), true); if (p_at->get_children()) { _mark_drop_fields(p_at->get_children()); @@ -2696,7 +2566,7 @@ void PropertyEditor::_mark_drop_fields(TreeItem* p_at) { } } -Variant PropertyEditor::get_drag_data_fw(const Point2& p_point,Control* p_from) { +Variant PropertyEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from) { TreeItem *item = tree->get_item_at_pos(p_point); if (!item) @@ -2707,60 +2577,57 @@ Variant PropertyEditor::get_drag_data_fw(const Point2& p_point,Control* p_from) return Variant(); int col = tree->get_column_at_pos(p_point); - if (col==0) { + if (col == 0) { Dictionary dp; - dp["type"]="obj_property"; - dp["object"]=obj; - dp["property"]=d["name"]; - dp["value"]=obj->get(d["name"]); + dp["type"] = "obj_property"; + dp["object"] = obj; + dp["property"] = d["name"]; + dp["value"] = obj->get(d["name"]); - Label *label =memnew( Label ); + Label *label = memnew(Label); label->set_text(d["name"]); set_drag_preview(label); return dp; } - - Variant val = obj->get(d["name"]); - if (val.get_type()==Variant::OBJECT) { + if (val.get_type() == Variant::OBJECT) { RES res = val; if (res.is_valid()) { custom_editor->hide_menu(); - return EditorNode::get_singleton()->drag_resource(res,p_from); + return EditorNode::get_singleton()->drag_resource(res, p_from); } } return Variant(); } -bool PropertyEditor::can_drop_data_fw(const Point2& p_point,const Variant& p_data,Control* p_from) const{ +bool PropertyEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const { TreeItem *item = tree->get_item_at_pos(p_point); if (!item) return false; int col = tree->get_column_at_pos(p_point); - if (col!=1) + if (col != 1) return false; - return _is_drop_valid(p_data,item->get_metadata(0)); - + return _is_drop_valid(p_data, item->get_metadata(0)); } -void PropertyEditor::drop_data_fw(const Point2& p_point,const Variant& p_data,Control* p_from){ +void PropertyEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) { TreeItem *item = tree->get_item_at_pos(p_point); if (!item) return; int col = tree->get_column_at_pos(p_point); - if (col!=1) + if (col != 1) return; - if (!_is_drop_valid(p_data,item->get_metadata(0))) + if (!_is_drop_valid(p_data, item->get_metadata(0))) return; Dictionary d = item->get_metadata(0); @@ -2768,44 +2635,42 @@ void PropertyEditor::drop_data_fw(const Point2& p_point,const Variant& p_data,Co if (!d.has("name")) return; - String name=d["name"]; + String name = d["name"]; Dictionary drag_data = p_data; - if (drag_data.has("type") && String(drag_data["type"])=="resource") { + if (drag_data.has("type") && String(drag_data["type"]) == "resource") { Ref<Resource> res = drag_data["resource"]; if (res.is_valid()) { - _edit_set(name,res); + _edit_set(name, res); return; } } - if (drag_data.has("type") && String(drag_data["type"])=="files") { + if (drag_data.has("type") && String(drag_data["type"]) == "files") { Vector<String> files = drag_data["files"]; - if (files.size()==1) { + if (files.size() == 1) { String file = files[0]; RES res = ResourceLoader::load(file); if (res.is_valid()) { - _edit_set(name,res); + _edit_set(name, res); return; } } } } - -void PropertyEditor::_clear_drop_fields(TreeItem* p_at) { +void PropertyEditor::_clear_drop_fields(TreeItem *p_at) { Dictionary d = p_at->get_metadata(0); if (d.has("type")) { int type = d["type"]; - if (type==Variant::OBJECT) { + if (type == Variant::OBJECT) { p_at->clear_custom_bg_color(1); } - } if (p_at->get_children()) { @@ -2819,77 +2684,73 @@ void PropertyEditor::_clear_drop_fields(TreeItem* p_at) { void PropertyEditor::_notification(int p_what) { - if (p_what==NOTIFICATION_ENTER_TREE) { + if (p_what == NOTIFICATION_ENTER_TREE) { - get_tree()->connect("node_removed",this,"_node_removed"); + get_tree()->connect("node_removed", this, "_node_removed"); } - if (p_what==NOTIFICATION_EXIT_TREE) { + if (p_what == NOTIFICATION_EXIT_TREE) { - get_tree()->disconnect("node_removed",this,"_node_removed"); + get_tree()->disconnect("node_removed", this, "_node_removed"); edit(NULL); } - - if (p_what==NOTIFICATION_DRAG_BEGIN) { + if (p_what == NOTIFICATION_DRAG_BEGIN) { if (is_visible_in_tree() && tree->get_root()) { _mark_drop_fields(tree->get_root()); } } - if (p_what==NOTIFICATION_DRAG_END) { + if (p_what == NOTIFICATION_DRAG_END) { if (is_visible_in_tree() && tree->get_root()) { _clear_drop_fields(tree->get_root()); } - } - if (p_what==NOTIFICATION_FIXED_PROCESS) { - + if (p_what == NOTIFICATION_FIXED_PROCESS) { - if (refresh_countdown>0) { - refresh_countdown-=get_fixed_process_delta_time(); - if (refresh_countdown<=0) { + if (refresh_countdown > 0) { + refresh_countdown -= get_fixed_process_delta_time(); + if (refresh_countdown <= 0) { TreeItem *root = tree->get_root(); _refresh_item(root); } } - changing=true; + changing = true; if (update_tree_pending) { update_tree(); - update_tree_pending=false; + update_tree_pending = false; } else { - const String *k=NULL; - while ((k=pending.next(k))) { + const String *k = NULL; + while ((k = pending.next(k))) { - TreeItem * item = find_item(tree->get_root(),*k); + TreeItem *item = find_item(tree->get_root(), *k); if (!item) continue; - _check_reload_status(*k,item); + _check_reload_status(*k, item); - Dictionary d=item->get_metadata(0); - set_item_text(item,d["type"],d["name"],d["hint"],d["hint_text"]); + Dictionary d = item->get_metadata(0); + set_item_text(item, d["type"], d["name"], d["hint"], d["hint_text"]); } } pending.clear(); - changing=false; - + changing = false; } } -TreeItem *PropertyEditor::get_parent_node(String p_path,HashMap<String,TreeItem*>& item_paths,TreeItem *root) { +TreeItem *PropertyEditor::get_parent_node(String p_path, HashMap<String, TreeItem *> &item_paths, TreeItem *root) { - TreeItem *item=NULL; + TreeItem *item = NULL; - if (p_path=="") { + if (p_path == "") { item = root; } else if (item_paths.has(p_path)) { @@ -2898,38 +2759,36 @@ TreeItem *PropertyEditor::get_parent_node(String p_path,HashMap<String,TreeItem* } else { //printf("path %s parent path %s - item name %s\n",p_path.ascii().get_data(),p_path.left( p_path.find_last("/") ).ascii().get_data(),p_path.right( p_path.find_last("/") ).ascii().get_data() ); - TreeItem *parent = get_parent_node( p_path.left( p_path.find_last("/") ),item_paths,root ); - item = tree->create_item( parent ); + TreeItem *parent = get_parent_node(p_path.left(p_path.find_last("/")), item_paths, root); + item = tree->create_item(parent); - String name = (p_path.find("/")!=-1)?p_path.right( p_path.find_last("/")+1 ):p_path; + String name = (p_path.find("/") != -1) ? p_path.right(p_path.find_last("/") + 1) : p_path; if (capitalize_paths) - item->set_text(0, name.capitalize() ); + item->set_text(0, name.capitalize()); else - item->set_text(0, name ); + item->set_text(0, name); item->set_tooltip(0, p_path); - if (item->get_parent()!=root) { - item->set_icon( 0, get_icon("Folder","EditorIcons")); + if (item->get_parent() != root) { + item->set_icon(0, get_icon("Folder", "EditorIcons")); } - item->set_editable(0,false); - item->set_selectable(0,subsection_selectable); - item->set_editable(1,false); - item->set_selectable(1,subsection_selectable); + item->set_editable(0, false); + item->set_selectable(0, subsection_selectable); + item->set_editable(1, false); + item->set_selectable(1, subsection_selectable); - if (item->get_parent()==root) { + if (item->get_parent() == root) { - item->set_custom_bg_color(0,get_color("prop_subsection","Editor")); - item->set_custom_bg_color(1,get_color("prop_subsection","Editor")); + item->set_custom_bg_color(0, get_color("prop_subsection", "Editor")); + item->set_custom_bg_color(1, get_color("prop_subsection", "Editor")); } - item_paths[p_path]=item; + item_paths[p_path] = item; } return item; - } - void PropertyEditor::_refresh_item(TreeItem *p_item) { if (!p_item) @@ -2937,10 +2796,9 @@ void PropertyEditor::_refresh_item(TreeItem *p_item) { String name = p_item->get_metadata(1); - if (name!=String()) { + if (name != String()) { - - _check_reload_status(name,p_item); + _check_reload_status(name, p_item); #if 0 bool has_reload=false; @@ -2999,38 +2857,35 @@ void PropertyEditor::_refresh_item(TreeItem *p_item) { p_item->add_button(1,get_icon("ReloadSmall","EditorIcons"),3); } #endif - Dictionary d=p_item->get_metadata(0); - set_item_text(p_item,d["type"],d["name"],d["hint"],d["hint_text"]); + Dictionary d = p_item->get_metadata(0); + set_item_text(p_item, d["type"], d["name"], d["hint"], d["hint_text"]); } - TreeItem *c=p_item->get_children(); + TreeItem *c = p_item->get_children(); while (c) { _refresh_item(c); - c=c->get_next(); + c = c->get_next(); } - } void PropertyEditor::refresh() { - if (refresh_countdown>0) + if (refresh_countdown > 0) return; - refresh_countdown=EditorSettings::get_singleton()->get("docks/property_editor/auto_refresh_interval"); - + refresh_countdown = EditorSettings::get_singleton()->get("docks/property_editor/auto_refresh_interval"); } void PropertyEditor::update_tree() { - tree->clear(); if (!obj) return; - HashMap<String,TreeItem*> item_path; + HashMap<String, TreeItem *> item_path; TreeItem *root = tree->create_item(NULL); tree->set_hide_root(true); @@ -3075,127 +2930,123 @@ void PropertyEditor::update_tree() { } */ List<PropertyInfo> plist; - obj->get_property_list(&plist,true); + obj->get_property_list(&plist, true); - bool draw_red=false; + bool draw_red = false; { Node *nod = obj->cast_to<Node>(); Node *es = EditorNode::get_singleton()->get_edited_scene(); - if (nod && es!=nod && nod->get_owner()!=es) { - draw_red=true; + if (nod && es != nod && nod->get_owner() != es) { + draw_red = true; } } + Color sscolor = get_color("prop_subsection", "Editor"); - Color sscolor=get_color("prop_subsection","Editor"); - - TreeItem * current_category=NULL; + TreeItem *current_category = NULL; String filter = search_box ? search_box->get_text() : ""; String group; String group_base; - for (List<PropertyInfo>::Element *I=plist.front() ; I ; I=I->next()) { + for (List<PropertyInfo>::Element *I = plist.front(); I; I = I->next()) { - PropertyInfo& p = I->get(); + PropertyInfo &p = I->get(); //make sure the property can be edited - if (p.usage&PROPERTY_USAGE_GROUP) { + if (p.usage & PROPERTY_USAGE_GROUP) { - group=p.name; - group_base=p.hint_string; + group = p.name; + group_base = p.hint_string; continue; - } else if (p.usage&PROPERTY_USAGE_CATEGORY) { + } else if (p.usage & PROPERTY_USAGE_CATEGORY) { - group=""; - group_base=""; + group = ""; + group_base = ""; if (!show_categories) continue; - List<PropertyInfo>::Element *N=I->next(); - bool valid=true; + List<PropertyInfo>::Element *N = I->next(); + bool valid = true; //if no properties in category, skip - while(N) { - if (N->get().usage&PROPERTY_USAGE_EDITOR) + while (N) { + if (N->get().usage & PROPERTY_USAGE_EDITOR) break; - if (N->get().usage&PROPERTY_USAGE_CATEGORY) { - valid=false; + if (N->get().usage & PROPERTY_USAGE_CATEGORY) { + valid = false; break; } - N=N->next(); + N = N->next(); } if (!valid) continue; //empty, ignore - TreeItem * sep = tree->create_item(root); - current_category=sep; - String type=p.name; + TreeItem *sep = tree->create_item(root); + current_category = sep; + String type = p.name; /*if (has_icon(type,"EditorIcons")) sep->set_icon(0,get_icon(type,"EditorIcons") ); else sep->set_icon(0,get_icon("Object","EditorIcons") ); print_line("CATEGORY: "+type); */ - sep->set_text(0,type); - sep->set_selectable(0,false); - sep->set_selectable(1,false); - sep->set_custom_bg_color(0,get_color("prop_category","Editor")); - sep->set_custom_bg_color(1,get_color("prop_category","Editor")); + sep->set_text(0, type); + sep->set_selectable(0, false); + sep->set_selectable(1, false); + sep->set_custom_bg_color(0, get_color("prop_category", "Editor")); + sep->set_custom_bg_color(1, get_color("prop_category", "Editor")); if (use_doc_hints) { - StringName type=p.name; + StringName type = p.name; if (!class_descr_cache.has(type)) { String descr; - DocData *dd=EditorHelp::get_doc_data(); - Map<String,DocData::ClassDoc>::Element *E=dd->class_list.find(type); + DocData *dd = EditorHelp::get_doc_data(); + Map<String, DocData::ClassDoc>::Element *E = dd->class_list.find(type); if (E) { - descr=E->get().brief_description; + descr = E->get().brief_description; } - class_descr_cache[type]=descr.word_wrap(80); - + class_descr_cache[type] = descr.word_wrap(80); } - sep->set_tooltip(0,TTR("Class:")+" "+p.name+":\n\n"+class_descr_cache[type]); + sep->set_tooltip(0, TTR("Class:") + " " + p.name + ":\n\n" + class_descr_cache[type]); } //sep->set_custom_color(0,Color(1,1,1)); - continue; - } else if ( ! (p.usage&PROPERTY_USAGE_EDITOR ) ) + } else if (!(p.usage & PROPERTY_USAGE_EDITOR)) continue; - - if (hide_script && p.name=="script") + if (hide_script && p.name == "script") continue; - String basename=p.name; - if (group!="") { - if (group_base!="") { + String basename = p.name; + if (group != "") { + if (group_base != "") { if (basename.begins_with(group_base)) { - basename=basename.replace_first(group_base,""); + basename = basename.replace_first(group_base, ""); } else { - group=""; //no longer using group base, clear + group = ""; //no longer using group base, clear } } } - if (group!="") { - basename=group+"/"+basename; + if (group != "") { + basename = group + "/" + basename; } - String name = (basename.find("/")!=-1)?basename.right( basename.find_last("/")+1 ):basename; + String name = (basename.find("/") != -1) ? basename.right(basename.find_last("/") + 1) : basename; if (capitalize_paths) name = name.camelcase_to_underscore().capitalize(); - String path=basename.left( basename.find_last("/") ) ; + String path = basename.left(basename.find_last("/")); - if (use_filter && filter!="") { + if (use_filter && filter != "") { String cat = path; @@ -3207,41 +3058,41 @@ void PropertyEditor::update_tree() { } //printf("property %s\n",basename.ascii().get_data()); - TreeItem * parent = get_parent_node(path,item_path,current_category?current_category:root ); + TreeItem *parent = get_parent_node(path, item_path, current_category ? current_category : root); /* if (parent->get_parent()==root) parent=root; */ int level = 0; - if (parent!=root) { + if (parent != root) { level++; - TreeItem *parent_lev=parent; - while(parent_lev->get_parent()!=root) { - parent_lev=parent_lev->get_parent(); + TreeItem *parent_lev = parent; + while (parent_lev->get_parent() != root) { + parent_lev = parent_lev->get_parent(); level++; } } - if (level>4) - level=4; + if (level > 4) + level = 4; Color col = sscolor; - col.a=(level/4.0)*0.7; + col.a = (level / 4.0) * 0.7; - TreeItem * item = tree->create_item( parent ); + TreeItem *item = tree->create_item(parent); - if (level>0) { - item->set_custom_bg_color(0,col); + if (level > 0) { + item->set_custom_bg_color(0, col); //item->set_custom_bg_color(1,col); } - item->set_editable(0,false); - item->set_selectable(0,false); + item->set_editable(0, false); + item->set_selectable(0, false); - if (p.usage&PROPERTY_USAGE_CHECKABLE) { + if (p.usage & PROPERTY_USAGE_CHECKABLE) { - item->set_cell_mode(0,TreeItem::CELL_MODE_CHECK); - item->set_selectable(0,true); - item->set_editable(0,true); - item->set_checked(0,p.usage&PROPERTY_USAGE_CHECKED); + item->set_cell_mode(0, TreeItem::CELL_MODE_CHECK); + item->set_selectable(0, true); + item->set_editable(0, true); + item->set_checked(0, p.usage & PROPERTY_USAGE_CHECKED); } item->set_text(0, name); @@ -3250,182 +3101,175 @@ void PropertyEditor::update_tree() { if (use_doc_hints) { StringName setter; StringName type; - if (ClassDB::get_setter_and_type_for_property(obj->get_class_name(),p.name,type,setter)) { + if (ClassDB::get_setter_and_type_for_property(obj->get_class_name(), p.name, type, setter)) { String descr; - bool found=false; - Map<StringName,Map<StringName,String> >::Element *E=descr_cache.find(type); + bool found = false; + Map<StringName, Map<StringName, String> >::Element *E = descr_cache.find(type); if (E) { - Map<StringName,String>::Element *F=E->get().find(setter); + Map<StringName, String>::Element *F = E->get().find(setter); if (F) { - found=true; - descr=F->get(); + found = true; + descr = F->get(); } } if (!found) { - DocData *dd=EditorHelp::get_doc_data(); - Map<String,DocData::ClassDoc>::Element *E=dd->class_list.find(type); + DocData *dd = EditorHelp::get_doc_data(); + Map<String, DocData::ClassDoc>::Element *E = dd->class_list.find(type); if (E) { - for(int i=0;i<E->get().methods.size();i++) { - if (E->get().methods[i].name==setter.operator String()) { - descr=E->get().methods[i].description.strip_edges().word_wrap(80); + for (int i = 0; i < E->get().methods.size(); i++) { + if (E->get().methods[i].name == setter.operator String()) { + descr = E->get().methods[i].description.strip_edges().word_wrap(80); } } } - descr_cache[type][setter]=descr; + descr_cache[type][setter] = descr; } - item->set_tooltip(0, TTR("Property:")+" "+p.name+"\n\n"+descr); + item->set_tooltip(0, TTR("Property:") + " " + p.name + "\n\n" + descr); } } //EditorHelp::get_doc_data(); Dictionary d; - d["name"]=p.name; - d["type"]=(int)p.type; - d["hint"]=(int)p.hint; - d["hint_text"]=p.hint_string; - d["usage"]=(int)p.usage; + d["name"] = p.name; + d["type"] = (int)p.type; + d["hint"] = (int)p.hint; + d["hint_text"] = p.hint_string; + d["usage"] = (int)p.usage; - item->set_metadata( 0, d ); - item->set_metadata( 1, p.name ); + item->set_metadata(0, d); + item->set_metadata(1, p.name); if (draw_red) - item->set_custom_color(0,Color(0.8,0.4,0.20)); - + item->set_custom_color(0, Color(0.8, 0.4, 0.20)); - if (p.name==selected_property) { + if (p.name == selected_property) { item->select(1); } - //printf("property %s type %i\n",p.name.ascii().get_data(),p.type); - switch( p.type ) { + switch (p.type) { case Variant::BOOL: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CHECK ); - item->set_text(1,TTR("On")); + item->set_cell_mode(1, TreeItem::CELL_MODE_CHECK); + item->set_text(1, TTR("On")); item->set_tooltip(1, obj->get(p.name) ? "True" : "False"); - item->set_checked( 1, obj->get( p.name ) ); + item->set_checked(1, obj->get(p.name)); if (show_type_icons) - item->set_icon( 0, get_icon("Bool","EditorIcons") ); - item->set_editable(1,!read_only); + item->set_icon(0, get_icon("Bool", "EditorIcons")); + item->set_editable(1, !read_only); } break; case Variant::REAL: case Variant::INT: { - if (p.hint==PROPERTY_HINT_EXP_EASING) { + if (p.hint == PROPERTY_HINT_EXP_EASING) { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_text(1, String::num(obj->get( p.name ),2) ); - item->set_editable(1,!read_only); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_text(1, String::num(obj->get(p.name), 2)); + item->set_editable(1, !read_only); if (show_type_icons) - item->set_icon( 0, get_icon("Curve","EditorIcons")); + item->set_icon(0, get_icon("Curve", "EditorIcons")); break; - } - if (p.hint==PROPERTY_HINT_LAYERS_2D_PHYSICS || p.hint==PROPERTY_HINT_LAYERS_2D_RENDER || p.hint==PROPERTY_HINT_LAYERS_3D_PHYSICS || p.hint==PROPERTY_HINT_LAYERS_3D_RENDER) { + if (p.hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || p.hint == PROPERTY_HINT_LAYERS_2D_RENDER || p.hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || p.hint == PROPERTY_HINT_LAYERS_3D_RENDER) { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable(1,!read_only); - item->set_custom_draw(1,this,"_draw_flags"); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, !read_only); + item->set_custom_draw(1, this, "_draw_flags"); break; } - if (p.hint==PROPERTY_HINT_FLAGS) { - + if (p.hint == PROPERTY_HINT_FLAGS) { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable(1,!read_only); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, !read_only); //item->set_icon( 0, get_icon("Curve","EditorIcons")); Vector<String> values = p.hint_string.split(","); String flags; int val = obj->get(p.name); - for(int i=0;i<values.size();i++) { + for (int i = 0; i < values.size(); i++) { String v = values[i]; - if (v=="") + if (v == "") continue; - if (!(val&(1<<i))) + if (!(val & (1 << i))) continue; - if (flags!="") - flags+=", "; - flags+=v; + if (flags != "") + flags += ", "; + flags += v; } - item->set_text(1, flags ); + item->set_text(1, flags); break; - } - if (p.hint==PROPERTY_HINT_ENUM) - item->set_cell_mode( 1, TreeItem::CELL_MODE_RANGE ); + if (p.hint == PROPERTY_HINT_ENUM) + item->set_cell_mode(1, TreeItem::CELL_MODE_RANGE); else - item->set_cell_mode( 1, TreeItem::CELL_MODE_RANGE_EXPRESSION ); - + item->set_cell_mode(1, TreeItem::CELL_MODE_RANGE_EXPRESSION); - if (p.hint==PROPERTY_HINT_SPRITE_FRAME || p.hint==PROPERTY_HINT_RANGE || p.hint==PROPERTY_HINT_EXP_RANGE) { + if (p.hint == PROPERTY_HINT_SPRITE_FRAME || p.hint == PROPERTY_HINT_RANGE || p.hint == PROPERTY_HINT_EXP_RANGE) { int c = p.hint_string.get_slice_count(","); - float min=0,max=100,step=1; - if (c>=1) { + float min = 0, max = 100, step = 1; + if (c >= 1) { - min=p.hint_string.get_slice(",",0).to_double(); + min = p.hint_string.get_slice(",", 0).to_double(); } - if (c>=2) { + if (c >= 2) { - max=p.hint_string.get_slice(",",1).to_double(); + max = p.hint_string.get_slice(",", 1).to_double(); } - if (p.hint!=PROPERTY_HINT_SPRITE_FRAME && c>=3) { + if (p.hint != PROPERTY_HINT_SPRITE_FRAME && c >= 3) { - step= p.hint_string.get_slice(",",2).to_double(); + step = p.hint_string.get_slice(",", 2).to_double(); } - - item->set_range_config(1,min,max,step,p.hint==PROPERTY_HINT_EXP_RANGE); - } else if (p.hint==PROPERTY_HINT_ENUM) { + item->set_range_config(1, min, max, step, p.hint == PROPERTY_HINT_EXP_RANGE); + } else if (p.hint == PROPERTY_HINT_ENUM) { //int c = p.hint_string.get_slice_count(","); - item->set_text(1,p.hint_string); + item->set_text(1, p.hint_string); if (show_type_icons) - item->set_icon( 0,get_icon("Enum","EditorIcons") ); - item->set_range(1, obj->get( p.name ) ); - item->set_editable(1,!read_only); + item->set_icon(0, get_icon("Enum", "EditorIcons")); + item->set_range(1, obj->get(p.name)); + item->set_editable(1, !read_only); break; - } else if (p.hint==PROPERTY_HINT_OBJECT_ID) { + } else if (p.hint == PROPERTY_HINT_OBJECT_ID) { //int c = p.hint_string.get_slice_count(","); - item->set_cell_mode(1,TreeItem::CELL_MODE_CUSTOM); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); - String type=p.hint_string; - if (type=="") - type="Object"; + String type = p.hint_string; + if (type == "") + type = "Object"; - ObjectID id = obj->get( p.name ); - if (id!=0) { - item->set_text(1,type+" ID: "+itos(id)); - item->add_button(1,get_icon("EditResource","EditorIcons")); + ObjectID id = obj->get(p.name); + if (id != 0) { + item->set_text(1, type + " ID: " + itos(id)); + item->add_button(1, get_icon("EditResource", "EditorIcons")); } else { - item->set_text(1,"[Empty]"); + item->set_text(1, "[Empty]"); } - if (has_icon(p.hint_string,"EditorIcons")) { - type=p.hint_string; + if (has_icon(p.hint_string, "EditorIcons")) { + type = p.hint_string; } else { - type="Object"; + type = "Object"; } - item->set_icon(0,get_icon(type,"EditorIcons")); + item->set_icon(0, get_icon(type, "EditorIcons")); break; @@ -3439,20 +3283,18 @@ void PropertyEditor::update_tree() { } }; - if (p.type==Variant::REAL) { + if (p.type == Variant::REAL) { if (show_type_icons) - item->set_icon( 0, get_icon("Real","EditorIcons")); - item->set_range(1, obj->get( p.name ) ); + item->set_icon(0, get_icon("Real", "EditorIcons")); + item->set_range(1, obj->get(p.name)); } else { if (show_type_icons) - item->set_icon( 0,get_icon("Integer","EditorIcons") ); - item->set_range(1, obj->get( p.name ) ); + item->set_icon(0, get_icon("Integer", "EditorIcons")); + item->set_range(1, obj->get(p.name)); } - - item->set_editable(1,!read_only); - + item->set_editable(1, !read_only); } break; case Variant::STRING: { @@ -3464,32 +3306,31 @@ void PropertyEditor::update_tree() { case PROPERTY_HINT_GLOBAL_DIR: case PROPERTY_HINT_GLOBAL_FILE: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_STRING ); - item->set_editable(1,!read_only); + item->set_cell_mode(1, TreeItem::CELL_MODE_STRING); + item->set_editable(1, !read_only); if (show_type_icons) - item->set_icon( 0, get_icon("File","EditorIcons") ); - item->set_text(1,obj->get(p.name)); - item->add_button(1,get_icon("Folder","EditorIcons")); + item->set_icon(0, get_icon("File", "EditorIcons")); + item->set_text(1, obj->get(p.name)); + item->add_button(1, get_icon("Folder", "EditorIcons")); } break; case PROPERTY_HINT_ENUM: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_RANGE ); + item->set_cell_mode(1, TreeItem::CELL_MODE_RANGE); Vector<String> strings = p.hint_string.split(","); String current = obj->get(p.name); - int idx=0; - for(int x=0;x<strings.size();x++) { - if (strings[x]==current) { - idx=x; + int idx = 0; + for (int x = 0; x < strings.size(); x++) { + if (strings[x] == current) { + idx = x; break; } } item->set_text(1, p.hint_string); - item->set_range(1,idx); - item->set_editable( 1, !read_only ); + item->set_range(1, idx); + item->set_editable(1, !read_only); if (show_type_icons) - item->set_icon( 0,get_icon("Enum","EditorIcons") ); - + item->set_icon(0, get_icon("Enum", "EditorIcons")); } break; case PROPERTY_HINT_METHOD_OF_VARIANT_TYPE: ///< a property of a type @@ -3502,23 +3343,23 @@ void PropertyEditor::update_tree() { case PROPERTY_HINT_PROPERTY_OF_SCRIPT: ///< a property of a script & base case PROPERTY_HINT_TYPE_STRING: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM); - item->set_editable(1,!read_only); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, !read_only); if (show_type_icons) - item->set_icon( 0, get_icon("String","EditorIcons") ); - item->set_text(1,obj->get(p.name)); + item->set_icon(0, get_icon("String", "EditorIcons")); + item->set_text(1, obj->get(p.name)); } break; default: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_STRING ); - item->set_editable(1,!read_only); + item->set_cell_mode(1, TreeItem::CELL_MODE_STRING); + item->set_editable(1, !read_only); if (show_type_icons) - item->set_icon( 0, get_icon("String","EditorIcons") ); - item->set_text(1,obj->get(p.name)); - if (p.hint==PROPERTY_HINT_MULTILINE_TEXT) - item->add_button(1,get_icon("MultiLine","EditorIcons") ); + item->set_icon(0, get_icon("String", "EditorIcons")); + item->set_text(1, obj->get(p.name)); + if (p.hint == PROPERTY_HINT_MULTILINE_TEXT) + item->add_button(1, get_icon("MultiLine", "EditorIcons")); } break; } @@ -3526,304 +3367,293 @@ void PropertyEditor::update_tree() { } break; case Variant::ARRAY: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->add_button(1,get_icon("EditResource","EditorIcons")); - + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->add_button(1, get_icon("EditResource", "EditorIcons")); Variant v = obj->get(p.name); String type_name = "Array"; String type_name_suffix = ""; - + String hint = p.hint_string; - while(hint.begins_with(itos(Variant::ARRAY)+":")) { + while (hint.begins_with(itos(Variant::ARRAY) + ":")) { type_name += "<Array"; type_name_suffix += ">"; - hint = hint.substr(2, hint.size()-2); + hint = hint.substr(2, hint.size() - 2); } - if(hint.find(":") >= 0) { - hint = hint.substr(0,hint.find(":")); - if(hint.find("/") >= 0) { - hint = hint.substr(0,hint.find("/")); + if (hint.find(":") >= 0) { + hint = hint.substr(0, hint.find(":")); + if (hint.find("/") >= 0) { + hint = hint.substr(0, hint.find("/")); } type_name += "<" + Variant::get_type_name(Variant::Type(hint.to_int())); type_name_suffix += ">"; } type_name += type_name_suffix; - + if (v.is_array()) - item->set_text(1,type_name+"["+itos(v.call("size"))+"]"); + item->set_text(1, type_name + "[" + itos(v.call("size")) + "]"); else - item->set_text(1,type_name+"[]"); - - if (show_type_icons) - item->set_icon( 0, get_icon("ArrayData","EditorIcons") ); + item->set_text(1, type_name + "[]"); + if (show_type_icons) + item->set_icon(0, get_icon("ArrayData", "EditorIcons")); } break; case Variant::POOL_INT_ARRAY: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->add_button(1,get_icon("EditResource","EditorIcons")); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->add_button(1, get_icon("EditResource", "EditorIcons")); Variant v = obj->get(p.name); if (v.is_array()) - item->set_text(1,"IntArray["+itos(v.call("size"))+"]"); + item->set_text(1, "IntArray[" + itos(v.call("size")) + "]"); else - item->set_text(1,"IntArray[]"); + item->set_text(1, "IntArray[]"); if (show_type_icons) - item->set_icon( 0, get_icon("ArrayInt","EditorIcons") ); - + item->set_icon(0, get_icon("ArrayInt", "EditorIcons")); } break; case Variant::POOL_REAL_ARRAY: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->add_button(1,get_icon("EditResource","EditorIcons")); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->add_button(1, get_icon("EditResource", "EditorIcons")); Variant v = obj->get(p.name); if (v.is_array()) - item->set_text(1,"FloatArray["+itos(v.call("size"))+"]"); + item->set_text(1, "FloatArray[" + itos(v.call("size")) + "]"); else - item->set_text(1,"FloatArray[]"); + item->set_text(1, "FloatArray[]"); if (show_type_icons) - item->set_icon( 0, get_icon("ArrayReal","EditorIcons") ); - + item->set_icon(0, get_icon("ArrayReal", "EditorIcons")); } break; case Variant::POOL_STRING_ARRAY: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->add_button(1,get_icon("EditResource","EditorIcons")); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->add_button(1, get_icon("EditResource", "EditorIcons")); Variant v = obj->get(p.name); if (v.is_array()) - item->set_text(1,"String["+itos(v.call("size"))+"]"); + item->set_text(1, "String[" + itos(v.call("size")) + "]"); else - item->set_text(1,"String[]"); + item->set_text(1, "String[]"); if (show_type_icons) - item->set_icon( 0, get_icon("ArrayString","EditorIcons") ); - + item->set_icon(0, get_icon("ArrayString", "EditorIcons")); } break; case Variant::POOL_BYTE_ARRAY: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->add_button(1,get_icon("EditResource","EditorIcons")); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->add_button(1, get_icon("EditResource", "EditorIcons")); Variant v = obj->get(p.name); if (v.is_array()) - item->set_text(1,"Byte["+itos(v.call("size"))+"]"); + item->set_text(1, "Byte[" + itos(v.call("size")) + "]"); else - item->set_text(1,"Byte[]"); + item->set_text(1, "Byte[]"); if (show_type_icons) - item->set_icon( 0, get_icon("ArrayData","EditorIcons") ); - + item->set_icon(0, get_icon("ArrayData", "EditorIcons")); } break; case Variant::POOL_VECTOR2_ARRAY: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->add_button(1,get_icon("EditResource","EditorIcons")); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->add_button(1, get_icon("EditResource", "EditorIcons")); Variant v = obj->get(p.name); if (v.is_array()) - item->set_text(1,"Vector2["+itos(v.call("size"))+"]"); + item->set_text(1, "Vector2[" + itos(v.call("size")) + "]"); else - item->set_text(1,"Vector2[]"); + item->set_text(1, "Vector2[]"); if (show_type_icons) - item->set_icon( 0, get_icon("Vector2","EditorIcons") ); - + item->set_icon(0, get_icon("Vector2", "EditorIcons")); } break; case Variant::POOL_VECTOR3_ARRAY: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->add_button(1,get_icon("EditResource","EditorIcons")); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->add_button(1, get_icon("EditResource", "EditorIcons")); Variant v = obj->get(p.name); if (v.is_array()) - item->set_text(1,"Vector3["+itos(v.call("size"))+"]"); + item->set_text(1, "Vector3[" + itos(v.call("size")) + "]"); else - item->set_text(1,"Vector3[]"); + item->set_text(1, "Vector3[]"); if (show_type_icons) - item->set_icon( 0, get_icon("Vector","EditorIcons") ); - + item->set_icon(0, get_icon("Vector", "EditorIcons")); } break; case Variant::POOL_COLOR_ARRAY: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->add_button(1,get_icon("EditResource","EditorIcons")); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->add_button(1, get_icon("EditResource", "EditorIcons")); Variant v = obj->get(p.name); if (v.is_array()) - item->set_text(1,"Color["+itos(v.call("size"))+"]"); + item->set_text(1, "Color[" + itos(v.call("size")) + "]"); else - item->set_text(1,"Color[]"); + item->set_text(1, "Color[]"); if (show_type_icons) - item->set_icon( 0, get_icon("Color","EditorIcons") ); - + item->set_icon(0, get_icon("Color", "EditorIcons")); } break; case Variant::VECTOR2: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable( 1, true ); - item->set_text(1,obj->get(p.name)); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, true); + item->set_text(1, obj->get(p.name)); if (show_type_icons) - item->set_icon( 0,get_icon("Vector2","EditorIcons") ); + item->set_icon(0, get_icon("Vector2", "EditorIcons")); } break; case Variant::RECT2: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable( 1, true ); - item->set_text(1,obj->get(p.name)); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, true); + item->set_text(1, obj->get(p.name)); if (show_type_icons) - item->set_icon( 0,get_icon("Rect2","EditorIcons") ); + item->set_icon(0, get_icon("Rect2", "EditorIcons")); } break; case Variant::VECTOR3: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable( 1, true ); - item->set_text(1,obj->get(p.name)); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, true); + item->set_text(1, obj->get(p.name)); if (show_type_icons) - item->set_icon( 0,get_icon("Vector","EditorIcons") ); + item->set_icon(0, get_icon("Vector", "EditorIcons")); } break; case Variant::TRANSFORM2D: case Variant::BASIS: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable( 1, true ); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, true); item->set_text(1, obj->get(p.name)); } break; case Variant::TRANSFORM: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable( 1, true ); - item->set_text(1,obj->get(p.name)); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, true); + item->set_text(1, obj->get(p.name)); if (show_type_icons) - item->set_icon( 0,get_icon("Matrix","EditorIcons") ); + item->set_icon(0, get_icon("Matrix", "EditorIcons")); } break; case Variant::PLANE: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable( 1, true ); - item->set_text(1,obj->get(p.name)); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, true); + item->set_text(1, obj->get(p.name)); if (show_type_icons) - item->set_icon( 0,get_icon("Plane","EditorIcons") ); + item->set_icon(0, get_icon("Plane", "EditorIcons")); } break; case Variant::RECT3: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable( 1, true ); - item->set_text(1,"Rect3"); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, true); + item->set_text(1, "Rect3"); if (show_type_icons) - item->set_icon( 0,get_icon("Rect3","EditorIcons") ); + item->set_icon(0, get_icon("Rect3", "EditorIcons")); } break; case Variant::QUAT: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable( 1, true ); - item->set_text(1,obj->get(p.name)); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, true); + item->set_text(1, obj->get(p.name)); if (show_type_icons) - item->set_icon( 0,get_icon("Quat","EditorIcons") ); + item->set_icon(0, get_icon("Quat", "EditorIcons")); } break; case Variant::COLOR: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable( 1, !read_only ); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, !read_only); //item->set_text(1,obj->get(p.name)); - item->set_custom_draw(1,this,"_draw_transparency"); + item->set_custom_draw(1, this, "_draw_transparency"); if (show_type_icons) - item->set_icon( 0,get_icon("Color","EditorIcons") ); + item->set_icon(0, get_icon("Color", "EditorIcons")); } break; case Variant::IMAGE: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable( 1, !read_only ); - Image img = obj->get( p.name ); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, !read_only); + Image img = obj->get(p.name); if (img.empty()) - item->set_text(1,"[Image (empty)]"); + item->set_text(1, "[Image (empty)]"); else - item->set_text(1,"[Image "+itos(img.get_width())+"x"+itos(img.get_height())+"-"+String(Image::get_format_name(img.get_format()))+"]"); + item->set_text(1, "[Image " + itos(img.get_width()) + "x" + itos(img.get_height()) + "-" + String(Image::get_format_name(img.get_format())) + "]"); if (show_type_icons) - item->set_icon( 0,get_icon("Image","EditorIcons") ); + item->set_icon(0, get_icon("Image", "EditorIcons")); } break; case Variant::NODE_PATH: { item->set_cell_mode(1, TreeItem::CELL_MODE_STRING); - item->set_editable( 1, !read_only ); - item->set_text(1,obj->get(p.name)); + item->set_editable(1, !read_only); + item->set_text(1, obj->get(p.name)); item->add_button(1, get_icon("CopyNodePath", "EditorIcons")); } break; case Variant::OBJECT: { - item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); - item->set_editable( 1, !read_only ); - item->add_button(1,get_icon("EditResource","EditorIcons")); + item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); + item->set_editable(1, !read_only); + item->add_button(1, get_icon("EditResource", "EditorIcons")); String type; - if (p.hint==PROPERTY_HINT_RESOURCE_TYPE) - type=p.hint_string; + if (p.hint == PROPERTY_HINT_RESOURCE_TYPE) + type = p.hint_string; - if (obj->get( p.name ).get_type() == Variant::NIL || obj->get( p.name ).operator RefPtr().is_null()) { - item->set_text(1,"<null>"); - item->set_icon(1,Ref<Texture>()); + if (obj->get(p.name).get_type() == Variant::NIL || obj->get(p.name).operator RefPtr().is_null()) { + item->set_text(1, "<null>"); + item->set_icon(1, Ref<Texture>()); } else { - RES res = obj->get( p.name ).operator RefPtr(); + RES res = obj->get(p.name).operator RefPtr(); if (res->is_class("Texture")) { int tw = EditorSettings::get_singleton()->get("docks/property_editor/texture_preview_width"); - item->set_icon_max_width(1,tw); - item->set_icon(1,res); - item->set_text(1,""); + item->set_icon_max_width(1, tw); + item->set_icon(1, res); + item->set_text(1, ""); } else if (res->get_name() != "") { item->set_text(1, res->get_name()); - } else if (res->get_path()!="" && !res->get_path().begins_with("local://")) { + } else if (res->get_path() != "" && !res->get_path().begins_with("local://")) { item->set_text(1, res->get_path().get_file()); } else { - item->set_text(1,"<"+res->get_class()+">"); + item->set_text(1, "<" + res->get_class() + ">"); } - if (has_icon(res->get_class(),"EditorIcons")) { - type=res->get_class(); + if (has_icon(res->get_class(), "EditorIcons")) { + type = res->get_class(); } if (res.is_valid() && res->get_path().is_resource_file()) { - item->set_tooltip(1,res->get_path()); + item->set_tooltip(1, res->get_path()); } else if (res.is_valid()) { - item->set_tooltip(1,res->get_name()+" ("+res->get_class()+")"); + item->set_tooltip(1, res->get_name() + " (" + res->get_class() + ")"); } if (!res->is_class("Texture")) { //texture already previews via itself - EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res,this,"_resource_preview_done",item->get_instance_ID()); + EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res, this, "_resource_preview_done", item->get_instance_ID()); } - } - - if (type!=String()) { - if (type.find(",")!=-1) - type=type.get_slice(",",0); + if (type != String()) { + if (type.find(",") != -1) + type = type.get_slice(",", 0); //printf("prop %s , type %s\n",p.name.ascii().get_data(),p.hint_string.ascii().get_data()); - if (has_icon(type,"EditorIcons")) - item->set_icon( 0, get_icon(type,"EditorIcons") ); + if (has_icon(type, "EditorIcons")) + item->set_icon(0, get_icon(type, "EditorIcons")); else - item->set_icon( 0, get_icon("Object","EditorIcons") ); + item->set_icon(0, get_icon("Object", "EditorIcons")); } //item->double_click_signal.connect( Method1<int>( Method2<int,String>( this, &Editoritem_obj_edited ), p.name ) ); @@ -3834,239 +3664,225 @@ void PropertyEditor::update_tree() { if (keying) { - if (p.hint==PROPERTY_HINT_SPRITE_FRAME) { + if (p.hint == PROPERTY_HINT_SPRITE_FRAME) { - item->add_button(1,get_icon("KeyNext","EditorIcons"),5); + item->add_button(1, get_icon("KeyNext", "EditorIcons"), 5); } else { - item->add_button(1,get_icon("Key","EditorIcons"),2); + item->add_button(1, get_icon("Key", "EditorIcons"), 2); } } - bool has_reload=false; + bool has_reload = false; bool mbi = _might_be_in_instance(); if (mbi) { Variant vorig; - Dictionary d=item->get_metadata(0); - int usage = d.has("usage")?int(int(d["usage"])&(PROPERTY_USAGE_STORE_IF_NONONE|PROPERTY_USAGE_STORE_IF_NONZERO)):0; - if (_get_instanced_node_original_property(p.name,vorig) || usage) { + Dictionary d = item->get_metadata(0); + int usage = d.has("usage") ? int(int(d["usage"]) & (PROPERTY_USAGE_STORE_IF_NONONE | PROPERTY_USAGE_STORE_IF_NONZERO)) : 0; + if (_get_instanced_node_original_property(p.name, vorig) || usage) { Variant v = obj->get(p.name); - - if (_is_property_different(v,vorig,usage)) { + if (_is_property_different(v, vorig, usage)) { //print_line("FOR "+String(p.name)+" RELOAD WITH: "+String(v)+"("+Variant::get_type_name(v.get_type())+")=="+String(vorig)+"("+Variant::get_type_name(vorig.get_type())+")"); - item->add_button(1,get_icon("ReloadSmall","EditorIcons"),3); - has_reload=true; + item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3); + has_reload = true; } } - } - if (obj->call("property_can_revert",p.name).operator bool()) { + if (obj->call("property_can_revert", p.name).operator bool()) { - item->add_button(1,get_icon("ReloadSmall","EditorIcons"),3); - has_reload=true; + item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3); + has_reload = true; } if (!has_reload && !obj->get_script().is_null()) { Ref<Script> scr = obj->get_script(); Variant orig_value; - if (scr->get_property_default_value(p.name,orig_value)) { - if (orig_value!=obj->get(p.name)) { - item->add_button(1,get_icon("ReloadSmall","EditorIcons"),3); - has_reload=true; + if (scr->get_property_default_value(p.name, orig_value)) { + if (orig_value != obj->get(p.name)) { + item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3); + has_reload = true; } } } - if (mbi && !has_reload && item->get_cell_mode(1)==TreeItem::CELL_MODE_RANGE && item->get_text(1)==String()) { - item->add_button(1,get_icon("ReloadEmpty","EditorIcons"),3,true); + if (mbi && !has_reload && item->get_cell_mode(1) == TreeItem::CELL_MODE_RANGE && item->get_text(1) == String()) { + item->add_button(1, get_icon("ReloadEmpty", "EditorIcons"), 3, true); } - - - } } -void PropertyEditor::_draw_transparency(Object *t, const Rect2& p_rect) { +void PropertyEditor::_draw_transparency(Object *t, const Rect2 &p_rect) { - TreeItem *ti=t->cast_to<TreeItem>(); + TreeItem *ti = t->cast_to<TreeItem>(); if (!ti) - return; + return; - Color color=obj->get(ti->get_metadata(1)); - Ref<Texture> arrow=tree->get_icon("select_arrow"); + Color color = obj->get(ti->get_metadata(1)); + Ref<Texture> arrow = tree->get_icon("select_arrow"); // make a little space between consecutive color fields - Rect2 area=p_rect; - area.pos.y+=1; - area.size.height-=2; - area.size.width-=arrow->get_size().width+5; + Rect2 area = p_rect; + area.pos.y += 1; + area.size.height -= 2; + area.size.width -= arrow->get_size().width + 5; tree->draw_texture_rect(get_icon("Transparent", "EditorIcons"), area, true); tree->draw_rect(area, color); - } - void PropertyEditor::_item_selected() { - TreeItem *item = tree->get_selected(); ERR_FAIL_COND(!item); - selected_property=item->get_metadata(1); - + selected_property = item->get_metadata(1); } - -void PropertyEditor::_edit_set(const String& p_name, const Variant& p_value, bool p_refresh_all, const String& p_changed_field) { +void PropertyEditor::_edit_set(const String &p_name, const Variant &p_value, bool p_refresh_all, const String &p_changed_field) { if (autoclear) { TreeItem *item = tree->get_selected(); - if (item && item->get_cell_mode(0)==TreeItem::CELL_MODE_CHECK) { + if (item && item->get_cell_mode(0) == TreeItem::CELL_MODE_CHECK) { - item->set_checked(0,true); + item->set_checked(0, true); } } - if (!undo_redo|| obj->cast_to<ArrayPropertyEdit>()) { //kind of hacky + if (!undo_redo || obj->cast_to<ArrayPropertyEdit>()) { //kind of hacky - obj->set(p_name,p_value); + obj->set(p_name, p_value); if (p_refresh_all) - _changed_callbacks(obj,""); + _changed_callbacks(obj, ""); else - _changed_callbacks(obj,p_name); + _changed_callbacks(obj, p_name); - emit_signal(_prop_edited,p_name); + emit_signal(_prop_edited, p_name); } else if (obj->cast_to<MultiNodeEdit>()) { - obj->cast_to<MultiNodeEdit>()->set_property_field(p_name,p_value,p_changed_field); - _changed_callbacks(obj,p_name); - emit_signal(_prop_edited,p_name); + obj->cast_to<MultiNodeEdit>()->set_property_field(p_name, p_value, p_changed_field); + _changed_callbacks(obj, p_name); + emit_signal(_prop_edited, p_name); } else { - undo_redo->create_action(TTR("Set")+" "+p_name,UndoRedo::MERGE_ENDS); - undo_redo->add_do_property(obj,p_name,p_value); - undo_redo->add_undo_property(obj,p_name,obj->get(p_name)); + undo_redo->create_action(TTR("Set") + " " + p_name, UndoRedo::MERGE_ENDS); + undo_redo->add_do_property(obj, p_name, p_value); + undo_redo->add_undo_property(obj, p_name, obj->get(p_name)); if (p_refresh_all) { - undo_redo->add_do_method(this,"_changed_callback",obj,""); - undo_redo->add_undo_method(this,"_changed_callback",obj,""); + undo_redo->add_do_method(this, "_changed_callback", obj, ""); + undo_redo->add_undo_method(this, "_changed_callback", obj, ""); } else { - undo_redo->add_do_method(this,"_changed_callback",obj,p_name); - undo_redo->add_undo_method(this,"_changed_callback",obj,p_name); + undo_redo->add_do_method(this, "_changed_callback", obj, p_name); + undo_redo->add_undo_method(this, "_changed_callback", obj, p_name); } Resource *r = obj->cast_to<Resource>(); if (r) { - if (!r->is_edited() && String(p_name)!="resource/edited") { - undo_redo->add_do_method(r,"set_edited",true); - undo_redo->add_undo_method(r,"set_edited",false); + if (!r->is_edited() && String(p_name) != "resource/edited") { + undo_redo->add_do_method(r, "set_edited", true); + undo_redo->add_undo_method(r, "set_edited", false); } - if (String(p_name)=="resource_local_to_scene") { + if (String(p_name) == "resource_local_to_scene") { bool prev = obj->get(p_name); bool next = p_value; if (next) { - undo_redo->add_do_method(this,"setup_local_to_scene"); + undo_redo->add_do_method(this, "setup_local_to_scene"); } if (prev) { - undo_redo->add_undo_method(this,"setup_local_to_scene"); + undo_redo->add_undo_method(this, "setup_local_to_scene"); } } } - undo_redo->add_do_method(this,"emit_signal",_prop_edited,p_name); - undo_redo->add_undo_method(this,"emit_signal",_prop_edited,p_name); + undo_redo->add_do_method(this, "emit_signal", _prop_edited, p_name); + undo_redo->add_undo_method(this, "emit_signal", _prop_edited, p_name); undo_redo->commit_action(); } } - void PropertyEditor::_item_edited() { - - TreeItem * item = tree->get_edited(); + TreeItem *item = tree->get_edited(); if (!item) return; //it all happened too fast.. Dictionary d = item->get_metadata(0); - String name=d["name"]; + String name = d["name"]; - if (tree->get_edited_column()==0) { + if (tree->get_edited_column() == 0) { //property checked if (autoclear) { if (!item->is_checked(0)) { - obj->set(name,Variant()); + obj->set(name, Variant()); update_property(name); } else { Variant::CallError ce; - obj->set(name,Variant::construct(Variant::Type(int(d["type"])),NULL,0,ce)); + obj->set(name, Variant::construct(Variant::Type(int(d["type"])), NULL, 0, ce)); } } else { - emit_signal("property_toggled",name,item->is_checked(0)); + emit_signal("property_toggled", name, item->is_checked(0)); } return; } - if (autoclear && item->get_cell_mode(0)==TreeItem::CELL_MODE_CHECK && item->get_cell_mode(1)!=TreeItem::CELL_MODE_CUSTOM) { - item->set_checked(0,true); - + if (autoclear && item->get_cell_mode(0) == TreeItem::CELL_MODE_CHECK && item->get_cell_mode(1) != TreeItem::CELL_MODE_CUSTOM) { + item->set_checked(0, true); } - - int type=d["type"]; - int hint= d["hint"]; + int type = d["type"]; + int hint = d["hint"]; int usage = d["usage"]; - bool refresh_all = usage&PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED; + bool refresh_all = usage & PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED; - String hint_text=d["hint_text"]; - switch(type) { + String hint_text = d["hint_text"]; + switch (type) { case Variant::NIL: { } break; case Variant::BOOL: { - _edit_set(name,item->is_checked(1),refresh_all); + _edit_set(name, item->is_checked(1), refresh_all); item->set_tooltip(1, item->is_checked(1) ? "True" : "False"); } break; case Variant::INT: case Variant::REAL: { - if (hint==PROPERTY_HINT_LAYERS_2D_PHYSICS || hint==PROPERTY_HINT_LAYERS_2D_RENDER || hint==PROPERTY_HINT_LAYERS_3D_PHYSICS || hint==PROPERTY_HINT_LAYERS_3D_RENDER) + if (hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || hint == PROPERTY_HINT_LAYERS_2D_RENDER || hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || hint == PROPERTY_HINT_LAYERS_3D_RENDER) break; - if (hint==PROPERTY_HINT_EXP_EASING) + if (hint == PROPERTY_HINT_EXP_EASING) break; - if (hint==PROPERTY_HINT_FLAGS) + if (hint == PROPERTY_HINT_FLAGS) break; - if (type==Variant::INT) - _edit_set(name,int(item->get_range(1)),refresh_all); + if (type == Variant::INT) + _edit_set(name, int(item->get_range(1)), refresh_all); else - _edit_set(name,item->get_range(1),refresh_all); + _edit_set(name, item->get_range(1), refresh_all); } break; case Variant::STRING: { - if (hint==PROPERTY_HINT_ENUM) { + if (hint == PROPERTY_HINT_ENUM) { - int idx= item->get_range(1); + int idx = item->get_range(1); Vector<String> strings = hint_text.split(","); String txt; - if (idx>=0 && idx<strings.size()) { + if (idx >= 0 && idx < strings.size()) { - txt=strings[idx]; + txt = strings[idx]; } - _edit_set(name,txt,refresh_all); + _edit_set(name, txt, refresh_all); } else { - _edit_set(name,item->get_text(1),refresh_all); + _edit_set(name, item->get_text(1), refresh_all); } } break; - // math types + // math types case Variant::VECTOR3: { @@ -4094,7 +3910,7 @@ void PropertyEditor::_item_edited() { } break; case Variant::NODE_PATH: { - _edit_set(name, NodePath(item->get_text(1)),refresh_all); + _edit_set(name, NodePath(item->get_text(1)), refresh_all); } break; @@ -4105,7 +3921,7 @@ void PropertyEditor::_item_edited() { } break; - // arrays + // arrays case Variant::POOL_BYTE_ARRAY: { } break; @@ -4124,36 +3940,31 @@ void PropertyEditor::_item_edited() { case Variant::POOL_COLOR_ARRAY: { } break; - - }; } - void PropertyEditor::_resource_edit_request() { - RES res=custom_editor->get_variant(); + RES res = custom_editor->get_variant(); if (res.is_null()) return; - String name=custom_editor->get_name(); + String name = custom_editor->get_name(); - - emit_signal("resource_selected",res.get_ref_ptr(),name); + emit_signal("resource_selected", res.get_ref_ptr(), name); } void PropertyEditor::_custom_editor_edited() { - if (!obj) return; _edit_set(custom_editor->get_name(), custom_editor->get_variant()); } -void PropertyEditor::_custom_editor_edited_field(const String& p_field_name) { +void PropertyEditor::_custom_editor_edited_field(const String &p_field_name) { - ERR_FAIL_COND(p_field_name==""); + ERR_FAIL_COND(p_field_name == ""); if (!obj) return; @@ -4163,38 +3974,37 @@ void PropertyEditor::_custom_editor_edited_field(const String& p_field_name) { void PropertyEditor::_custom_editor_request(bool p_arrow) { - TreeItem * item = tree->get_edited(); + TreeItem *item = tree->get_edited(); ERR_FAIL_COND(!item); Dictionary d = item->get_metadata(0); //int type=d["type"]; - String name=d["name"]; - Variant::Type type=Variant::NIL; + String name = d["name"]; + Variant::Type type = Variant::NIL; if (d.has("type")) - type=(Variant::Type)((int)(d["type"])); + type = (Variant::Type)((int)(d["type"])); - Variant v=obj->get(name); - int hint=d.has("hint")?d["hint"].operator int():-1; - String hint_text=d.has("hint_text")?d["hint_text"]:""; - Rect2 where=tree->get_custom_popup_rect(); + Variant v = obj->get(name); + int hint = d.has("hint") ? d["hint"].operator int() : -1; + String hint_text = d.has("hint_text") ? d["hint_text"] : ""; + Rect2 where = tree->get_custom_popup_rect(); custom_editor->set_pos(where.pos); - if (custom_editor->edit(obj,name,type,v,hint,hint_text)) { + if (custom_editor->edit(obj, name, type, v, hint, hint_text)) { custom_editor->popup(); } } -void PropertyEditor::edit(Object* p_object) { +void PropertyEditor::edit(Object *p_object) { - - if (obj==p_object) + if (obj == p_object) return; if (obj) { obj->remove_change_receptor(this); } - obj=p_object; + obj = p_object; evaluator->edit(p_object); @@ -4204,18 +4014,15 @@ void PropertyEditor::edit(Object* p_object) { obj->add_change_receptor(this); } - - } -void PropertyEditor::_set_range_def(Object *p_item, String prop,float p_frame) { +void PropertyEditor::_set_range_def(Object *p_item, String prop, float p_frame) { TreeItem *ti = p_item->cast_to<TreeItem>(); ERR_FAIL_COND(!ti); - ti->call_deferred("set_range",1, p_frame); - obj->call_deferred("set",prop,p_frame); - + ti->call_deferred("set_range", 1, p_frame); + obj->call_deferred("set", prop, p_frame); } void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) { @@ -4224,49 +4031,48 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) { Dictionary d = ti->get_metadata(0); - if (p_button==2) { + if (p_button == 2) { if (!d.has("name")) return; - String prop=d["name"]; - emit_signal("property_keyed",prop,obj->get(prop),false); - } else if (p_button==5) { + String prop = d["name"]; + emit_signal("property_keyed", prop, obj->get(prop), false); + } else if (p_button == 5) { print_line("PB5"); if (!d.has("name")) return; - String prop=d["name"]; - emit_signal("property_keyed",prop,obj->get(prop),true); + String prop = d["name"]; + emit_signal("property_keyed", prop, obj->get(prop), true); //set_range(p_column, ti->get_range(p_column)+1.0 ); - call_deferred("_set_range_def",ti,prop,ti->get_range(p_column)+1.0); - } else if (p_button==3) { + call_deferred("_set_range_def", ti, prop, ti->get_range(p_column) + 1.0); + } else if (p_button == 3) { if (!d.has("name")) return; - String prop=d["name"]; + String prop = d["name"]; Variant vorig; - if (_might_be_in_instance() && _get_instanced_node_original_property(prop,vorig)) { + if (_might_be_in_instance() && _get_instanced_node_original_property(prop, vorig)) { - _edit_set(prop,vorig); + _edit_set(prop, vorig); return; } - if (obj->call("property_can_revert",prop).operator bool()) { - Variant rev = obj->call("property_get_revert",prop); - _edit_set(prop,rev); + if (obj->call("property_can_revert", prop).operator bool()) { + Variant rev = obj->call("property_get_revert", prop); + _edit_set(prop, rev); } - if (!obj->get_script().is_null()) { + if (!obj->get_script().is_null()) { Ref<Script> scr = obj->get_script(); Variant orig_value; - if (scr->get_property_default_value(prop,orig_value)) { - _edit_set(prop,orig_value); + if (scr->get_property_default_value(prop, orig_value)) { + _edit_set(prop, orig_value); } } - } else { Dictionary d = ti->get_metadata(0); @@ -4284,7 +4090,7 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) { String n = d["name"]; String ht = d["hint_text"]; - if(t == Variant::NODE_PATH) { + if (t == Variant::NODE_PATH) { Variant v = obj->get(n); custom_editor->edit(obj, n, (Variant::Type)t, v, h, ht); @@ -4294,72 +4100,69 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) { custom_editor->set_pos(where.pos); custom_editor->popup(); - } else if (t==Variant::STRING) { - + } else if (t == Variant::STRING) { Variant v = obj->get(n); - custom_editor->edit(obj,n,(Variant::Type)t,v,h,ht); + custom_editor->edit(obj, n, (Variant::Type)t, v, h, ht); //Rect2 where=tree->get_custom_popup_rect(); - if (h==PROPERTY_HINT_FILE || h==PROPERTY_HINT_DIR || h==PROPERTY_HINT_GLOBAL_DIR || h==PROPERTY_HINT_GLOBAL_FILE) { + if (h == PROPERTY_HINT_FILE || h == PROPERTY_HINT_DIR || h == PROPERTY_HINT_GLOBAL_DIR || h == PROPERTY_HINT_GLOBAL_FILE) { - Rect2 where=tree->get_item_rect(ti,1); - where.pos-=tree->get_scroll(); - where.pos+=tree->get_global_pos(); + Rect2 where = tree->get_item_rect(ti, 1); + where.pos -= tree->get_scroll(); + where.pos += tree->get_global_pos(); custom_editor->set_pos(where.pos); custom_editor->popup(); } else { custom_editor->popup_centered_ratio(); } - } else if (t==Variant::OBJECT) { + } else if (t == Variant::OBJECT) { RES r = obj->get(n); if (r.is_valid()) { - emit_signal("resource_selected",r,n); + emit_signal("resource_selected", r, n); } - } else if (t==Variant::INT && h==PROPERTY_HINT_OBJECT_ID) { + } else if (t == Variant::INT && h == PROPERTY_HINT_OBJECT_ID) { - emit_signal("object_id_selected",obj->get(n)); + emit_signal("object_id_selected", obj->get(n)); print_line("OBJ ID SELECTED"); - } else if (t==Variant::ARRAY || t==Variant::POOL_INT_ARRAY || t==Variant::POOL_REAL_ARRAY || t==Variant::POOL_STRING_ARRAY || t==Variant::POOL_VECTOR2_ARRAY || t==Variant::POOL_VECTOR3_ARRAY || t==Variant::POOL_COLOR_ARRAY || t==Variant::POOL_BYTE_ARRAY) { + } else if (t == Variant::ARRAY || t == Variant::POOL_INT_ARRAY || t == Variant::POOL_REAL_ARRAY || t == Variant::POOL_STRING_ARRAY || t == Variant::POOL_VECTOR2_ARRAY || t == Variant::POOL_VECTOR3_ARRAY || t == Variant::POOL_COLOR_ARRAY || t == Variant::POOL_BYTE_ARRAY) { Variant v = obj->get(n); - if (v.get_type()!=t) { + if (v.get_type() != t) { Variant::CallError ce; - v=Variant::construct(Variant::Type(t),NULL,0,ce); + v = Variant::construct(Variant::Type(t), NULL, 0, ce); } - Ref<ArrayPropertyEdit> ape = memnew( ArrayPropertyEdit ); - ape->edit(obj,n,ht,Variant::Type(t)); + Ref<ArrayPropertyEdit> ape = memnew(ArrayPropertyEdit); + ape->edit(obj, n, ht, Variant::Type(t)); EditorNode::get_singleton()->push_item(ape.ptr()); } } } - void PropertyEditor::_node_removed(Node *p_node) { - if (p_node==obj) { + if (p_node == obj) { edit(NULL); } } - void PropertyEditor::set_keying(bool p_active) { - if (keying==p_active) + if (keying == p_active) return; - keying=p_active; + keying = p_active; update_tree(); } -void PropertyEditor::_draw_flags(Object *t,const Rect2& p_rect) { +void PropertyEditor::_draw_flags(Object *t, const Rect2 &p_rect) { TreeItem *ti = t->cast_to<TreeItem>(); if (!ti) @@ -4372,41 +4175,37 @@ void PropertyEditor::_draw_flags(Object *t,const Rect2& p_rect) { uint32_t f = obj->get(d["name"]); - int bsize = (p_rect.size.height*80/100)/2; + int bsize = (p_rect.size.height * 80 / 100) / 2; - int h = bsize*2+1; - int vofs = (p_rect.size.height-h)/2; + int h = bsize * 2 + 1; + int vofs = (p_rect.size.height - h) / 2; - for(int i=0;i<2;i++) { + for (int i = 0; i < 2; i++) { - Point2 ofs(4,vofs); - if (i==1) - ofs.y+=bsize+1; + Point2 ofs(4, vofs); + if (i == 1) + ofs.y += bsize + 1; - ofs+=p_rect.pos; - for(int j=0;j<10;j++) { + ofs += p_rect.pos; + for (int j = 0; j < 10; j++) { - Point2 o = ofs+Point2(j*(bsize+1),0); - if (j>=5) - o.x+=1; + Point2 o = ofs + Point2(j * (bsize + 1), 0); + if (j >= 5) + o.x += 1; - uint32_t idx=i*10+j; - bool on=f&(1<<idx); - tree->draw_rect(Rect2(o,Size2(bsize,bsize)),Color(0,0,0,on?0.8:0.3)); + uint32_t idx = i * 10 + j; + bool on = f & (1 << idx); + tree->draw_rect(Rect2(o, Size2(bsize, bsize)), Color(0, 0, 0, on ? 0.8 : 0.3)); } } - - } -void PropertyEditor::_filter_changed(const String& p_text) { +void PropertyEditor::_filter_changed(const String &p_text) { update_tree(); } - - -void PropertyEditor::_resource_preview_done(const String& p_path,const Ref<Texture>& p_preview,Variant p_ud) { +void PropertyEditor::_resource_preview_done(const String &p_path, const Ref<Texture> &p_preview, Variant p_ud) { if (p_preview.is_null()) return; //don't bother with empty preview @@ -4423,38 +4222,38 @@ void PropertyEditor::_resource_preview_done(const String& p_path,const Ref<Textu int tw = EditorSettings::get_singleton()->get("docks/property_editor/texture_preview_width"); - ti->set_icon(1,p_preview); //should be scaled I think? - ti->set_icon_max_width(1,tw); - ti->set_text(1,""); + ti->set_icon(1, p_preview); //should be scaled I think? + ti->set_icon_max_width(1, tw); + ti->set_text(1, ""); } void PropertyEditor::_bind_methods() { - ClassDB::bind_method( "_item_edited",&PropertyEditor::_item_edited); - ClassDB::bind_method( "_item_selected",&PropertyEditor::_item_selected); - ClassDB::bind_method( "_custom_editor_request",&PropertyEditor::_custom_editor_request); - ClassDB::bind_method( "_custom_editor_edited",&PropertyEditor::_custom_editor_edited); - ClassDB::bind_method( "_custom_editor_edited_field",&PropertyEditor::_custom_editor_edited_field,DEFVAL("")); - ClassDB::bind_method( "_resource_edit_request",&PropertyEditor::_resource_edit_request); - ClassDB::bind_method( "_node_removed",&PropertyEditor::_node_removed); - ClassDB::bind_method( "_edit_button",&PropertyEditor::_edit_button); - ClassDB::bind_method( "_changed_callback",&PropertyEditor::_changed_callbacks); - ClassDB::bind_method( "_draw_flags",&PropertyEditor::_draw_flags); - ClassDB::bind_method( "_set_range_def",&PropertyEditor::_set_range_def); - ClassDB::bind_method( "_filter_changed",&PropertyEditor::_filter_changed); - ClassDB::bind_method( "update_tree",&PropertyEditor::update_tree); - ClassDB::bind_method( "_resource_preview_done",&PropertyEditor::_resource_preview_done); - ClassDB::bind_method( "refresh",&PropertyEditor::refresh); - ClassDB::bind_method( "_draw_transparency",&PropertyEditor::_draw_transparency); + ClassDB::bind_method("_item_edited", &PropertyEditor::_item_edited); + ClassDB::bind_method("_item_selected", &PropertyEditor::_item_selected); + ClassDB::bind_method("_custom_editor_request", &PropertyEditor::_custom_editor_request); + ClassDB::bind_method("_custom_editor_edited", &PropertyEditor::_custom_editor_edited); + ClassDB::bind_method("_custom_editor_edited_field", &PropertyEditor::_custom_editor_edited_field, DEFVAL("")); + ClassDB::bind_method("_resource_edit_request", &PropertyEditor::_resource_edit_request); + ClassDB::bind_method("_node_removed", &PropertyEditor::_node_removed); + ClassDB::bind_method("_edit_button", &PropertyEditor::_edit_button); + ClassDB::bind_method("_changed_callback", &PropertyEditor::_changed_callbacks); + ClassDB::bind_method("_draw_flags", &PropertyEditor::_draw_flags); + ClassDB::bind_method("_set_range_def", &PropertyEditor::_set_range_def); + ClassDB::bind_method("_filter_changed", &PropertyEditor::_filter_changed); + ClassDB::bind_method("update_tree", &PropertyEditor::update_tree); + ClassDB::bind_method("_resource_preview_done", &PropertyEditor::_resource_preview_done); + ClassDB::bind_method("refresh", &PropertyEditor::refresh); + ClassDB::bind_method("_draw_transparency", &PropertyEditor::_draw_transparency); ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &PropertyEditor::get_drag_data_fw); ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &PropertyEditor::can_drop_data_fw); ClassDB::bind_method(D_METHOD("drop_data_fw"), &PropertyEditor::drop_data_fw); - ADD_SIGNAL( MethodInfo("property_toggled",PropertyInfo( Variant::STRING, "property"),PropertyInfo( Variant::BOOL, "value"))); - ADD_SIGNAL( MethodInfo("resource_selected", PropertyInfo( Variant::OBJECT, "res"),PropertyInfo( Variant::STRING, "prop") ) ); - ADD_SIGNAL( MethodInfo("object_id_selected", PropertyInfo( Variant::INT, "id")) ); - ADD_SIGNAL( MethodInfo("property_keyed",PropertyInfo( Variant::STRING, "property"))); - ADD_SIGNAL( MethodInfo("property_edited",PropertyInfo( Variant::STRING, "property"))); + ADD_SIGNAL(MethodInfo("property_toggled", PropertyInfo(Variant::STRING, "property"), PropertyInfo(Variant::BOOL, "value"))); + ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::OBJECT, "res"), PropertyInfo(Variant::STRING, "prop"))); + ADD_SIGNAL(MethodInfo("object_id_selected", PropertyInfo(Variant::INT, "id"))); + ADD_SIGNAL(MethodInfo("property_keyed", PropertyInfo(Variant::STRING, "property"))); + ADD_SIGNAL(MethodInfo("property_edited", PropertyInfo(Variant::STRING, "property"))); } Tree *PropertyEditor::get_scene_tree() { @@ -4462,7 +4261,7 @@ Tree *PropertyEditor::get_scene_tree() { return tree; } -Label* PropertyEditor::get_top_label() { +Label *PropertyEditor::get_top_label() { return top_label; } @@ -4470,12 +4269,11 @@ Label* PropertyEditor::get_top_label() { void PropertyEditor::hide_top_label() { top_label->hide(); - tree->set_begin( Point2(0,0 )); + tree->set_begin(Point2(0, 0)); } String PropertyEditor::get_selected_path() const { - TreeItem *ti = tree->get_selected(); if (!ti) return ""; @@ -4490,244 +4288,228 @@ String PropertyEditor::get_selected_path() const { void PropertyEditor::set_capitalize_paths(bool p_capitalize) { - capitalize_paths=p_capitalize; + capitalize_paths = p_capitalize; } void PropertyEditor::set_autoclear(bool p_enable) { - autoclear=p_enable; + autoclear = p_enable; } void PropertyEditor::set_show_categories(bool p_show) { - show_categories=p_show; + show_categories = p_show; update_tree(); } void PropertyEditor::set_use_filter(bool p_use) { - if (p_use==use_filter) + if (p_use == use_filter) return; - use_filter=p_use; + use_filter = p_use; update_tree(); } -void PropertyEditor::register_text_enter(Node* p_line_edit) { +void PropertyEditor::register_text_enter(Node *p_line_edit) { ERR_FAIL_NULL(p_line_edit); - search_box=p_line_edit->cast_to<LineEdit>(); + search_box = p_line_edit->cast_to<LineEdit>(); if (search_box) - search_box->connect("text_changed",this,"_filter_changed"); + search_box->connect("text_changed", this, "_filter_changed"); } void PropertyEditor::set_subsection_selectable(bool p_selectable) { - if (p_selectable==subsection_selectable) + if (p_selectable == subsection_selectable) return; - subsection_selectable=p_selectable; + subsection_selectable = p_selectable; update_tree(); } PropertyEditor::PropertyEditor() { - _prop_edited="property_edited"; + _prop_edited = "property_edited"; - hide_script=false; + hide_script = false; - undo_redo=NULL; - obj=NULL; - search_box=NULL; - changing=false; - update_tree_pending=false; + undo_redo = NULL; + obj = NULL; + search_box = NULL; + changing = false; + update_tree_pending = false; - top_label = memnew( Label ); + top_label = memnew(Label); top_label->set_text(TTR("Properties:")); - top_label->set_anchor( MARGIN_RIGHT, ANCHOR_END ); - top_label->set_begin( Point2( 10,0) ); - top_label->set_end( Point2( 0,12) ); + top_label->set_anchor(MARGIN_RIGHT, ANCHOR_END); + top_label->set_begin(Point2(10, 0)); + top_label->set_end(Point2(0, 12)); add_child(top_label); - - tree = memnew( Tree ); - tree->set_anchor( MARGIN_RIGHT, ANCHOR_END ); - tree->set_anchor( MARGIN_BOTTOM, ANCHOR_END ); - tree->set_begin( Point2(0,19 )); - tree->set_end( Point2(0,0 )); + tree = memnew(Tree); + tree->set_anchor(MARGIN_RIGHT, ANCHOR_END); + tree->set_anchor(MARGIN_BOTTOM, ANCHOR_END); + tree->set_begin(Point2(0, 19)); + tree->set_end(Point2(0, 0)); tree->set_columns(2); - tree->set_column_expand(0,true); - tree->set_column_min_width(0,30); - tree->set_column_expand(1,true); - tree->set_column_min_width(1,18); + tree->set_column_expand(0, true); + tree->set_column_min_width(0, 30); + tree->set_column_expand(1, true); + tree->set_column_min_width(1, 18); //tree->set_hide_root(true); - add_child( tree ); + add_child(tree); - tree->connect("item_edited", this,"_item_edited",varray(),CONNECT_DEFERRED); - tree->connect("cell_selected", this,"_item_selected"); + tree->connect("item_edited", this, "_item_edited", varray(), CONNECT_DEFERRED); + tree->connect("cell_selected", this, "_item_selected"); tree->set_drag_forwarding(this); set_fixed_process(true); - custom_editor = memnew( CustomPropertyEditor ); + custom_editor = memnew(CustomPropertyEditor); add_child(custom_editor); - tree->connect("custom_popup_edited", this,"_custom_editor_request"); - tree->connect("button_pressed", this,"_edit_button"); - custom_editor->connect("variant_changed", this,"_custom_editor_edited"); - custom_editor->connect("variant_field_changed", this,"_custom_editor_edited_field"); - custom_editor->connect("resource_edit_request", this,"_resource_edit_request",make_binds(),CONNECT_DEFERRED); + tree->connect("custom_popup_edited", this, "_custom_editor_request"); + tree->connect("button_pressed", this, "_edit_button"); + custom_editor->connect("variant_changed", this, "_custom_editor_edited"); + custom_editor->connect("variant_field_changed", this, "_custom_editor_edited_field"); + custom_editor->connect("resource_edit_request", this, "_resource_edit_request", make_binds(), CONNECT_DEFERRED); tree->set_hide_folding(true); - evaluator = memnew (PropertyValueEvaluator); + evaluator = memnew(PropertyValueEvaluator); tree->set_value_evaluator(evaluator); custom_editor->set_value_evaluator(evaluator); - capitalize_paths=true; - autoclear=false; + capitalize_paths = true; + autoclear = false; tree->set_column_titles_visible(false); - keying=false; - read_only=false; - show_categories=false; - refresh_countdown=0; - use_doc_hints=false; - use_filter=false; - subsection_selectable=false; - show_type_icons=EDITOR_DEF("interface/show_type_icons",false); - + keying = false; + read_only = false; + show_categories = false; + refresh_countdown = 0; + use_doc_hints = false; + use_filter = false; + subsection_selectable = false; + show_type_icons = EDITOR_DEF("interface/show_type_icons", false); } - -PropertyEditor::~PropertyEditor() -{ +PropertyEditor::~PropertyEditor() { memdelete(evaluator); } - ///////////////////////////// - - - - class SectionedPropertyEditorFilter : public Object { - GDCLASS( SectionedPropertyEditorFilter, Object ); + GDCLASS(SectionedPropertyEditorFilter, Object); Object *edited; String section; bool allow_sub; - bool _set(const StringName& p_name, const Variant& p_value) { + bool _set(const StringName &p_name, const Variant &p_value) { if (!edited) return false; - String name=p_name; - if (section!="") { - name=section+"/"+name; + String name = p_name; + if (section != "") { + name = section + "/" + name; } bool valid; - edited->set(name,p_value,&valid); + edited->set(name, p_value, &valid); //_change_notify(p_name.operator String().utf8().get_data()); return valid; } - bool _get(const StringName& p_name,Variant &r_ret) const{ + bool _get(const StringName &p_name, Variant &r_ret) const { if (!edited) return false; - String name=p_name; - if (section!="") { - name=section+"/"+name; + String name = p_name; + if (section != "") { + name = section + "/" + name; } - bool valid=false; + bool valid = false; - r_ret=edited->get(name,&valid); + r_ret = edited->get(name, &valid); return valid; - - } - void _get_property_list(List<PropertyInfo> *p_list) const{ + void _get_property_list(List<PropertyInfo> *p_list) const { if (!edited) return; List<PropertyInfo> pinfo; edited->get_property_list(&pinfo); - for (List<PropertyInfo>::Element *E=pinfo.front();E;E=E->next()) { + for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) { - PropertyInfo pi=E->get(); + PropertyInfo pi = E->get(); int sp = pi.name.find("/"); - if (pi.name=="resource_path" || pi.name=="resource_name" || pi.name.begins_with("script/")) //skip resource stuff + if (pi.name == "resource_path" || pi.name == "resource_name" || pi.name.begins_with("script/")) //skip resource stuff continue; - if (sp==-1) { - pi.name="Global/"+pi.name; - + if (sp == -1) { + pi.name = "Global/" + pi.name; } - if (pi.name.begins_with(section+"/")) { - pi.name=pi.name.replace_first(section+"/",""); - if (!allow_sub && pi.name.find("/")!=-1) + if (pi.name.begins_with(section + "/")) { + pi.name = pi.name.replace_first(section + "/", ""); + if (!allow_sub && pi.name.find("/") != -1) continue; p_list->push_back(pi); } } - } - bool property_can_revert(const String& p_name) { + bool property_can_revert(const String &p_name) { - return edited->call("property_can_revert",section+"/"+p_name); + return edited->call("property_can_revert", section + "/" + p_name); } - Variant property_get_revert(const String& p_name) { + Variant property_get_revert(const String &p_name) { - return edited->call("property_get_revert",section+"/"+p_name); + return edited->call("property_get_revert", section + "/" + p_name); } protected: static void _bind_methods() { - ClassDB::bind_method("property_can_revert",&SectionedPropertyEditorFilter::property_can_revert); - ClassDB::bind_method("property_get_revert",&SectionedPropertyEditorFilter::property_get_revert); + ClassDB::bind_method("property_can_revert", &SectionedPropertyEditorFilter::property_can_revert); + ClassDB::bind_method("property_get_revert", &SectionedPropertyEditorFilter::property_get_revert); } public: + void set_section(const String &p_section, bool p_allow_sub) { - void set_section(const String& p_section,bool p_allow_sub) { - - section=p_section; - allow_sub=p_allow_sub; + section = p_section; + allow_sub = p_allow_sub; _change_notify(); } - void set_edited(Object* p_edited) { - edited=p_edited; + void set_edited(Object *p_edited) { + edited = p_edited; _change_notify(); } SectionedPropertyEditorFilter() { - edited=NULL; + edited = NULL; } - }; - void SectionedPropertyEditor::_bind_methods() { - ClassDB::bind_method("_section_selected",&SectionedPropertyEditor::_section_selected); + ClassDB::bind_method("_section_selected", &SectionedPropertyEditor::_section_selected); ClassDB::bind_method("update_category_list", &SectionedPropertyEditor::update_category_list); } @@ -4737,10 +4519,10 @@ void SectionedPropertyEditor::_section_selected() { if (!sections->get_selected()) return; - filter->set_section( sections->get_selected()->get_metadata(0), sections->get_selected()->get_children()==NULL); + filter->set_section(sections->get_selected()->get_metadata(0), sections->get_selected()->get_children() == NULL); } -void SectionedPropertyEditor::set_current_section(const String& p_section) { +void SectionedPropertyEditor::set_current_section(const String &p_section) { if (section_map.has(p_section)) { section_map[p_section]->select(0); @@ -4755,17 +4537,17 @@ String SectionedPropertyEditor::get_current_section() const { return ""; } -String SectionedPropertyEditor::get_full_item_path(const String& p_item) { +String SectionedPropertyEditor::get_full_item_path(const String &p_item) { String base = get_current_section(); - if (base!="") - return base+"/"+p_item; + if (base != "") + return base + "/" + p_item; else return p_item; } -void SectionedPropertyEditor::edit(Object* p_object) { +void SectionedPropertyEditor::edit(Object *p_object) { if (!p_object) { obj = -1; @@ -4798,7 +4580,7 @@ void SectionedPropertyEditor::edit(Object* p_object) { void SectionedPropertyEditor::update_category_list() { - String selected_category=get_current_section(); + String selected_category = get_current_section(); sections->clear(); Object *o = ObjectDB::get_instance(obj); @@ -4812,48 +4594,43 @@ void SectionedPropertyEditor::update_category_list() { section_map.clear(); TreeItem *root = sections->create_item(); - section_map[""]=root; + section_map[""] = root; + for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) { - for (List<PropertyInfo>::Element *E=pinfo.front();E;E=E->next()) { + PropertyInfo pi = E->get(); - PropertyInfo pi=E->get(); - - if (pi.usage&PROPERTY_USAGE_CATEGORY) + if (pi.usage & PROPERTY_USAGE_CATEGORY) continue; - else if ( !(pi.usage&PROPERTY_USAGE_EDITOR) ) + else if (!(pi.usage & PROPERTY_USAGE_EDITOR)) continue; - if (pi.name.find(":")!=-1 || pi.name=="script" || pi.name=="resource_name" || pi.name=="resource_path") + if (pi.name.find(":") != -1 || pi.name == "script" || pi.name == "resource_name" || pi.name == "resource_path") continue; int sp = pi.name.find("/"); - if (sp==-1) - pi.name="Global/"+pi.name; + if (sp == -1) + pi.name = "Global/" + pi.name; Vector<String> sectionarr = pi.name.split("/"); String metasection; - - for(int i=0;i<MIN(2,sectionarr.size()-1);i++) { + for (int i = 0; i < MIN(2, sectionarr.size() - 1); i++) { TreeItem *parent = section_map[metasection]; - if (i>0) { - metasection+="/"+sectionarr[i]; + if (i > 0) { + metasection += "/" + sectionarr[i]; } else { - metasection=sectionarr[i]; + metasection = sectionarr[i]; } - if (!section_map.has(metasection)) { TreeItem *ms = sections->create_item(parent); - section_map[metasection]=ms; - ms->set_text(0,sectionarr[i].capitalize()); - ms->set_metadata(0,metasection); - + section_map[metasection] = ms; + ms->set_text(0, sectionarr[i].capitalize()); + ms->set_metadata(0, metasection); } } - } if (section_map.has(selected_category)) { @@ -4870,32 +4647,30 @@ SectionedPropertyEditor::SectionedPropertyEditor() { obj = -1; - VBoxContainer *left_vb = memnew( VBoxContainer); - left_vb->set_custom_minimum_size(Size2(160,0)*EDSCALE); + VBoxContainer *left_vb = memnew(VBoxContainer); + left_vb->set_custom_minimum_size(Size2(160, 0) * EDSCALE); add_child(left_vb); - sections = memnew( Tree ); + sections = memnew(Tree); sections->set_v_size_flags(SIZE_EXPAND_FILL); sections->set_hide_root(true); - left_vb->add_margin_child(TTR("Sections:"),sections,true); + left_vb->add_margin_child(TTR("Sections:"), sections, true); - VBoxContainer *right_vb = memnew( VBoxContainer); + VBoxContainer *right_vb = memnew(VBoxContainer); right_vb->set_h_size_flags(SIZE_EXPAND_FILL); add_child(right_vb); - filter = memnew( SectionedPropertyEditorFilter ); - editor = memnew( PropertyEditor ); + filter = memnew(SectionedPropertyEditorFilter); + editor = memnew(PropertyEditor); editor->set_v_size_flags(SIZE_EXPAND_FILL); - right_vb->add_margin_child(TTR("Properties:"),editor,true); + right_vb->add_margin_child(TTR("Properties:"), editor, true); editor->get_scene_tree()->set_column_titles_visible(false); - editor->hide_top_label(); - sections->connect("cell_selected",this,"_section_selected"); - + sections->connect("cell_selected", this, "_section_selected"); } SectionedPropertyEditor::~SectionedPropertyEditor() { @@ -4903,12 +4678,12 @@ SectionedPropertyEditor::~SectionedPropertyEditor() { memdelete(filter); } -double PropertyValueEvaluator::eval(const String& p_text) { +double PropertyValueEvaluator::eval(const String &p_text) { if (!obj || !script_language) return _default_eval(p_text); - Ref<Script> script= Ref<Script>(script_language ->create_script()); + Ref<Script> script = Ref<Script>(script_language->create_script()); script->set_source_code(_build_script(p_text)); Error err = script->reload(); if (err) { @@ -4921,8 +4696,8 @@ double PropertyValueEvaluator::eval(const String& p_text) { return _default_eval(p_text); Variant::CallError call_err; - script_instance->call("set_this",obj); - double result = script_instance->call("e", NULL, 0, call_err ); + script_instance->call("set_this", obj); + double result = script_instance->call("e", NULL, 0, call_err); if (call_err.error == Variant::CallError::CALL_OK) { return result; } @@ -4933,12 +4708,11 @@ double PropertyValueEvaluator::eval(const String& p_text) { return _default_eval(p_text); } - void PropertyValueEvaluator::edit(Object *p_obj) { obj = p_obj; } -String PropertyValueEvaluator::_build_script(const String& p_text) { +String PropertyValueEvaluator::_build_script(const String &p_text) { String script_text = "tool\nvar this\nfunc set_this(p_this):\n\tthis=p_this\nfunc e():\n\treturn "; script_text += p_text.strip_edges(); script_text += "\n"; @@ -4946,15 +4720,14 @@ String PropertyValueEvaluator::_build_script(const String& p_text) { } PropertyValueEvaluator::PropertyValueEvaluator() { - script_language=NULL; + script_language = NULL; - for(int i=0;i<ScriptServer::get_language_count();i++) { - if (ScriptServer::get_language(i)->get_name()=="GDScript") { - script_language=ScriptServer::get_language(i); + for (int i = 0; i < ScriptServer::get_language_count(); i++) { + if (ScriptServer::get_language(i)->get_name() == "GDScript") { + script_language = ScriptServer::get_language(i); } } } PropertyValueEvaluator::~PropertyValueEvaluator() { - } |