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

Fixed properly not save signals that already exist in their base scenes, closes #5656

Browse Source
This commit is contained in:
Juan Linietsky 2016-07-19 21:26:12 -03:00
parent 9de33e18f1
commit 0988970c1f
6 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/path_db.cpp
View File

@ -53,6 +53,12 @@ uint32_t NodePath::hash() const {
}
void NodePath::prepend_period() {
if (data->path.size() && data->path[0].operator String()!=".") {
data->path.insert(0,".");
}
}
bool NodePath::is_absolute() const {

2
core/path_db.h
View File

@ -72,6 +72,8 @@ public:
NodePath rel_path_to(const NodePath& p_np) const;
void prepend_period();
StringName get_property() const;
NodePath get_parent() const;

2
platform/android/export/export.cpp
View File

@ -1573,7 +1573,7 @@ void EditorExportPlatformAndroid::_device_poll_thread(void *ud) {
String dp;
Error err = OS::get_singleton()->execute(adb,args,true,NULL,&dp,&ec);
print_line("RV: "+itos(ec));
Vector<String> props = dp.split("\n");
String vendor;
String device;

51
scene/resources/packed_scene.cpp
View File

@ -756,8 +756,6 @@ Error SceneState::_parse_connections(Node *p_owner,Node *p_node, Map<StringName,
print_line("AT : "+String(p_owner->get_path_to(target)));
print_line("CP : "+String(p_owner->get_path_to(common_parent)));
Ref<SceneState> ps;
if (common_parent==p_owner)
@ -768,29 +766,12 @@ Error SceneState::_parse_connections(Node *p_owner,Node *p_node, Map<StringName,
if (ps.is_valid()) {
print_line("PS VALID");
NodePath signal_from = common_parent->get_path_to(p_node);
NodePath signal_to = common_parent->get_path_to(target);
int path_from = ps->find_node_by_path(signal_from);
int path_to = ps->find_node_by_path(signal_to);
int signal_name = ps->find_name(c.signal);
int method_name = ps->find_name(c.method);
print_line("path_from "+itos(path_from));
print_line("path_to "+itos(path_to));
print_line("signal_name "+itos(signal_name));
print_line("method_name "+itos(method_name));
if (path_from>=0 && path_to>=0 && signal_name>=0 && method_name>=0) {
//if valid
print_line("EXISTS");
if (ps->has_connection(path_from,signal_name,path_to,method_name)) {
print_line("YES");
exists=true;
break;
}
if (ps->has_connection(signal_from,c.signal,signal_to,c.method)) {
exists=true;
break;
}
}
@ -1555,17 +1536,31 @@ Array SceneState::get_connection_binds(int p_idx) const {
return binds;
}
bool SceneState::has_connection(int p_node_from, int p_signal, int p_node_to, int p_method) const {
bool SceneState::has_connection(const NodePath& p_node_from, const StringName& p_signal, const NodePath& p_node_to, const StringName& p_method) const {
for(int i=0;i<connections.size();i++) {
const ConnectionData &c = connections[i];
print_line("from: "+itos(c.from)+" vs "+itos(p_node_from));
print_line("to: "+itos(c.to)+" vs "+itos(p_node_to));
print_line("signal: "+itos(c.signal)+" vs "+itos(p_signal));
print_line("method: "+itos(c.method)+" vs "+itos(p_method));
NodePath np_from;
if (c.from==p_node_from && c.signal==p_signal && c.to==p_node_to && c.method==p_method) {
if (c.from&FLAG_ID_IS_PATH) {
np_from=node_paths[c.from&FLAG_MASK];
} else {
np_from=get_node_path(c.from);
}
NodePath np_to;
if (c.to&FLAG_ID_IS_PATH) {
np_to=node_paths[c.to&FLAG_MASK];
} else {
np_to=get_node_path(c.to);
}
StringName sn_signal=names[c.signal];
StringName sn_method=names[c.method];
if (np_from==p_node_from && sn_signal==p_signal && np_to==p_node_to && sn_method==p_method) {
return true;
}
}

2
scene/resources/packed_scene.h
View File

@ -163,7 +163,7 @@ public:
int get_connection_flags(int p_idx) const;
Array get_connection_binds(int p_idx) const;
bool has_connection(int p_node_from, int p_signal, int p_node_to, int p_method) const;
bool has_connection(const NodePath &p_node_from, const StringName& p_signal, const NodePath &p_node_to, const StringName& p_method) const;
Vector<NodePath> get_editable_instances() const;

4
scene/resources/scene_format_text.cpp
View File

@ -404,7 +404,9 @@ Error ResourceInteractiveLoaderText::poll() {
}
if (next_tag.fields.has("parent")) {
parent=packed_scene->get_state()->add_node_path(next_tag.fields["parent"]);
NodePath np = next_tag.fields["parent"];
np.prepend_period(); //compatible to how it manages paths internally
parent=packed_scene->get_state()->add_node_path(np);
}