diff --git a/core/global_constants.cpp b/core/global_constants.cpp index 87712064a95d..c5c2081b5c0e 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -483,7 +483,7 @@ static _GlobalConstant _global_constants[]={ BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_CHECKABLE ), BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_CHECKED ), BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_INTERNATIONALIZED ), - BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_BUNDLE ), + BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_GROUP ), BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_CATEGORY ), BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_STORE_IF_NONZERO ), BIND_GLOBAL_CONSTANT( PROPERTY_USAGE_STORE_IF_NONONE ), diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index 953192306f54..5328bb68fe3b 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -1825,7 +1825,7 @@ void ResourceFormatSaverBinaryInstance::_find_resources(const Variant& p_variant for(List::Element *E=property_list.front();E;E=E->next()) { - if (E->get().usage&PROPERTY_USAGE_STORAGE || (bundle_resources && E->get().usage&PROPERTY_USAGE_BUNDLE)) { + if (E->get().usage&PROPERTY_USAGE_STORAGE) { _find_resources(res->get(E->get().name)); } @@ -2028,7 +2028,7 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path,const RES& p_ if (skip_editor && F->get().name.begins_with("__editor")) continue; - if (F->get().usage&PROPERTY_USAGE_STORAGE || (bundle_resources && F->get().usage&PROPERTY_USAGE_BUNDLE)) { + if (F->get().usage&PROPERTY_USAGE_STORAGE ) { Property p; p.name_idx=get_string_index(F->get().name); p.value=E->get()->get(F->get().name); diff --git a/core/io/resource_format_xml.cpp b/core/io/resource_format_xml.cpp index c90adf4f57c8..7bb9e2efb792 100644 --- a/core/io/resource_format_xml.cpp +++ b/core/io/resource_format_xml.cpp @@ -2667,7 +2667,7 @@ void ResourceFormatSaverXMLInstance::_find_resources(const Variant& p_variant,bo PropertyInfo pi=I->get(); - if (pi.usage&PROPERTY_USAGE_STORAGE || (bundle_resources && pi.usage&PROPERTY_USAGE_BUNDLE)) { + if (pi.usage&PROPERTY_USAGE_STORAGE) { Variant v=res->get(I->get().name); _find_resources(v); @@ -2811,7 +2811,7 @@ Error ResourceFormatSaverXMLInstance::save(const String &p_path,const RES& p_res if (skip_editor && PE->get().name.begins_with("__editor")) continue; - if (PE->get().usage&PROPERTY_USAGE_STORAGE || (bundle_resources && PE->get().usage&PROPERTY_USAGE_BUNDLE)) { + if (PE->get().usage&PROPERTY_USAGE_STORAGE ) { String name = PE->get().name; Variant value = res->get(name); diff --git a/core/object.h b/core/object.h index 8ed5bcdf2522..6dd427bf4105 100644 --- a/core/object.h +++ b/core/object.h @@ -90,7 +90,7 @@ enum PropertyUsageFlags { PROPERTY_USAGE_CHECKABLE=16, //used for editing global variables PROPERTY_USAGE_CHECKED=32, //used for editing global variables PROPERTY_USAGE_INTERNATIONALIZED=64, //hint for internationalized strings - PROPERTY_USAGE_BUNDLE=128, //used for optimized bundles + PROPERTY_USAGE_GROUP=128, //used for grouping props in the editor PROPERTY_USAGE_CATEGORY=256, PROPERTY_USAGE_STORE_IF_NONZERO=512, //only store if nonzero PROPERTY_USAGE_STORE_IF_NONONE=1024, //only store if false @@ -115,6 +115,7 @@ enum PropertyUsageFlags { #define ADD_PROPERTYINZ( m_property, m_setter, m_getter, m_index ) ClassDB::add_property( get_class_static(), (m_property).added_usage(PROPERTY_USAGE_STORE_IF_NONZERO), m_setter, m_getter, m_index ) #define ADD_PROPERTYNO( m_property, m_setter, m_getter ) ClassDB::add_property( get_class_static(), (m_property).added_usage(PROPERTY_USAGE_STORE_IF_NONONE), m_setter, m_getter ) #define ADD_PROPERTYINO( m_property, m_setter, m_getter, m_index ) ClassDB::add_property( get_class_static(), (m_property).added_usage(PROPERTY_USAGE_STORE_IF_NONONE), m_setter, m_getter, m_index ) +#define ADD_GROUP( m_name, m_prefix ) ClassDB::add_property_group( get_class_static(), m_name, m_prefix ) struct PropertyInfo { diff --git a/core/object_type_db.cpp b/core/object_type_db.cpp index 498d222a664e..208782cc4ceb 100644 --- a/core/object_type_db.cpp +++ b/core/object_type_db.cpp @@ -740,6 +740,15 @@ bool ClassDB::get_signal(StringName p_class,StringName p_signal,MethodInfo *r_si return false; } + +void ClassDB::add_property_group(StringName p_class,const String& p_name,const String& p_prefix) { + + ClassInfo *type=classes.getptr(p_class); + ERR_FAIL_COND(!type); + + type->property_list.push_back(PropertyInfo(Variant::NIL,p_name,PROPERTY_HINT_NONE,p_prefix,PROPERTY_USAGE_GROUP)); +} + void ClassDB::add_property(StringName p_class,const PropertyInfo& p_pinfo, const StringName& p_setter, const StringName& p_getter, int p_index) { diff --git a/core/object_type_db.h b/core/object_type_db.h index ca52f6ca89d2..637101157765 100644 --- a/core/object_type_db.h +++ b/core/object_type_db.h @@ -476,6 +476,7 @@ public: static bool get_signal(StringName p_class,StringName p_signal,MethodInfo *r_signal); static void get_signal_list(StringName p_class,List *p_signals,bool p_no_inheritance=false); + static void add_property_group(StringName p_class,const String& p_name,const String& p_prefix=""); static void add_property(StringName p_class,const PropertyInfo& p_pinfo, const StringName& p_setter, const StringName& p_getter, int p_index=-1); static void get_property_list(StringName p_class, List *p_list, bool p_no_inheritance=false, const Object *p_validator=NULL); static bool set_property(Object* p_object, const StringName& p_property, const Variant& p_value, bool *r_valid=NULL); diff --git a/prop_renames.txt b/prop_renames.txt new file mode 100644 index 000000000000..fa41392e8d12 --- /dev/null +++ b/prop_renames.txt @@ -0,0 +1,35 @@ +[Object] +script/script = script + +[Node] +pause/pause_mode = pause_mode + +[Control] + +anchor/left = anchor_left +anchor/right = anchor_right +anchor/bottom = anchor_bottom +anchor/top = anchor_top + +focus_neighbour/left=focus_neighbour_left +focus_neighbour/right=focus_neighbour_right +focus_neighbour/bottom=focus_neighbour_bottom +focus_neighbour/top=focus_neighbour_top +focus/ignore_mouse = focus_ignore_mouse +focus/stop_mouse = focus_stop_mouse + +size_flags/horizontal = size_flags_horizontal +size_flags/vertical = size_flags_vertical +size_flags/stretch_ratio = size_flags_stretch_ratio +theme/theme = theme + +[CanvasItem] + +visibility/visible = visible +visibility/behind_parent = show_behind_parent +visibility/on_top = show_on_top +visibility/light_mask = light_mask +material/material = material +material/use_parent = use_parent_material + + diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 667fc6dcad46..1f4804990f6b 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -1003,15 +1003,17 @@ void CanvasItem::_bind_methods() { BIND_VMETHOD(MethodInfo("_draw")); - ADD_PROPERTYNO( PropertyInfo(Variant::BOOL,"visibility/visible"), _SCS("_set_visible_"),_SCS("_is_visible_") ); - ADD_PROPERTYNO( PropertyInfo(Variant::REAL,"visibility/modulate",PROPERTY_HINT_RANGE, "0,1,0.01"), _SCS("set_modulate"),_SCS("get_modulate") ); - ADD_PROPERTYNO( PropertyInfo(Variant::REAL,"visibility/self_modulate",PROPERTY_HINT_RANGE, "0,1,0.01"), _SCS("set_self_modulate"),_SCS("get_self_modulate") ); - ADD_PROPERTYNZ( PropertyInfo(Variant::BOOL,"visibility/behind_parent"), _SCS("set_draw_behind_parent"),_SCS("is_draw_behind_parent_enabled") ); - ADD_PROPERTY( PropertyInfo(Variant::BOOL,"visibility/on_top",PROPERTY_HINT_NONE,"",0), _SCS("_set_on_top"),_SCS("_is_on_top") ); //compatibility + ADD_GROUP("Visibility",""); + ADD_PROPERTYNO( PropertyInfo(Variant::BOOL,"visible"), _SCS("_set_visible_"),_SCS("_is_visible_") ); + ADD_PROPERTYNO( PropertyInfo(Variant::REAL,"modulate",PROPERTY_HINT_RANGE, "0,1,0.01"), _SCS("set_modulate"),_SCS("get_modulate") ); + ADD_PROPERTYNO( PropertyInfo(Variant::REAL,"self_modulate",PROPERTY_HINT_RANGE, "0,1,0.01"), _SCS("set_self_modulate"),_SCS("get_self_modulate") ); + ADD_PROPERTYNZ( PropertyInfo(Variant::BOOL,"show_behind_parent"), _SCS("set_draw_behind_parent"),_SCS("is_draw_behind_parent_enabled") ); + ADD_PROPERTY( PropertyInfo(Variant::BOOL,"show_on_top",PROPERTY_HINT_NONE,"",0), _SCS("_set_on_top"),_SCS("_is_on_top") ); //compatibility + ADD_PROPERTYNO( PropertyInfo(Variant::INT,"light_mask",PROPERTY_HINT_ALL_FLAGS), _SCS("set_light_mask"),_SCS("get_light_mask") ); - ADD_PROPERTYNO( PropertyInfo(Variant::INT,"visibility/light_mask",PROPERTY_HINT_ALL_FLAGS), _SCS("set_light_mask"),_SCS("get_light_mask") ); - ADD_PROPERTYNZ( PropertyInfo(Variant::OBJECT,"material/material",PROPERTY_HINT_RESOURCE_TYPE, "CanvasItemMaterial"), _SCS("set_material"),_SCS("get_material") ); - ADD_PROPERTYNZ( PropertyInfo(Variant::BOOL,"material/use_parent"), _SCS("set_use_parent_material"),_SCS("get_use_parent_material") ); + ADD_GROUP("Material",""); + ADD_PROPERTYNZ( PropertyInfo(Variant::OBJECT,"material",PROPERTY_HINT_RESOURCE_TYPE, "CanvasItemMaterial"), _SCS("set_material"),_SCS("get_material") ); + ADD_PROPERTYNZ( PropertyInfo(Variant::BOOL,"use_parent_material"), _SCS("set_use_parent_material"),_SCS("get_use_parent_material") ); //exporting these two things doesn't really make much sense i think //ADD_PROPERTY( PropertyInfo(Variant::BOOL,"transform/toplevel"), _SCS("set_as_toplevel"),_SCS("is_set_as_toplevel") ); //ADD_PROPERTY(PropertyInfo(Variant::BOOL,"transform/notify"),_SCS("set_transform_notify"),_SCS("is_transform_notify_enabled")); diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index d9e3faeb9aa6..bb78dbf9415e 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -2564,28 +2564,37 @@ void Control::_bind_methods() { BIND_VMETHOD(MethodInfo(Variant::BOOL,"can_drop_data",PropertyInfo(Variant::VECTOR2,"pos"),PropertyInfo(Variant::NIL,"data"))); BIND_VMETHOD(MethodInfo("drop_data",PropertyInfo(Variant::VECTOR2,"pos"),PropertyInfo(Variant::NIL,"data"))); - ADD_PROPERTYINZ( PropertyInfo(Variant::INT,"anchor/left", PROPERTY_HINT_ENUM, "Begin,End,Ratio,Center"), _SCS("_set_anchor"),_SCS("get_anchor"), MARGIN_LEFT ); - ADD_PROPERTYINZ( PropertyInfo(Variant::INT,"anchor/top", PROPERTY_HINT_ENUM, "Begin,End,Ratio,Center"), _SCS("_set_anchor"),_SCS("get_anchor"), MARGIN_TOP ); - ADD_PROPERTYINZ( PropertyInfo(Variant::INT,"anchor/right", PROPERTY_HINT_ENUM, "Begin,End,Ratio,Center"), _SCS("_set_anchor"),_SCS("get_anchor"), MARGIN_RIGHT ); - ADD_PROPERTYINZ( PropertyInfo(Variant::INT,"anchor/bottom", PROPERTY_HINT_ENUM, "Begin,End,Ratio,Center"), _SCS("_set_anchor"),_SCS("get_anchor"), MARGIN_BOTTOM ); + ADD_GROUP("Anchor","anchor_"); + ADD_PROPERTYINZ( PropertyInfo(Variant::INT,"anchor_left", PROPERTY_HINT_ENUM, "Begin,End,Ratio,Center"), _SCS("_set_anchor"),_SCS("get_anchor"), MARGIN_LEFT ); + ADD_PROPERTYINZ( PropertyInfo(Variant::INT,"anchor_top", PROPERTY_HINT_ENUM, "Begin,End,Ratio,Center"), _SCS("_set_anchor"),_SCS("get_anchor"), MARGIN_TOP ); + ADD_PROPERTYINZ( PropertyInfo(Variant::INT,"anchor_right", PROPERTY_HINT_ENUM, "Begin,End,Ratio,Center"), _SCS("_set_anchor"),_SCS("get_anchor"), MARGIN_RIGHT ); + ADD_PROPERTYINZ( PropertyInfo(Variant::INT,"anchor_bottom", PROPERTY_HINT_ENUM, "Begin,End,Ratio,Center"), _SCS("_set_anchor"),_SCS("get_anchor"), MARGIN_BOTTOM ); - ADD_PROPERTYNZ( PropertyInfo(Variant::VECTOR2,"rect/pos", PROPERTY_HINT_NONE, "",PROPERTY_USAGE_EDITOR), _SCS("set_pos"),_SCS("get_pos") ); - ADD_PROPERTYNZ( PropertyInfo(Variant::VECTOR2,"rect/size", PROPERTY_HINT_NONE, "",PROPERTY_USAGE_EDITOR), _SCS("set_size"),_SCS("get_size") ); - ADD_PROPERTYNZ( PropertyInfo(Variant::VECTOR2,"rect/min_size"), _SCS("set_custom_minimum_size"),_SCS("get_custom_minimum_size") ); - ADD_PROPERTYNZ( PropertyInfo(Variant::REAL,"rect/rotation",PROPERTY_HINT_RANGE,"-1080,1080,0.01"), _SCS("set_rotation_deg"),_SCS("get_rotation_deg") ); - ADD_PROPERTYNO( PropertyInfo(Variant::VECTOR2,"rect/scale"), _SCS("set_scale"),_SCS("get_scale") ); - ADD_PROPERTYNZ( PropertyInfo(Variant::STRING,"hint/tooltip", PROPERTY_HINT_MULTILINE_TEXT), _SCS("set_tooltip"),_SCS("_get_tooltip") ); - ADD_PROPERTYINZ( PropertyInfo(Variant::NODE_PATH,"focus_neighbour/left" ), _SCS("set_focus_neighbour"),_SCS("get_focus_neighbour"),MARGIN_LEFT ); - ADD_PROPERTYINZ( PropertyInfo(Variant::NODE_PATH,"focus_neighbour/top" ), _SCS("set_focus_neighbour"),_SCS("get_focus_neighbour"),MARGIN_TOP ); - ADD_PROPERTYINZ( PropertyInfo(Variant::NODE_PATH,"focus_neighbour/right" ), _SCS("set_focus_neighbour"),_SCS("get_focus_neighbour"),MARGIN_RIGHT ); - ADD_PROPERTYINZ( PropertyInfo(Variant::NODE_PATH,"focus_neighbour/bottom" ), _SCS("set_focus_neighbour"),_SCS("get_focus_neighbour"),MARGIN_BOTTOM ); - ADD_PROPERTY( PropertyInfo(Variant::BOOL,"focus/ignore_mouse"), _SCS("set_ignore_mouse"),_SCS("is_ignoring_mouse") ); - ADD_PROPERTY( PropertyInfo(Variant::BOOL,"focus/stop_mouse"), _SCS("set_stop_mouse"),_SCS("is_stopping_mouse") ); + ADD_GROUP("Rect","rect_"); + ADD_PROPERTYNZ( PropertyInfo(Variant::VECTOR2,"rect_pos", PROPERTY_HINT_NONE, "",PROPERTY_USAGE_EDITOR), _SCS("set_pos"),_SCS("get_pos") ); + ADD_PROPERTYNZ( PropertyInfo(Variant::VECTOR2,"rect_size", PROPERTY_HINT_NONE, "",PROPERTY_USAGE_EDITOR), _SCS("set_size"),_SCS("get_size") ); + ADD_PROPERTYNZ( PropertyInfo(Variant::VECTOR2,"rect_min_size"), _SCS("set_custom_minimum_size"),_SCS("get_custom_minimum_size") ); + ADD_PROPERTYNZ( PropertyInfo(Variant::REAL,"rect_rotation",PROPERTY_HINT_RANGE,"-1080,1080,0.01"), _SCS("set_rotation_deg"),_SCS("get_rotation_deg") ); + ADD_PROPERTYNO( PropertyInfo(Variant::VECTOR2,"rect_scale"), _SCS("set_scale"),_SCS("get_scale") ); - ADD_PROPERTY( PropertyInfo(Variant::INT,"size_flags/horizontal", PROPERTY_HINT_FLAGS, "Expand,Fill"), _SCS("set_h_size_flags"),_SCS("get_h_size_flags") ); - ADD_PROPERTY( PropertyInfo(Variant::INT,"size_flags/vertical", PROPERTY_HINT_FLAGS, "Expand,Fill"), _SCS("set_v_size_flags"),_SCS("get_v_size_flags") ); - ADD_PROPERTYNO( PropertyInfo(Variant::INT,"size_flags/stretch_ratio", PROPERTY_HINT_RANGE, "1,128,0.01"), _SCS("set_stretch_ratio"),_SCS("get_stretch_ratio") ); - ADD_PROPERTYNZ( PropertyInfo(Variant::OBJECT,"theme/theme", PROPERTY_HINT_RESOURCE_TYPE, "Theme"), _SCS("set_theme"),_SCS("get_theme") ); + ADD_GROUP("Hint","hint_"); + ADD_PROPERTYNZ( PropertyInfo(Variant::STRING,"hint_tooltip", PROPERTY_HINT_MULTILINE_TEXT), _SCS("set_tooltip"),_SCS("_get_tooltip") ); + + ADD_GROUP("Focus","focus_"); + ADD_PROPERTY( PropertyInfo(Variant::BOOL,"focus_ignore_mouse"), _SCS("set_ignore_mouse"),_SCS("is_ignoring_mouse") ); + ADD_PROPERTY( PropertyInfo(Variant::BOOL,"focus_stop_mouse"), _SCS("set_stop_mouse"),_SCS("is_stopping_mouse") ); + ADD_PROPERTYINZ( PropertyInfo(Variant::NODE_PATH,"focus_neighbour_left" ), _SCS("set_focus_neighbour"),_SCS("get_focus_neighbour"),MARGIN_LEFT ); + ADD_PROPERTYINZ( PropertyInfo(Variant::NODE_PATH,"focus_neighbour_top" ), _SCS("set_focus_neighbour"),_SCS("get_focus_neighbour"),MARGIN_TOP ); + ADD_PROPERTYINZ( PropertyInfo(Variant::NODE_PATH,"focus_neighbour_right" ), _SCS("set_focus_neighbour"),_SCS("get_focus_neighbour"),MARGIN_RIGHT ); + ADD_PROPERTYINZ( PropertyInfo(Variant::NODE_PATH,"focus_neighbour_bottom" ), _SCS("set_focus_neighbour"),_SCS("get_focus_neighbour"),MARGIN_BOTTOM ); + + ADD_GROUP("Size Flags","size_flags_"); + ADD_PROPERTY( PropertyInfo(Variant::INT,"size_flags_horizontal", PROPERTY_HINT_FLAGS, "Expand,Fill"), _SCS("set_h_size_flags"),_SCS("get_h_size_flags") ); + ADD_PROPERTY( PropertyInfo(Variant::INT,"size_flags_vertical", PROPERTY_HINT_FLAGS, "Expand,Fill"), _SCS("set_v_size_flags"),_SCS("get_v_size_flags") ); + ADD_PROPERTYNO( PropertyInfo(Variant::INT,"size_flags_stretch_ratio", PROPERTY_HINT_RANGE, "1,128,0.01"), _SCS("set_stretch_ratio"),_SCS("get_stretch_ratio") ); + ADD_GROUP("Theme",""); + ADD_PROPERTYNZ( PropertyInfo(Variant::OBJECT,"theme", PROPERTY_HINT_RESOURCE_TYPE, "Theme"), _SCS("set_theme"),_SCS("get_theme") ); + ADD_GROUP("",""); BIND_CONSTANT( ANCHOR_BEGIN ); BIND_CONSTANT( ANCHOR_END ); diff --git a/scene/main/node.cpp b/scene/main/node.cpp index c065c62ab4bc..5ea83a3b6e54 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -2970,7 +2970,8 @@ void Node::_bind_methods() { // ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "process/fixed_process" ), _SCS("set_fixed_process"),_SCS("is_fixed_processing") ); //ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "process/input" ), _SCS("set_process_input"),_SCS("is_processing_input" ) ); //ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "process/unhandled_input" ), _SCS("set_process_unhandled_input"),_SCS("is_processing_unhandled_input" ) ); - ADD_PROPERTYNZ( PropertyInfo( Variant::INT, "process/pause_mode",PROPERTY_HINT_ENUM,"Inherit,Stop,Process" ), _SCS("set_pause_mode"),_SCS("get_pause_mode" ) ); + ADD_GROUP("Pause","pause_"); + ADD_PROPERTYNZ( PropertyInfo( Variant::INT, "pause_mode",PROPERTY_HINT_ENUM,"Inherit,Stop,Process" ), _SCS("set_pause_mode"),_SCS("get_pause_mode" ) ); ADD_PROPERTYNZ( PropertyInfo( Variant::BOOL, "editor/display_folded",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR ), _SCS("set_display_folded"),_SCS("is_displayed_folded" ) ); BIND_VMETHOD( MethodInfo("_process",PropertyInfo(Variant::REAL,"delta")) ); diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 063c2ec56c1d..ebdf84271baa 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -133,7 +133,7 @@ #include "scene/resources/surface_tool.h" #include "scene/resources/mesh_data_tool.h" -#include "scene/resources/scene_preloader.h" + #include "scene/resources/dynamic_font.h" #include "scene/resources/dynamic_font_stb.h" diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp index 8bbc6ff32bc8..af38bdd82bc8 100644 --- a/scene/resources/scene_format_text.cpp +++ b/scene/resources/scene_format_text.cpp @@ -1115,7 +1115,7 @@ void ResourceFormatSaverTextInstance::_find_resources(const Variant& p_variant,b PropertyInfo pi=I->get(); - if (pi.usage&PROPERTY_USAGE_STORAGE || (bundle_resources && pi.usage&PROPERTY_USAGE_BUNDLE)) { + if (pi.usage&PROPERTY_USAGE_STORAGE) { Variant v=res->get(I->get().name); _find_resources(v); @@ -1306,7 +1306,7 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path,const RES& p_re if (skip_editor && PE->get().name.begins_with("__editor")) continue; - if (PE->get().usage&PROPERTY_USAGE_STORAGE || (bundle_resources && PE->get().usage&PROPERTY_USAGE_BUNDLE)) { + if (PE->get().usage&PROPERTY_USAGE_STORAGE) { String name = PE->get().name; Variant value = res->get(name); diff --git a/scene/resources/scene_preloader.cpp b/scene/resources/scene_preloader.cpp deleted file mode 100644 index 575c18800925..000000000000 --- a/scene/resources/scene_preloader.cpp +++ /dev/null @@ -1,454 +0,0 @@ -/*************************************************************************/ -/* scene_preloader.cpp */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* http://www.godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ -#include "scene_preloader.h" -#include "globals.h" - -bool ScenePreloader::can_instance() const { - - return nodes.size()>0; -} - -Node *ScenePreloader::instance() const { - - int nc = nodes.size(); - ERR_FAIL_COND_V(nc==0,NULL); - - const StringName*snames=NULL; - int sname_count=names.size(); - if (sname_count) - snames=&names[0]; - - const Variant*props=NULL; - int prop_count=variants.size(); - if (prop_count) - props=&variants[0]; - - Vector properties; - - const NodeData *nd = &nodes[0]; - - Node **ret_nodes=(Node**)alloca( sizeof(Node*)*nc ); - - for(int i=0;icast_to(); - ERR_FAIL_COND_V(!node,NULL); - - int nprop_count=n.properties.size(); - if (nprop_count) { - - const NodeData::Property* nprops=&n.properties[0]; - - for(int j=0;jset(snames[ nprops[j].name ],props[ nprops[j].value ],&valid); - } - - - } - - node->set_name( snames[ n.name ] ); - ret_nodes[i]=node; - if (i>0) { - ERR_FAIL_INDEX_V(n.parent,i,NULL); - ERR_FAIL_COND_V(!ret_nodes[n.parent],NULL); - ret_nodes[n.parent]->add_child(node); - } - } - - - //do connections - - int cc = connections.size(); - const ConnectionData *cdata = connections.ptr(); - - for(int i=0;i binds; - if (c.binds.size()) { - binds.resize(c.binds.size()); - for(int j=0;jconnect( snames[ c.signal], ret_nodes[ c.to ], snames[ c.method], binds,CONNECT_PERSIST ); - } - - return ret_nodes[0]; - -} - - -static int _nm_get_string(const String& p_string, Map &name_map) { - - if (name_map.has(p_string)) - return name_map[p_string]; - - int idx = name_map.size(); - name_map[p_string]=idx; - return idx; -} - -static int _vm_get_variant(const Variant& p_variant, HashMap &variant_map) { - - if (variant_map.has(p_variant)) - return variant_map[p_variant]; - - int idx = variant_map.size(); - variant_map[p_variant]=idx; - return idx; -} - -void ScenePreloader::_parse_node(Node *p_owner,Node *p_node,int p_parent_idx, Map &name_map,HashMap &variant_map,Map &node_map) { - - if (p_node!=p_owner && !p_node->get_owner()) - return; - - NodeData nd; - nd.name=_nm_get_string(p_node->get_name(),name_map); - nd.type=_nm_get_string(p_node->get_class(),name_map); - nd.parent=p_parent_idx; - - List plist; - p_node->get_property_list(&plist); - for (List::Element *E=plist.front();E;E=E->next()) { - - if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) - continue; - - NodeData::Property prop; - prop.name=_nm_get_string(E->get().name,name_map); - prop.value=_vm_get_variant( p_node->get( E->get().name ), variant_map); - nd.properties.push_back(prop); - } - - int idx = nodes.size(); - node_map[p_node]=idx; - nodes.push_back(nd); - - for(int i=0;iget_child_count();i++) { - - Node *c=p_node->get_child(i); - _parse_node(p_owner,c,idx,name_map,variant_map,node_map); - } - - - -} - -void ScenePreloader::_parse_connections(Node *p_node, Map &name_map,HashMap &variant_map,Map &node_map,bool p_instance) { - - - List signals; - p_node->get_signal_list(&signals); - - for(List::Element *E=signals.front();E;E=E->next()) { - - List conns; - p_node->get_signal_connection_list(E->get().name,&conns); - for(List::Element *F=conns.front();F;F=F->next()) { - - const Node::Connection &c = F->get(); - if (!(c.flags&CONNECT_PERSIST)) - continue; - Node *n=c.target->cast_to(); - if (!n) - continue; - - if (!node_map.has(n)) - continue; - - ConnectionData cd; - cd.from=node_map[p_node]; - cd.to=node_map[n]; - cd.method=_nm_get_string(c.method,name_map); - cd.signal=_nm_get_string(c.signal,name_map); - for(int i=0;ilocalize_path(p_path); - clear(); - - Node *scene = SceneLoader::load(p); - - ERR_FAIL_COND_V(!scene,ERR_CANT_OPEN); - - path=p; - - Map name_map; - HashMap variant_map; - Map node_map; - - _parse_node(scene,scene,-1,name_map,variant_map,node_map); - - - names.resize(name_map.size()); - - for(Map::Element *E=name_map.front();E;E=E->next()) { - - names[E->get()]=E->key(); - } - - variants.resize(variant_map.size()); - const Variant *K=NULL; - while((K=variant_map.next(K))) { - - int idx = variant_map[*K]; - variants[idx]=*K; - } - - - memdelete(scene); // <- me falto esto :( - return OK; -#endif -} - -String ScenePreloader::get_scene_path() const { - - return path; -} - -void ScenePreloader::clear() { - - names.clear(); - variants.clear(); - nodes.clear(); - connections.clear(); - -} - -void ScenePreloader::_set_bundled_scene(const Dictionary& d) { - - - ERR_FAIL_COND( !d.has("names")); - ERR_FAIL_COND( !d.has("variants")); - ERR_FAIL_COND( !d.has("node_count")); - ERR_FAIL_COND( !d.has("nodes")); - ERR_FAIL_COND( !d.has("conn_count")); - ERR_FAIL_COND( !d.has("conns")); - ERR_FAIL_COND( !d.has("path")); - - DVector snames = d["names"]; - if (snames.size()) { - - int namecount = snames.size(); - names.resize(namecount); - DVector::Read r =snames.read(); - for(int i=0;i snodes = d["nodes"]; - DVector::Read r = snodes.read(); - int idx=0; - for(int i=0;i sconns = d["conns"]; - DVector::Read r = sconns.read(); - int idx=0; - for(int i=0;i rnames; - rnames.resize(names.size()); - - if (names.size()) { - - DVector::Write r=rnames.write(); - - for(int i=0;i rnodes; - d["node_count"]=nodes.size(); - - for(int i=0;i rconns; - d["conn_count"]=connections.size(); - - for(int i=0;i extensions; - SceneLoader::get_recognized_extensions(&extensions); - String exthint; - for (List::Element*E=extensions.front();E;E=E->next()) { - - if (exthint!="") - exthint+=","; - exthint+="*."+E->get(); - } - - exthint+="; Scenes"; - - ADD_PROPERTY( PropertyInfo(Variant::STRING,"scene",PROPERTY_HINT_FILE,exthint),_SCS("load_scene"),_SCS("get_scene_path")); -#endif -} - -ScenePreloader::ScenePreloader() { - - -} diff --git a/scene/resources/scene_preloader.h b/scene/resources/scene_preloader.h deleted file mode 100644 index 315d6be6b1f5..000000000000 --- a/scene/resources/scene_preloader.h +++ /dev/null @@ -1,101 +0,0 @@ -/*************************************************************************/ -/* scene_preloader.h */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* http://www.godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/*************************************************************************/ -#ifndef SCENE_PRELOADER_H -#define SCENE_PRELOADER_H - -#include "resource.h" -#include "scene/main/node.h" - -class ScenePreloader : public Resource { - - GDCLASS( ScenePreloader, Resource ); - - Vector names; - Vector variants; - - //missing - instances - //missing groups - //missing - owner - //missing - override names and values - - struct NodeData { - - int parent; - int type; - int name; - - struct Property { - - int name; - int value; - }; - - Vector properties; - }; - - - Vector nodes; - - struct ConnectionData { - - int from; - int to; - int signal; - int method; - Vector binds; - }; - - Vector connections; - - void _parse_node(Node *p_owner,Node *p_node,int p_parent_idx, Map &name_map,HashMap &variant_map,Map &node_map); - void _parse_connections(Node *p_node, Map &name_map,HashMap &variant_map,Map &node_map,bool p_instance); - - String path; - - void _set_bundled_scene(const Dictionary& p_scene); - Dictionary _get_bundled_scene() const; - -protected: - - - static void _bind_methods(); -public: - - - Error load_scene(const String& p_path); - String get_scene_path() const; - void clear(); - - bool can_instance() const; - Node *instance() const; - - ScenePreloader(); -}; - -#endif // SCENE_PRELOADER_H diff --git a/tools/editor/plugins/resource_preloader_editor_plugin.cpp b/tools/editor/plugins/resource_preloader_editor_plugin.cpp index 4ccd2462dd8c..f664fccbc8ab 100644 --- a/tools/editor/plugins/resource_preloader_editor_plugin.cpp +++ b/tools/editor/plugins/resource_preloader_editor_plugin.cpp @@ -30,7 +30,7 @@ #include "io/resource_loader.h" #include "globals.h" #include "tools/editor/editor_settings.h" -#include "scene/resources/scene_preloader.h" + diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index d38210616e4b..f76fdd3d1d99 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -2998,6 +2998,8 @@ void PropertyEditor::update_tree() { TreeItem * current_category=NULL; String filter = search_box ? search_box->get_text() : ""; + String group; + String group_base; for (List::Element *I=plist.front() ; I ; I=I->next()) { @@ -3005,7 +3007,17 @@ void PropertyEditor::update_tree() { //make sure the property can be edited - if (p.usage&PROPERTY_USAGE_CATEGORY) { + if (p.usage&PROPERTY_USAGE_GROUP) { + + group=p.name; + group_base=p.hint_string; + + continue; + + } else if (p.usage&PROPERTY_USAGE_CATEGORY) { + + group=""; + group_base=""; if (!show_categories) continue; @@ -3062,12 +3074,27 @@ void PropertyEditor::update_tree() { } else if ( ! (p.usage&PROPERTY_USAGE_EDITOR ) ) continue; - String name = (p.name.find("/")!=-1)?p.name.right( p.name.find_last("/")+1 ):p.name; + String basename=p.name; + if (group!="") { + if (group_base!="") { + if (basename.begins_with(group_base)) { + basename=basename.replace_first(group_base,""); + } else { + group=""; //no longer using group base, clear + } + } + } + + if (group!="") { + basename=group+"/"+basename; + } + + String name = (basename.find("/")!=-1)?basename.right( basename.find_last("/")+1 ):basename; if (capitalize_paths) name = name.camelcase_to_underscore().capitalize(); - String path=p.name.left( p.name.find_last("/") ) ; + String path=basename.left( basename.find_last("/") ) ; if (use_filter && filter!="") { @@ -3080,7 +3107,7 @@ void PropertyEditor::update_tree() { continue; } - //printf("property %s\n",p.name.ascii().get_data()); + //printf("property %s\n",basename.ascii().get_data()); TreeItem * parent = get_parent_node(path,item_path,current_category?current_category:root ); //if (parent->get_parent()==root) // parent=root;