Merge branch 'master' of github.com:okamstudio/godot

1 files changed, 74 insertions, 74 deletions

diff --git a/scene/resources/scene_preloader.h b/scene/resources/scene_preloader.h
index 0e1a54e298..d60d08afd4 100644
--- a/scene/resources/scene_preloader.h
+++ b/scene/resources/scene_preloader.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2015 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       */
@@ -26,76 +26,76 @@
 /* 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 {

-

-	OBJ_TYPE( ScenePreloader, Resource );

-

-	Vector<StringName> names;

-	Vector<Variant> 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<Property> properties;

-	};

-

-

-	Vector<NodeData> nodes;

-

-	struct ConnectionData {

-

-		int from;

-		int to;

-		int signal;

-		int method;

-		Vector<int> binds;

-	};

-

-	Vector<ConnectionData> connections;

-

-	void _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);

-	void _parse_connections(Node *p_node, Map<StringName,int> &name_map,HashMap<Variant,int,VariantHasher> &variant_map,Map<Node*,int> &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

+#ifndef SCENE_PRELOADER_H
+#define SCENE_PRELOADER_H
+
+#include "resource.h"
+#include "scene/main/node.h"
+
+class ScenePreloader : public Resource {
+
+	OBJ_TYPE( ScenePreloader, Resource );
+
+	Vector<StringName> names;
+	Vector<Variant> 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<Property> properties;
+	};
+
+
+	Vector<NodeData> nodes;
+
+	struct ConnectionData {
+
+		int from;
+		int to;
+		int signal;
+		int method;
+		Vector<int> binds;
+	};
+
+	Vector<ConnectionData> connections;
+
+	void _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);
+	void _parse_connections(Node *p_node, Map<StringName,int> &name_map,HashMap<Variant,int,VariantHasher> &variant_map,Map<Node*,int> &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