Replace BIND_VMETHOD by new GDVIRTUAL syntax
* New syntax is type safe. * New syntax allows for type safe virtuals in native extensions. * New syntax permits extremely fast calling. Note: Everything was replaced where possible except for `_gui_input` `_input` and `_unhandled_input`. These will require API rework on a separate PR as they work different than the rest of the functions. Added a new method flag METHOD_FLAG_OBJECT_CORE, used internally. Allows to not dump the core virtuals like `_notification` to the json API, since each language will implement those as it is best fits.
This commit is contained in:
reduz
parent
2a5c64f2a1
commit
3682978aee
104 changed files with 1389 additions and 1227 deletions
|
|
@ -35,102 +35,131 @@ EditorImportPlugin::EditorImportPlugin() {
|
|||
}
|
||||
|
||||
String EditorImportPlugin::get_importer_name() const {
|
||||
ERR_FAIL_COND_V(!(get_script_instance() && get_script_instance()->has_method("_get_importer_name")), "");
|
||||
return get_script_instance()->call("_get_importer_name");
|
||||
String ret;
|
||||
if (GDVIRTUAL_CALL(_get_importer_name, ret)) {
|
||||
return ret;
|
||||
}
|
||||
ERR_FAIL_V_MSG(String(), "Unimplemented _get_importer_name in add-on.");
|
||||
}
|
||||
|
||||
String EditorImportPlugin::get_visible_name() const {
|
||||
ERR_FAIL_COND_V(!(get_script_instance() && get_script_instance()->has_method("_get_visible_name")), "");
|
||||
return get_script_instance()->call("_get_visible_name");
|
||||
String ret;
|
||||
if (GDVIRTUAL_CALL(_get_visible_name, ret)) {
|
||||
return ret;
|
||||
}
|
||||
ERR_FAIL_V_MSG(String(), "Unimplemented _get_visible_name in add-on.");
|
||||
}
|
||||
|
||||
void EditorImportPlugin::get_recognized_extensions(List<String> *p_extensions) const {
|
||||
ERR_FAIL_COND(!(get_script_instance() && get_script_instance()->has_method("_get_recognized_extensions")));
|
||||
Array extensions = get_script_instance()->call("_get_recognized_extensions");
|
||||
for (int i = 0; i < extensions.size(); i++) {
|
||||
p_extensions->push_back(extensions[i]);
|
||||
Vector<String> extensions;
|
||||
|
||||
if (GDVIRTUAL_CALL(_get_recognized_extensions, extensions)) {
|
||||
for (int i = 0; i < extensions.size(); i++) {
|
||||
p_extensions->push_back(extensions[i]);
|
||||
}
|
||||
}
|
||||
ERR_FAIL_MSG("Unimplemented _get_recognized_extensions in add-on.");
|
||||
}
|
||||
|
||||
String EditorImportPlugin::get_preset_name(int p_idx) const {
|
||||
ERR_FAIL_COND_V(!(get_script_instance() && get_script_instance()->has_method("_get_preset_name")), "");
|
||||
return get_script_instance()->call("_get_preset_name", p_idx);
|
||||
String ret;
|
||||
if (GDVIRTUAL_CALL(_get_preset_name, p_idx, ret)) {
|
||||
return ret;
|
||||
}
|
||||
ERR_FAIL_V_MSG(String(), "Unimplemented _get_preset_name in add-on.");
|
||||
}
|
||||
|
||||
int EditorImportPlugin::get_preset_count() const {
|
||||
ERR_FAIL_COND_V(!(get_script_instance() && get_script_instance()->has_method("_get_preset_count")), 0);
|
||||
return get_script_instance()->call("_get_preset_count");
|
||||
int ret;
|
||||
if (GDVIRTUAL_CALL(_get_preset_count, ret)) {
|
||||
return ret;
|
||||
}
|
||||
ERR_FAIL_V_MSG(-1, "Unimplemented _get_preset_count in add-on.");
|
||||
}
|
||||
|
||||
String EditorImportPlugin::get_save_extension() const {
|
||||
ERR_FAIL_COND_V(!(get_script_instance() && get_script_instance()->has_method("_get_save_extension")), "");
|
||||
return get_script_instance()->call("_get_save_extension");
|
||||
String ret;
|
||||
if (GDVIRTUAL_CALL(_get_save_extension, ret)) {
|
||||
return ret;
|
||||
}
|
||||
ERR_FAIL_V_MSG(String(), "Unimplemented _get_save_extension in add-on.");
|
||||
}
|
||||
|
||||
String EditorImportPlugin::get_resource_type() const {
|
||||
ERR_FAIL_COND_V(!(get_script_instance() && get_script_instance()->has_method("_get_resource_type")), "");
|
||||
return get_script_instance()->call("_get_resource_type");
|
||||
String ret;
|
||||
if (GDVIRTUAL_CALL(_get_resource_type, ret)) {
|
||||
return ret;
|
||||
}
|
||||
ERR_FAIL_V_MSG(String(), "Unimplemented _get_resource_type in add-on.");
|
||||
}
|
||||
|
||||
float EditorImportPlugin::get_priority() const {
|
||||
if (!(get_script_instance() && get_script_instance()->has_method("_get_priority"))) {
|
||||
return ResourceImporter::get_priority();
|
||||
float ret;
|
||||
if (GDVIRTUAL_CALL(_get_priority, ret)) {
|
||||
return ret;
|
||||
}
|
||||
return get_script_instance()->call("_get_priority");
|
||||
ERR_FAIL_V_MSG(-1, "Unimplemented _get_priority in add-on.");
|
||||
}
|
||||
|
||||
int EditorImportPlugin::get_import_order() const {
|
||||
if (!(get_script_instance() && get_script_instance()->has_method("_get_import_order"))) {
|
||||
return ResourceImporter::get_import_order();
|
||||
int ret;
|
||||
if (GDVIRTUAL_CALL(_get_import_order, ret)) {
|
||||
return ret;
|
||||
}
|
||||
return get_script_instance()->call("_get_import_order");
|
||||
ERR_FAIL_V_MSG(-1, "Unimplemented _get_import_order in add-on.");
|
||||
}
|
||||
|
||||
void EditorImportPlugin::get_import_options(List<ResourceImporter::ImportOption> *r_options, int p_preset) const {
|
||||
ERR_FAIL_COND(!(get_script_instance() && get_script_instance()->has_method("_get_import_options")));
|
||||
Array needed;
|
||||
needed.push_back("name");
|
||||
needed.push_back("default_value");
|
||||
Array options = get_script_instance()->call("_get_import_options", p_preset);
|
||||
for (int i = 0; i < options.size(); i++) {
|
||||
Dictionary d = options[i];
|
||||
ERR_FAIL_COND(!d.has_all(needed));
|
||||
String name = d["name"];
|
||||
Variant default_value = d["default_value"];
|
||||
Array options;
|
||||
if (GDVIRTUAL_CALL(_get_import_options, p_preset, options)) {
|
||||
for (int i = 0; i < options.size(); i++) {
|
||||
Dictionary d = options[i];
|
||||
ERR_FAIL_COND(!d.has_all(needed));
|
||||
String name = d["name"];
|
||||
Variant default_value = d["default_value"];
|
||||
|
||||
PropertyHint hint = PROPERTY_HINT_NONE;
|
||||
if (d.has("property_hint")) {
|
||||
hint = (PropertyHint)d["property_hint"].operator int64_t();
|
||||
PropertyHint hint = PROPERTY_HINT_NONE;
|
||||
if (d.has("property_hint")) {
|
||||
hint = (PropertyHint)d["property_hint"].operator int64_t();
|
||||
}
|
||||
|
||||
String hint_string;
|
||||
if (d.has("hint_string")) {
|
||||
hint_string = d["hint_string"];
|
||||
}
|
||||
|
||||
uint32_t usage = PROPERTY_USAGE_DEFAULT;
|
||||
if (d.has("usage")) {
|
||||
usage = d["usage"];
|
||||
}
|
||||
|
||||
ImportOption option(PropertyInfo(default_value.get_type(), name, hint, hint_string, usage), default_value);
|
||||
r_options->push_back(option);
|
||||
}
|
||||
|
||||
String hint_string;
|
||||
if (d.has("hint_string")) {
|
||||
hint_string = d["hint_string"];
|
||||
}
|
||||
|
||||
uint32_t usage = PROPERTY_USAGE_DEFAULT;
|
||||
if (d.has("usage")) {
|
||||
usage = d["usage"];
|
||||
}
|
||||
|
||||
ImportOption option(PropertyInfo(default_value.get_type(), name, hint, hint_string, usage), default_value);
|
||||
r_options->push_back(option);
|
||||
}
|
||||
|
||||
ERR_FAIL_MSG("Unimplemented _get_import_options in add-on.");
|
||||
}
|
||||
|
||||
bool EditorImportPlugin::get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const {
|
||||
ERR_FAIL_COND_V(!(get_script_instance() && get_script_instance()->has_method("_get_option_visibility")), true);
|
||||
Dictionary d;
|
||||
Map<StringName, Variant>::Element *E = p_options.front();
|
||||
while (E) {
|
||||
d[E->key()] = E->get();
|
||||
E = E->next();
|
||||
}
|
||||
return get_script_instance()->call("_get_option_visibility", p_option, d);
|
||||
bool visible;
|
||||
if (GDVIRTUAL_CALL(_get_option_visibility, p_option, d, visible)) {
|
||||
return visible;
|
||||
}
|
||||
|
||||
ERR_FAIL_V_MSG(false, "Unimplemented _get_option_visibility in add-on.");
|
||||
}
|
||||
|
||||
Error EditorImportPlugin::import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata) {
|
||||
ERR_FAIL_COND_V(!(get_script_instance() && get_script_instance()->has_method("_import")), ERR_UNAVAILABLE);
|
||||
Dictionary options;
|
||||
Array platform_variants, gen_files;
|
||||
|
||||
|
|
@ -139,28 +168,33 @@ Error EditorImportPlugin::import(const String &p_source_file, const String &p_sa
|
|||
options[E->key()] = E->get();
|
||||
E = E->next();
|
||||
}
|
||||
Error err = (Error)get_script_instance()->call("_import", p_source_file, p_save_path, options, platform_variants, gen_files).operator int64_t();
|
||||
|
||||
for (int i = 0; i < platform_variants.size(); i++) {
|
||||
r_platform_variants->push_back(platform_variants[i]);
|
||||
int err;
|
||||
if (GDVIRTUAL_CALL(_import, p_source_file, p_save_path, options, platform_variants, gen_files, err)) {
|
||||
Error ret_err = Error(err);
|
||||
|
||||
for (int i = 0; i < platform_variants.size(); i++) {
|
||||
r_platform_variants->push_back(platform_variants[i]);
|
||||
}
|
||||
for (int i = 0; i < gen_files.size(); i++) {
|
||||
r_gen_files->push_back(gen_files[i]);
|
||||
}
|
||||
return ret_err;
|
||||
}
|
||||
for (int i = 0; i < gen_files.size(); i++) {
|
||||
r_gen_files->push_back(gen_files[i]);
|
||||
}
|
||||
return err;
|
||||
ERR_FAIL_V_MSG(ERR_METHOD_NOT_FOUND, "Unimplemented _import in add-on.");
|
||||
}
|
||||
|
||||
void EditorImportPlugin::_bind_methods() {
|
||||
BIND_VMETHOD(MethodInfo(Variant::STRING, "_get_importer_name"));
|
||||
BIND_VMETHOD(MethodInfo(Variant::STRING, "_get_visible_name"));
|
||||
BIND_VMETHOD(MethodInfo(Variant::INT, "_get_preset_count"));
|
||||
BIND_VMETHOD(MethodInfo(Variant::STRING, "_get_preset_name", PropertyInfo(Variant::INT, "preset")));
|
||||
BIND_VMETHOD(MethodInfo(Variant::ARRAY, "_get_recognized_extensions"));
|
||||
BIND_VMETHOD(MethodInfo(Variant::ARRAY, "_get_import_options", PropertyInfo(Variant::INT, "preset")));
|
||||
BIND_VMETHOD(MethodInfo(Variant::STRING, "_get_save_extension"));
|
||||
BIND_VMETHOD(MethodInfo(Variant::STRING, "_get_resource_type"));
|
||||
BIND_VMETHOD(MethodInfo(Variant::FLOAT, "_get_priority"));
|
||||
BIND_VMETHOD(MethodInfo(Variant::INT, "_get_import_order"));
|
||||
BIND_VMETHOD(MethodInfo(Variant::BOOL, "_get_option_visibility", PropertyInfo(Variant::STRING, "option"), PropertyInfo(Variant::DICTIONARY, "options")));
|
||||
BIND_VMETHOD(MethodInfo(Variant::INT, "_import", PropertyInfo(Variant::STRING, "source_file"), PropertyInfo(Variant::STRING, "save_path"), PropertyInfo(Variant::DICTIONARY, "options"), PropertyInfo(Variant::ARRAY, "platform_variants"), PropertyInfo(Variant::ARRAY, "gen_files")));
|
||||
GDVIRTUAL_BIND(_get_importer_name)
|
||||
GDVIRTUAL_BIND(_get_visible_name)
|
||||
GDVIRTUAL_BIND(_get_preset_count)
|
||||
GDVIRTUAL_BIND(_get_preset_name, "preset_index")
|
||||
GDVIRTUAL_BIND(_get_recognized_extensions)
|
||||
GDVIRTUAL_BIND(_get_import_options, "preset_index")
|
||||
GDVIRTUAL_BIND(_get_save_extension)
|
||||
GDVIRTUAL_BIND(_get_resource_type)
|
||||
GDVIRTUAL_BIND(_get_priority)
|
||||
GDVIRTUAL_BIND(_get_import_order)
|
||||
GDVIRTUAL_BIND(_get_option_visibility, "option_name", "options")
|
||||
GDVIRTUAL_BIND(_import, "source_file", "save_path", "options", "platform_variants", "gen_files");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue