Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-19 08:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

-Ability to roll-back script-exported properties to their default value on the script, closes #2128

Browse Source
This commit is contained in:
Juan Linietsky 2016-01-02 20:17:31 -03:00
parent 61745855d0
commit 1597082c85
7 changed files with 160 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/script_language.h
View File

@ -98,6 +98,7 @@ public:
virtual bool has_script_signal(const StringName& p_signal) const=0;
virtual void get_script_signal_list(List<MethodInfo> *r_signals) const=0;
virtual bool get_property_default_value(const StringName& p_property,Variant& r_value) const=0;
virtual void update_exports() {} //editor tool

11
core/variant.cpp
View File

@ -706,6 +706,17 @@ bool Variant::operator==(const Variant& p_variant) const {
}
bool Variant::operator!=(const Variant& p_variant) const {
if (type!=p_variant.type) //evaluation of operator== needs to be more strict
return true;
bool v;
Variant r;
evaluate(OP_NOT_EQUAL,*this,p_variant,r,v);
return r;
}
bool Variant::operator<(const Variant& p_variant) const {
if (type!=p_variant.type) //if types differ, then order by type first
return type<p_variant.type;

1
core/variant.h
View File

@ -411,6 +411,7 @@ public:
//argsVariant call()
bool operator==(const Variant& p_variant) const;
bool operator!=(const Variant& p_variant) const;
bool operator<(const Variant& p_variant) const;
uint32_t hash() const;

22
modules/gdscript/gd_script.cpp
View File

@ -1592,6 +1592,28 @@ void GDScript::_update_placeholder(PlaceHolderScriptInstance *p_placeholder) {
}*/
#endif
bool GDScript::get_property_default_value(const StringName& p_property, Variant &r_value) const {
#ifdef TOOLS_ENABLED
//for (const Map<StringName,Variant>::Element *I=member_default_values.front();I;I=I->next()) {
// print_line("\t"+String(String(I->key())+":"+String(I->get())));
//}
const Map<StringName,Variant>::Element *E=member_default_values_cache.find(p_property);
if (E) {
r_value=E->get();
return true;
}
if (base_cache.is_valid()) {
return base_cache->get_property_default_value(p_property,r_value);
}
#endif
return false;
}
ScriptInstance* GDScript::instance_create(Object *p_this) {

2
modules/gdscript/gd_script.h
View File

@ -352,6 +352,8 @@ public:
Vector<uint8_t> get_as_byte_code() const;
bool get_property_default_value(const StringName& p_property,Variant& r_value) const;
virtual ScriptLanguage *get_language() const;
GDScript();

170
tools/editor/property_editor.cpp
View File

@ -2113,6 +2113,65 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p
}
void PropertyEditor::_check_reload_status(const String&p_name, TreeItem* item) {
bool has_reload=false;
int found=-1;
for(int i=0;i<item->get_button_count(1);i++) {
if (item->get_button_id(1,i)==3) {
found=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;
if (_get_instanced_node_original_property(p_name,vorig) || usage) {
Variant v = obj->get(p_name);
bool changed = _is_property_different(v,vorig,usage);
if ((found!=-1)!=changed) {
if (changed) {
has_reload=true;
} else {
}
}
}
}
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 (found!=-1 && !has_reload) {
item->erase_button(1,found);
} else if (found==-1 && has_reload) {
item->add_button(1,get_icon("Reload","EditorIcons"),3);
}
}
void PropertyEditor::_notification(int p_what) {
@ -2154,43 +2213,8 @@ void PropertyEditor::_notification(int p_what) {
if (!item)
continue;
if (_might_be_in_instance()) {
_check_reload_status(*k,item);
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(*k,vorig) || usage) {
Variant v = obj->get(*k);
int found=-1;
for(int i=0;i<item->get_button_count(1);i++) {
if (item->get_button_id(1,i)==3) {
found=i;
break;
}
}
bool changed = _is_property_different(v,vorig,usage);
if ((found!=-1)!=changed) {
if (changed) {
item->add_button(1,get_icon("Reload","EditorIcons"),3);
} else {
item->erase_button(1,found);
}
}
}
}
Dictionary d=item->get_metadata(0);
set_item_text(item,d["type"],d["name"],d["hint"],d["hint_text"]);
}
@ -2257,23 +2281,30 @@ void PropertyEditor::_refresh_item(TreeItem *p_item) {
if (name!=String()) {
_check_reload_status(name,p_item);
#if 0
bool has_reload=false;
int found=-1;
for(int i=0;i<p_item->get_button_count(1);i++) {
if (p_item->get_button_id(1,i)==3) {
found=i;
break;
}
}
if (_might_be_in_instance()) {
Variant vorig;
Dictionary d=p_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(name,vorig) || usage) {
Variant v = obj->get(name);
int found=-1;
for(int i=0;i<p_item->get_button_count(1);i++) {
if (p_item->get_button_id(1,i)==3) {
found=i;
break;
}
}
bool changed = _is_property_different(v,vorig,usage);
@ -2281,10 +2312,11 @@ void PropertyEditor::_refresh_item(TreeItem *p_item) {
if (changed) {
p_item->add_button(1,get_icon("Reload","EditorIcons"),3);
has_reload=true;
} else {
p_item->erase_button(1,found);
//p_item->erase_button(1,found);
}
}
@ -2293,6 +2325,22 @@ void PropertyEditor::_refresh_item(TreeItem *p_item) {
}
if (!has_reload && !obj->get_script().is_null()) {
Ref<Script> scr = obj->get_script();
Variant orig_value;
if (scr->get_property_default_value(name,orig_value)) {
if (orig_value!=obj->get(name)) {
has_reload=true;
}
}
}
if (!has_reload && found!=-1) {
p_item->erase_button(1,found);
} else if (has_reload && found==-1) {
p_item->add_button(1,get_icon("Reload","EditorIcons"),3);
}
#endif
Dictionary d=p_item->get_metadata(0);
set_item_text(p_item,d["type"],d["name"],d["hint"],d["hint_text"]);
}
@ -3033,6 +3081,7 @@ void PropertyEditor::update_tree() {
}
}
bool has_reload=false;
if (_might_be_in_instance()) {
Variant vorig;
@ -3045,11 +3094,26 @@ void PropertyEditor::update_tree() {
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("Reload","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("Reload","EditorIcons"),3);
}
}
} else {
print_line("no default value!");
}
}
}
@ -3340,8 +3404,6 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) {
call_deferred("_set_range_def",ti,prop,ti->get_range(p_column)+1.0);
} else if (p_button==3) {
if (!_might_be_in_instance())
return;
if (!d.has("name"))
return;
@ -3349,11 +3411,21 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) {
Variant vorig;
if (_get_instanced_node_original_property(prop,vorig)) {
if (_might_be_in_instance() && _get_instanced_node_original_property(prop,vorig)) {
_edit_set(prop,vorig);
return;
}
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);
}
}
} else {
Dictionary d = ti->get_metadata(0);

2
tools/editor/property_editor.h
View File

@ -114,6 +114,7 @@ class CustomPropertyEditor : public Popup {
void _action_pressed(int p_which);
void _type_create_selected(int p_idx);
void _color_changed(const Color& p_color);
void _draw_easing();
void _menu_option(int p_which);
@ -192,6 +193,7 @@ class PropertyEditor : public Control {
virtual void _changed_callback(Object *p_changed,const char * p_what);
virtual void _changed_callbacks(Object *p_changed,const String& p_callback);
void _check_reload_status(const String&p_name,TreeItem* item);
void _edit_button(Object *p_item, int p_column, int p_button);