From 11910df2aba951335d564a7a26651e889c979643 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Mon, 30 May 2022 13:53:10 +0200 Subject: [PATCH] [godot] Make compilation work for 4.0 again. --- spine-godot/spine_godot/SpineEditorPlugin.cpp | 12 +++++++++++ spine-godot/spine_godot/SpineEditorPlugin.h | 20 +++++++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/spine-godot/spine_godot/SpineEditorPlugin.cpp b/spine-godot/spine_godot/SpineEditorPlugin.cpp index adae9c90a..9db1b8c27 100644 --- a/spine-godot/spine_godot/SpineEditorPlugin.cpp +++ b/spine-godot/spine_godot/SpineEditorPlugin.cpp @@ -32,7 +32,11 @@ #include "SpineAtlasResource.h" #include "SpineSkeletonFileResource.h" +#if VERSION_MAJOR > 3 +Error SpineAtlasResourceImportPlugin::import(const String &source_file, const String &save_path, const HashMap &options, List *platform_variants, List *gen_files, Variant *metadata) { +#else Error SpineAtlasResourceImportPlugin::import(const String &source_file, const String &save_path, const Map &options, List *platform_variants, List *gen_files, Variant *metadata) { +#endif Ref atlas(memnew(SpineAtlasResource)); atlas->set_normal_texture_prefix(options["normal_map_prefix"]); atlas->load_from_atlas_file(source_file); @@ -57,7 +61,11 @@ void SpineAtlasResourceImportPlugin::get_import_options(List *opti } } +#if VERSION_MAJOR > 3 +Error SpineJsonResourceImportPlugin::import(const String &source_file, const String &save_path, const HashMap &options, List *platform_variants, List *gen_files, Variant *metadata) { +#else Error SpineJsonResourceImportPlugin::import(const String &source_file, const String &save_path, const Map &options, List *platform_variants, List *gen_files, Variant *metadata) { +#endif Ref skeleton_file_res(memnew(SpineSkeletonFileResource)); skeleton_file_res->load_from_file(source_file); @@ -66,7 +74,11 @@ Error SpineJsonResourceImportPlugin::import(const String &source_file, const Str return error; } +#if VERSION_MAJOR > 3 +Error SpineBinaryResourceImportPlugin::import(const String &source_file, const String &save_path, const HashMap &options, List *platform_variants, List *gen_files, Variant *metadata) { +#else Error SpineBinaryResourceImportPlugin::import(const String &source_file, const String &save_path, const Map &options, List *platform_variants, List *gen_files, Variant *metadata) { +#endif Ref skeleton_file_res(memnew(SpineSkeletonFileResource)); skeleton_file_res->load_from_file(source_file); diff --git a/spine-godot/spine_godot/SpineEditorPlugin.h b/spine-godot/spine_godot/SpineEditorPlugin.h index 0ab7d3b99..0278e1f86 100644 --- a/spine-godot/spine_godot/SpineEditorPlugin.h +++ b/spine-godot/spine_godot/SpineEditorPlugin.h @@ -59,14 +59,16 @@ public: void get_import_options(const String &path, List *options, int preset) const override; - bool get_option_visibility(const String &path, const String &option, const Map &options) const override { return true; } + virtual bool get_option_visibility(const String &path, const String &option, const HashMap &options) const override { return true; } + + Error import(const String &source_file, const String &save_path, const HashMap &options, List *platform_variants, List *gen_files, Variant *metadata) override; #else void get_import_options(List *options, int preset) const override; bool get_option_visibility(const String &option, const Map &options) const override { return true; } -#endif Error import(const String &source_file, const String &save_path, const Map &options, List *platform_variants, List *gen_files, Variant *metadata) override; +#endif }; class SpineJsonResourceImportPlugin : public EditorImportPlugin { @@ -92,13 +94,16 @@ public: void get_import_options(const String &path, List *options, int preset) const override { } - bool get_option_visibility(const String &path, const String &option, const Map &options) const override { return true; } + bool get_option_visibility(const String &path, const String &option, const HashMap &options) const override { return true; } + + Error import(const String &source_file, const String &save_path, const HashMap &options, List *platform_variants, List *gen_files, Variant *metadata) override; #else void get_import_options(List *options, int preset) const override { } bool get_option_visibility(const String &option, const Map &options) const override { return true; } -#endif + Error import(const String &source_file, const String &save_path, const Map &options, List *platform_variants, List *gen_files, Variant *metadata) override; +#endif }; class SpineBinaryResourceImportPlugin : public EditorImportPlugin { @@ -124,13 +129,16 @@ public: void get_import_options(const String &path, List *options, int preset) const override { } - bool get_option_visibility(const String &path, const String &option, const Map &options) const override { return true; } + bool get_option_visibility(const String &path, const String &option, const HashMap &options) const override { return true; } + + Error import(const String &source_file, const String &save_path, const HashMap &options, List *platform_variants, List *gen_files, Variant *metadata) override; #else void get_import_options(List *options, int preset) const override { } bool get_option_visibility(const String &option, const Map &options) const override { return true; } -#endif + Error import(const String &source_file, const String &save_path, const Map &options, List *platform_variants, List *gen_files, Variant *metadata) override; +#endif }; class SpineEditorPlugin : public EditorPlugin {