UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-10 17:18:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

[godot] Make compilation work for 4.0 again.

Browse Source
This commit is contained in:
Mario Zechner 2022-05-30 13:53:10 +02:00
parent 81088ed261
commit 11910df2ab
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-godot/spine_godot/SpineEditorPlugin.cpp
View File

@ -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<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) {
#else
Error SpineAtlasResourceImportPlugin::import(const String &source_file, const String &save_path, const Map<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) {
#endif
Ref<SpineAtlasResource> 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<ImportOption> *opti
}
}
#if VERSION_MAJOR > 3
Error SpineJsonResourceImportPlugin::import(const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) {
#else
Error SpineJsonResourceImportPlugin::import(const String &source_file, const String &save_path, const Map<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) {
#endif
Ref<SpineSkeletonFileResource> 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<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) {
#else
Error SpineBinaryResourceImportPlugin::import(const String &source_file, const String &save_path, const Map<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) {
#endif
Ref<SpineSkeletonFileResource> skeleton_file_res(memnew(SpineSkeletonFileResource));
skeleton_file_res->load_from_file(source_file);

20
spine-godot/spine_godot/SpineEditorPlugin.h
View File

@ -59,14 +59,16 @@ public:
void get_import_options(const String &path, List<ImportOption> *options, int preset) const override;
bool get_option_visibility(const String &path, const String &option, const Map<StringName, Variant> &options) const override { return true; }
virtual bool get_option_visibility(const String &path, const String &option, const HashMap<StringName, Variant> &options) const override { return true; }
Error import(const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) override;
#else
void get_import_options(List<ImportOption> *options, int preset) const override;
bool get_option_visibility(const String &option, const Map<StringName, Variant> &options) const override { return true; }
#endif
Error import(const String &source_file, const String &save_path, const Map<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) override;
#endif
};
class SpineJsonResourceImportPlugin : public EditorImportPlugin {
@ -92,13 +94,16 @@ public:
void get_import_options(const String &path, List<ImportOption> *options, int preset) const override { }
bool get_option_visibility(const String &path, const String &option, const Map<StringName, Variant> &options) const override { return true; }
bool get_option_visibility(const String &path, const String &option, const HashMap<StringName, Variant> &options) const override { return true; }
Error import(const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) override;
#else
void get_import_options(List<ImportOption> *options, int preset) const override { }
bool get_option_visibility(const String &option, const Map<StringName, Variant> &options) const override { return true; }
#endif
Error import(const String &source_file, const String &save_path, const Map<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) override;
#endif
};
class SpineBinaryResourceImportPlugin : public EditorImportPlugin {
@ -124,13 +129,16 @@ public:
void get_import_options(const String &path, List<ImportOption> *options, int preset) const override { }
bool get_option_visibility(const String &path, const String &option, const Map<StringName, Variant> &options) const override { return true; }
bool get_option_visibility(const String &path, const String &option, const HashMap<StringName, Variant> &options) const override { return true; }
Error import(const String &source_file, const String &save_path, const HashMap<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) override;
#else
void get_import_options(List<ImportOption> *options, int preset) const override { }
bool get_option_visibility(const String &option, const Map<StringName, Variant> &options) const override { return true; }
#endif
Error import(const String &source_file, const String &save_path, const Map<StringName, Variant> &options, List<String> *platform_variants, List<String> *gen_files, Variant *metadata) override;
#endif
};
class SpineEditorPlugin : public EditorPlugin {