1 files changed, 93 insertions, 19 deletions

diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h
index 0546addd3e..3956d2abe4 100644
--- a/scene/resources/packed_scene.h
+++ b/scene/resources/packed_scene.h
@@ -32,26 +32,27 @@
 #include "resource.h"
 #include "scene/main/node.h"
 
-//changes:
-//1-make the InstanceState a reference inside the resource that can be shared
-//2-make the instance "editable" with a flag, save here and load here, no need for property
-//3-properly save modifications in sub-scene
-//4-add scene inheritance
-//5-chain of instance states in editor? (to check what was modified)
-//6-saving will be hell
 
+class SceneState : public Reference {
 
-class PackedScene : public Resource {
-
-	OBJ_TYPE( PackedScene, Resource );
-	RES_BASE_EXTENSION("scn");
+	OBJ_TYPE( SceneState, Reference );
 	Vector<StringName> names;
 	Vector<Variant> variants;
+	Vector<NodePath> node_paths;
+	Vector<NodePath> editable_instances;
+	mutable HashMap<NodePath,int> node_path_cache;
+	mutable Map<int,int> base_scene_node_remap;
 
-	//missing - instances
-	//missing groups
-	//missing - owner
-	//missing - override names and values
+	int base_scene_idx;
+
+	enum {
+		FLAG_ID_IS_PATH=(1<<30),
+		FLAG_INSTANCE_IS_PLACEHOLDER=(1<<30),
+		FLAG_MASK=(1<<24)-1,
+		NO_PARENT_SAVED=0x7FFFFFFF,
+		TYPE_INSTANCED=0x7FFFFFFF,
+
+	};
 
 	struct NodeData {
 
@@ -68,9 +69,15 @@ class PackedScene : public Resource {
 		};
 
 		Vector<Property> properties;
-		Vector<int> groups;
+		Vector<int> groups;		
+
 	};
 
+	struct PackState {
+		Ref<SceneState> state;
+		int node;
+		PackState() { node=-1; }
+	};
 
 	Vector<NodeData> nodes;
 
@@ -86,16 +93,78 @@ class PackedScene : public Resource {
 
 	Vector<ConnectionData> connections;
 
-	Error _parse_node(Node *p_owner,Node *p_node,int p_parent_idx, Map<StringName,int> &name_map,HashMap<Variant,int,VariantHasher> &variant_map,Map<Node*,int> &node_map);
-	Error _parse_connections(Node *p_owner,Node *p_node, Map<StringName,int> &name_map,HashMap<Variant,int,VariantHasher> &variant_map,Map<Node*,int> &node_map);
 
+	Error _parse_node(Node *p_owner,Node *p_node,int p_parent_idx, Map<StringName,int> &name_map,HashMap<Variant,int,VariantHasher> &variant_map,Map<Node*,int> &node_map,Map<Node*,int> &nodepath_map);
+	Error _parse_connections(Node *p_owner,Node *p_node, Map<StringName,int> &name_map,HashMap<Variant,int,VariantHasher> &variant_map,Map<Node*,int> &node_map,Map<Node*,int> &nodepath_map);
+
+	String path;
+
+	_FORCE_INLINE_ Ref<SceneState> _get_base_scene_state() const;
+
+	static bool disable_placeholders;
+public:
+
+	static void set_disable_placeholders(bool p_disable);
+
+	int find_node_by_path(const NodePath& p_node) const;
+	Variant get_property_value(int p_node,const StringName& p_property,bool &found) const;
+	bool is_node_in_group(int p_node,const StringName& p_group) const;
+	bool is_connection(int p_node,const StringName& p_signal,int p_to_node,const StringName& p_to_method) const;
+
+
+	void set_bundled_scene(const Dictionary& p_dictionary);
+	Dictionary get_bundled_scene() const;
+
+	Error pack(Node *p_scene);
+
+	void set_path(const String &p_path);
+	String get_path() const;
+
+	void clear();
+
+	bool can_instance() const;
+	Node *instance(bool p_gen_edit_state=false) const;
+
+
+	//build-unbuild API
+
+	int get_node_count() const;
+	StringName get_node_type(int p_idx) const;
+	StringName get_node_name(int p_idx) const;
+	NodePath get_node_path(int p_idx,bool p_for_parent=false) const;
+	NodePath get_node_owner_path(int p_idx) const;
+	Ref<PackedScene> get_node_instance(int p_idx) const;
+	Vector<StringName> get_node_groups(int p_idx) const;
+
+	int get_node_property_count(int p_idx) const;
+	StringName get_node_property_name(int p_idx,int p_prop) const;
+	Variant get_node_property_value(int p_idx,int p_prop) const;
+
+	int get_connection_count() const;
+	NodePath get_connection_source(int p_idx) const;
+	StringName get_connection_signal(int p_idx) const;
+	NodePath get_connection_target(int p_idx) const;
+	StringName get_connection_method(int p_idx) const;
+	int get_connection_flags(int p_idx) const;
+	Array get_connection_binds(int p_idx) const;
+
+	Vector<NodePath> get_editable_instances() const;
+
+	SceneState();
+};
+
+class PackedScene : public Resource {
+
+	OBJ_TYPE(PackedScene, Resource );
+	RES_BASE_EXTENSION("scn");
+
+	Ref<SceneState> state;
 
 	void _set_bundled_scene(const Dictionary& p_scene);
 	Dictionary _get_bundled_scene() const;
 
 protected:
 
-
 	static void _bind_methods();
 public:
 
@@ -107,7 +176,12 @@ public:
 	bool can_instance() const;
 	Node *instance(bool p_gen_edit_state=false) const;
 
+	virtual void set_path(const String& p_path,bool p_take_over=false);
+
+	Ref<SceneState> get_state();
+
 	PackedScene();
+
 };
 
 #endif // SCENE_PRELOADER_H