asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Keep property values when extending script

Browse source
This commit is contained in:
Tomasz Chabora 2020-10-25 22:32:32 +01:00 committed by kobewi
parent 8b454f8b41
commit 44cf3c22ac
4 changed files with 71 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editor/editor_properties.cpp
View file

@ -3603,7 +3603,10 @@ void EditorPropertyResource::_resource_selected(const Ref<Resource> &p_resource,
void EditorPropertyResource::_resource_changed(const Ref<Resource> &p_resource) { void EditorPropertyResource::_resource_changed(const Ref<Resource> &p_resource) {
// Make visual script the correct type. // Make visual script the correct type.
Ref<Script> s = p_resource; Ref<Script> s = p_resource;
bool is_script = false;
if (get_edited_object() && s.is_valid()) { if (get_edited_object() && s.is_valid()) {
is_script = true;
InspectorDock::get_singleton()->store_script_properties(get_edited_object());
s->call("set_instance_base_type", get_edited_object()->get_class()); s->call("set_instance_base_type", get_edited_object()->get_class());
} }
@ -3629,6 +3632,11 @@ void EditorPropertyResource::_resource_changed(const Ref<Resource> &p_resource)
emit_changed(get_edited_property(), p_resource); emit_changed(get_edited_property(), p_resource);
update_property(); update_property();
if (is_script) {
// Restore properties if script was changed.
InspectorDock::get_singleton()->apply_script_properties(get_edited_object());
}
// Automatically suggest setting up the path for a ViewportTexture. // Automatically suggest setting up the path for a ViewportTexture.
if (vpt.is_valid() && vpt->get_viewport_path_in_scene().is_empty()) { if (vpt.is_valid() && vpt->get_viewport_path_in_scene().is_empty()) {
if (!scene_tree) { if (!scene_tree) {

28
editor/inspector_dock.cpp
View file

@ -453,6 +453,9 @@ void InspectorDock::_bind_methods() {
ClassDB::bind_method("edit_resource", &InspectorDock::edit_resource); ClassDB::bind_method("edit_resource", &InspectorDock::edit_resource);
ClassDB::bind_method("store_script_properties", &InspectorDock::store_script_properties);
ClassDB::bind_method("apply_script_properties", &InspectorDock::apply_script_properties);
ADD_SIGNAL(MethodInfo("request_help")); ADD_SIGNAL(MethodInfo("request_help"));
} }
@ -565,6 +568,31 @@ EditorPropertyNameProcessor::Style InspectorDock::get_property_name_style() cons
return property_name_style; return property_name_style;
} }
void InspectorDock::store_script_properties(Object *p_object) {
ERR_FAIL_NULL(p_object);
ScriptInstance *si = p_object->get_script_instance();
if (!si) {
return;
}
si->get_property_state(stored_properties);
}
void InspectorDock::apply_script_properties(Object *p_object) {
ERR_FAIL_NULL(p_object);
ScriptInstance *si = p_object->get_script_instance();
if (!si) {
return;
}
for (const Pair<StringName, Variant> &E : stored_properties) {
Variant current;
if (si->get(E.first, current) && current.get_type() == E.second.get_type()) {
si->set(E.first, E.second);
}
}
stored_properties.clear();
}
InspectorDock::InspectorDock(EditorData &p_editor_data) { InspectorDock::InspectorDock(EditorData &p_editor_data) {
singleton = this; singleton = this;
set_name("Inspector"); set_name("Inspector");

4
editor/inspector_dock.h
View file

@ -100,6 +100,7 @@ class InspectorDock : public VBoxContainer {
Tree *unique_resources_list_tree = nullptr; Tree *unique_resources_list_tree = nullptr;
EditorPropertyNameProcessor::Style property_name_style; EditorPropertyNameProcessor::Style property_name_style;
List<Pair<StringName, Variant>> stored_properties;
void _prepare_menu(); void _prepare_menu();
void _menu_option(int p_option); void _menu_option(int p_option);
@ -149,6 +150,9 @@ public:
EditorPropertyNameProcessor::Style get_property_name_style() const; EditorPropertyNameProcessor::Style get_property_name_style() const;
void store_script_properties(Object *p_object);
void apply_script_properties(Object *p_object);
InspectorDock(EditorData &p_editor_data); InspectorDock(EditorData &p_editor_data);
~InspectorDock(); ~InspectorDock();
}; };

40
editor/scene_tree_dock.cpp
View file

@ -1952,17 +1952,36 @@ void SceneTreeDock::_script_created(Ref<Script> p_script) {
return; return;
} }
editor_data->get_undo_redo().create_action(TTR("Attach Script")); if (selected.size() == 1) {
for (Node *E : selected) { Node *node = selected.front()->get();
Ref<Script> existing = E->get_script(); Ref<Script> existing = node->get_script();
editor_data->get_undo_redo().add_do_method(E, "set_script", p_script);
editor_data->get_undo_redo().add_undo_method(E, "set_script", existing); editor_data->get_undo_redo().create_action(TTR("Attach Script"));
editor_data->get_undo_redo().add_do_method(InspectorDock::get_singleton(), "store_script_properties", node);
editor_data->get_undo_redo().add_undo_method(InspectorDock::get_singleton(), "store_script_properties", node);
editor_data->get_undo_redo().add_do_method(node, "set_script", p_script);
editor_data->get_undo_redo().add_undo_method(node, "set_script", existing);
editor_data->get_undo_redo().add_do_method(InspectorDock::get_singleton(), "apply_script_properties", node);
editor_data->get_undo_redo().add_undo_method(InspectorDock::get_singleton(), "apply_script_properties", node);
editor_data->get_undo_redo().add_do_method(this, "_update_script_button"); editor_data->get_undo_redo().add_do_method(this, "_update_script_button");
editor_data->get_undo_redo().add_undo_method(this, "_update_script_button"); editor_data->get_undo_redo().add_undo_method(this, "_update_script_button");
editor_data->get_undo_redo().commit_action();
} else {
editor_data->get_undo_redo().create_action(TTR("Attach Script"));
for (List<Node *>::Element *E = selected.front(); E; E = E->next()) {
Ref<Script> existing = E->get()->get_script();
editor_data->get_undo_redo().add_do_method(InspectorDock::get_singleton(), "store_script_properties", E->get());
editor_data->get_undo_redo().add_undo_method(InspectorDock::get_singleton(), "store_script_properties", E->get());
editor_data->get_undo_redo().add_do_method(E->get(), "set_script", p_script);
editor_data->get_undo_redo().add_undo_method(E->get(), "set_script", existing);
editor_data->get_undo_redo().add_do_method(InspectorDock::get_singleton(), "apply_script_properties", E->get());
editor_data->get_undo_redo().add_undo_method(InspectorDock::get_singleton(), "apply_script_properties", E->get());
editor_data->get_undo_redo().add_do_method(this, "_update_script_button");
editor_data->get_undo_redo().add_undo_method(this, "_update_script_button");
}
editor_data->get_undo_redo().commit_action();
} }
editor_data->get_undo_redo().commit_action();
_push_item(p_script.operator->()); _push_item(p_script.operator->());
_update_script_button(); _update_script_button();
} }
@ -2586,11 +2605,14 @@ void SceneTreeDock::_files_dropped(Vector<String> p_files, NodePath p_to, int p_
void SceneTreeDock::_script_dropped(String p_file, NodePath p_to) { void SceneTreeDock::_script_dropped(String p_file, NodePath p_to) {
Ref<Script> scr = ResourceLoader::load(p_file); Ref<Script> scr = ResourceLoader::load(p_file);
ERR_FAIL_COND(!scr.is_valid()); ERR_FAIL_COND(!scr.is_valid());
Node *n = get_node(p_to); if (Node *n = get_node(p_to)) {
if (n) {
editor_data->get_undo_redo().create_action(TTR("Attach Script")); editor_data->get_undo_redo().create_action(TTR("Attach Script"));
editor_data->get_undo_redo().add_do_method(InspectorDock::get_singleton(), "store_script_properties", n);
editor_data->get_undo_redo().add_undo_method(InspectorDock::get_singleton(), "store_script_properties", n);
editor_data->get_undo_redo().add_do_method(n, "set_script", scr); editor_data->get_undo_redo().add_do_method(n, "set_script", scr);
editor_data->get_undo_redo().add_undo_method(n, "set_script", n->get_script()); editor_data->get_undo_redo().add_undo_method(n, "set_script", n->get_script());
editor_data->get_undo_redo().add_do_method(InspectorDock::get_singleton(), "apply_script_properties", n);
editor_data->get_undo_redo().add_undo_method(InspectorDock::get_singleton(), "apply_script_properties", n);
editor_data->get_undo_redo().add_do_method(this, "_update_script_button"); editor_data->get_undo_redo().add_do_method(this, "_update_script_button");
editor_data->get_undo_redo().add_undo_method(this, "_update_script_button"); editor_data->get_undo_redo().add_undo_method(this, "_update_script_button");
editor_data->get_undo_redo().commit_action(); editor_data->get_undo_redo().commit_action();