mirror of
				https://github.com/godotengine/godot.git
				synced 2025-10-31 21:51:22 +00:00 
			
		
		
		
	Rename JavaScript singleton to JavaScriptBridge
This commit is contained in:
		
							parent
							
								
									9142904c24
								
							
						
					
					
						commit
						48f9069f3a
					
				
					 8 changed files with 63 additions and 63 deletions
				
			
		|  | @ -30,66 +30,66 @@ | |||
| 
 | ||||
| #include "api.h" | ||||
| #include "core/config/engine.h" | ||||
| #include "javascript_singleton.h" | ||||
| #include "javascript_bridge_singleton.h" | ||||
| #include "web_tools_editor_plugin.h" | ||||
| 
 | ||||
| static JavaScript *javascript_singleton; | ||||
| static JavaScriptBridge *javascript_bridge_singleton; | ||||
| 
 | ||||
| void register_web_api() { | ||||
| 	WebToolsEditorPlugin::initialize(); | ||||
| 	GDREGISTER_ABSTRACT_CLASS(JavaScriptObject); | ||||
| 	GDREGISTER_ABSTRACT_CLASS(JavaScript); | ||||
| 	javascript_singleton = memnew(JavaScript); | ||||
| 	Engine::get_singleton()->add_singleton(Engine::Singleton("JavaScript", javascript_singleton)); | ||||
| 	GDREGISTER_ABSTRACT_CLASS(JavaScriptBridge); | ||||
| 	javascript_bridge_singleton = memnew(JavaScriptBridge); | ||||
| 	Engine::get_singleton()->add_singleton(Engine::Singleton("JavaScriptBridge", javascript_bridge_singleton)); | ||||
| } | ||||
| 
 | ||||
| void unregister_web_api() { | ||||
| 	memdelete(javascript_singleton); | ||||
| 	memdelete(javascript_bridge_singleton); | ||||
| } | ||||
| 
 | ||||
| JavaScript *JavaScript::singleton = nullptr; | ||||
| JavaScriptBridge *JavaScriptBridge::singleton = nullptr; | ||||
| 
 | ||||
| JavaScript *JavaScript::get_singleton() { | ||||
| JavaScriptBridge *JavaScriptBridge::get_singleton() { | ||||
| 	return singleton; | ||||
| } | ||||
| 
 | ||||
| JavaScript::JavaScript() { | ||||
| 	ERR_FAIL_COND_MSG(singleton != nullptr, "JavaScript singleton already exist."); | ||||
| JavaScriptBridge::JavaScriptBridge() { | ||||
| 	ERR_FAIL_COND_MSG(singleton != nullptr, "JavaScriptBridge singleton already exist."); | ||||
| 	singleton = this; | ||||
| } | ||||
| 
 | ||||
| JavaScript::~JavaScript() {} | ||||
| JavaScriptBridge::~JavaScriptBridge() {} | ||||
| 
 | ||||
| void JavaScript::_bind_methods() { | ||||
| 	ClassDB::bind_method(D_METHOD("eval", "code", "use_global_execution_context"), &JavaScript::eval, DEFVAL(false)); | ||||
| 	ClassDB::bind_method(D_METHOD("get_interface", "interface"), &JavaScript::get_interface); | ||||
| 	ClassDB::bind_method(D_METHOD("create_callback", "callable"), &JavaScript::create_callback); | ||||
| void JavaScriptBridge::_bind_methods() { | ||||
| 	ClassDB::bind_method(D_METHOD("eval", "code", "use_global_execution_context"), &JavaScriptBridge::eval, DEFVAL(false)); | ||||
| 	ClassDB::bind_method(D_METHOD("get_interface", "interface"), &JavaScriptBridge::get_interface); | ||||
| 	ClassDB::bind_method(D_METHOD("create_callback", "callable"), &JavaScriptBridge::create_callback); | ||||
| 	{ | ||||
| 		MethodInfo mi; | ||||
| 		mi.name = "create_object"; | ||||
| 		mi.arguments.push_back(PropertyInfo(Variant::STRING, "object")); | ||||
| 		ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "create_object", &JavaScript::_create_object_bind, mi); | ||||
| 		ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "create_object", &JavaScriptBridge::_create_object_bind, mi); | ||||
| 	} | ||||
| 	ClassDB::bind_method(D_METHOD("download_buffer", "buffer", "name", "mime"), &JavaScript::download_buffer, DEFVAL("application/octet-stream")); | ||||
| 	ClassDB::bind_method(D_METHOD("pwa_needs_update"), &JavaScript::pwa_needs_update); | ||||
| 	ClassDB::bind_method(D_METHOD("pwa_update"), &JavaScript::pwa_update); | ||||
| 	ClassDB::bind_method(D_METHOD("download_buffer", "buffer", "name", "mime"), &JavaScriptBridge::download_buffer, DEFVAL("application/octet-stream")); | ||||
| 	ClassDB::bind_method(D_METHOD("pwa_needs_update"), &JavaScriptBridge::pwa_needs_update); | ||||
| 	ClassDB::bind_method(D_METHOD("pwa_update"), &JavaScriptBridge::pwa_update); | ||||
| 	ADD_SIGNAL(MethodInfo("pwa_update_available")); | ||||
| } | ||||
| 
 | ||||
| #if !defined(WEB_ENABLED) || !defined(JAVASCRIPT_EVAL_ENABLED) | ||||
| Variant JavaScript::eval(const String &p_code, bool p_use_global_exec_context) { | ||||
| Variant JavaScriptBridge::eval(const String &p_code, bool p_use_global_exec_context) { | ||||
| 	return Variant(); | ||||
| } | ||||
| 
 | ||||
| Ref<JavaScriptObject> JavaScript::get_interface(const String &p_interface) { | ||||
| Ref<JavaScriptObject> JavaScriptBridge::get_interface(const String &p_interface) { | ||||
| 	return Ref<JavaScriptObject>(); | ||||
| } | ||||
| 
 | ||||
| Ref<JavaScriptObject> JavaScript::create_callback(const Callable &p_callable) { | ||||
| Ref<JavaScriptObject> JavaScriptBridge::create_callback(const Callable &p_callable) { | ||||
| 	return Ref<JavaScriptObject>(); | ||||
| } | ||||
| 
 | ||||
| Variant JavaScript::_create_object_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error) { | ||||
| Variant JavaScriptBridge::_create_object_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error) { | ||||
| 	if (p_argcount < 1) { | ||||
| 		r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS; | ||||
| 		r_error.argument = 0; | ||||
|  | @ -105,12 +105,12 @@ Variant JavaScript::_create_object_bind(const Variant **p_args, int p_argcount, | |||
| } | ||||
| #endif | ||||
| #if !defined(WEB_ENABLED) | ||||
| bool JavaScript::pwa_needs_update() const { | ||||
| bool JavaScriptBridge::pwa_needs_update() const { | ||||
| 	return false; | ||||
| } | ||||
| Error JavaScript::pwa_update() { | ||||
| Error JavaScriptBridge::pwa_update() { | ||||
| 	return ERR_UNAVAILABLE; | ||||
| } | ||||
| void JavaScript::download_buffer(Vector<uint8_t> p_arr, const String &p_name, const String &p_mime) { | ||||
| void JavaScriptBridge::download_buffer(Vector<uint8_t> p_arr, const String &p_name, const String &p_mime) { | ||||
| } | ||||
| #endif | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Geequlim
						Geequlim