1 files changed, 39 insertions, 8 deletions

diff --git a/core/core_bind.cpp b/core/core_bind.cpp
index efb4b84716..fd5b3bb731 100644
--- a/core/core_bind.cpp
+++ b/core/core_bind.cpp
@@ -1504,7 +1504,7 @@ String Directory::get_current_dir() {
 
 Error Directory::make_dir(String p_dir) {
 	ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory is not configured properly.");
-	if (!p_dir.is_rel_path()) {
+	if (!p_dir.is_relative_path()) {
 		DirAccess *d = DirAccess::create_for_path(p_dir);
 		Error err = d->make_dir(p_dir);
 		memdelete(d);
@@ -1515,7 +1515,7 @@ Error Directory::make_dir(String p_dir) {
 
 Error Directory::make_dir_recursive(String p_dir) {
 	ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory is not configured properly.");
-	if (!p_dir.is_rel_path()) {
+	if (!p_dir.is_relative_path()) {
 		DirAccess *d = DirAccess::create_for_path(p_dir);
 		Error err = d->make_dir_recursive(p_dir);
 		memdelete(d);
@@ -1526,7 +1526,7 @@ Error Directory::make_dir_recursive(String p_dir) {
 
 bool Directory::file_exists(String p_file) {
 	ERR_FAIL_COND_V_MSG(!d, false, "Directory is not configured properly.");
-	if (!p_file.is_rel_path()) {
+	if (!p_file.is_relative_path()) {
 		return FileAccess::exists(p_file);
 	}
 
@@ -1535,7 +1535,7 @@ bool Directory::file_exists(String p_file) {
 
 bool Directory::dir_exists(String p_dir) {
 	ERR_FAIL_COND_V_MSG(!d, false, "Directory is not configured properly.");
-	if (!p_dir.is_rel_path()) {
+	if (!p_dir.is_relative_path()) {
 		DirAccess *d = DirAccess::create_for_path(p_dir);
 		bool exists = d->dir_exists(p_dir);
 		memdelete(d);
@@ -1559,7 +1559,7 @@ Error Directory::rename(String p_from, String p_to) {
 	ERR_FAIL_COND_V_MSG(!is_open(), ERR_UNCONFIGURED, "Directory must be opened before use.");
 	ERR_FAIL_COND_V_MSG(p_from.is_empty() || p_from == "." || p_from == "..", ERR_INVALID_PARAMETER, "Invalid path to rename.");
 
-	if (!p_from.is_rel_path()) {
+	if (!p_from.is_relative_path()) {
 		DirAccess *d = DirAccess::create_for_path(p_from);
 		ERR_FAIL_COND_V_MSG(!d->file_exists(p_from) && !d->dir_exists(p_from), ERR_DOES_NOT_EXIST, "File or directory does not exist.");
 		Error err = d->rename(p_from, p_to);
@@ -1573,7 +1573,7 @@ Error Directory::rename(String p_from, String p_to) {
 
 Error Directory::remove(String p_name) {
 	ERR_FAIL_COND_V_MSG(!is_open(), ERR_UNCONFIGURED, "Directory must be opened before use.");
-	if (!p_name.is_rel_path()) {
+	if (!p_name.is_relative_path()) {
 		DirAccess *d = DirAccess::create_for_path(p_name);
 		Error err = d->remove(p_name);
 		memdelete(d);
@@ -2165,14 +2165,41 @@ bool Engine::is_in_physics_frame() const {
 	return ::Engine::get_singleton()->is_in_physics_frame();
 }
 
-bool Engine::has_singleton(const String &p_name) const {
+bool Engine::has_singleton(const StringName &p_name) const {
 	return ::Engine::get_singleton()->has_singleton(p_name);
 }
 
-Object *Engine::get_singleton_object(const String &p_name) const {
+Object *Engine::get_singleton_object(const StringName &p_name) const {
 	return ::Engine::get_singleton()->get_singleton_object(p_name);
 }
 
+void Engine::register_singleton(const StringName &p_name, Object *p_object) {
+	ERR_FAIL_COND_MSG(has_singleton(p_name), "Singleton already registered: " + String(p_name));
+	ERR_FAIL_COND_MSG(p_name.operator String().is_valid_identifier(), "Singleton name is not a valid identifier: " + String(p_name));
+	::Engine::Singleton s;
+	s.class_name = p_name;
+	s.name = p_name;
+	s.ptr = p_object;
+	s.user_created = true;
+	::Engine::get_singleton()->add_singleton(s);
+	;
+}
+void Engine::unregister_singleton(const StringName &p_name) {
+	ERR_FAIL_COND_MSG(!has_singleton(p_name), "Attempt to remove unregisteres singleton: " + String(p_name));
+	ERR_FAIL_COND_MSG(!::Engine::get_singleton()->is_singleton_user_created(p_name), "Attempt to remove non-user created singleton: " + String(p_name));
+	::Engine::get_singleton()->remove_singleton(p_name);
+}
+
+Vector<String> Engine::get_singleton_list() const {
+	List<::Engine::Singleton> singletons;
+	::Engine::get_singleton()->get_singletons(&singletons);
+	Vector<String> ret;
+	for (List<::Engine::Singleton>::Element *E = singletons.front(); E; E = E->next()) {
+		ret.push_back(E->get().name);
+	}
+	return ret;
+}
+
 void Engine::set_editor_hint(bool p_enabled) {
 	::Engine::get_singleton()->set_editor_hint(p_enabled);
 }
@@ -2220,6 +2247,10 @@ void Engine::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("has_singleton", "name"), &Engine::has_singleton);
 	ClassDB::bind_method(D_METHOD("get_singleton", "name"), &Engine::get_singleton_object);
 
+	ClassDB::bind_method(D_METHOD("register_singleton", "name", "instance"), &Engine::register_singleton);
+	ClassDB::bind_method(D_METHOD("unregister_singleton", "name"), &Engine::unregister_singleton);
+	ClassDB::bind_method(D_METHOD("get_singleton_list"), &Engine::get_singleton_list);
+
 	ClassDB::bind_method(D_METHOD("set_editor_hint", "enabled"), &Engine::set_editor_hint);
 	ClassDB::bind_method(D_METHOD("is_editor_hint"), &Engine::is_editor_hint);