UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[godot] Fix compilation errors with 3.5.3, fix const correctness.

Browse Source
This commit is contained in:
Mario Zechner 2023-10-06 11:15:21 +02:00
parent 97fb551cee
commit f5caeacf0c
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-godot/spine_godot/SpineAtlasResource.cpp
View File

@ -232,6 +232,7 @@ Error SpineAtlasResource::save_to_file(const String &path) {
return OK; return OK;
} }
#if VERSION_MAJOR > 3
Error SpineAtlasResource::copy_from(const Ref<Resource> &p_resource) { Error SpineAtlasResource::copy_from(const Ref<Resource> &p_resource) {
auto error = Resource::copy_from(p_resource); auto error = Resource::copy_from(p_resource);
if (error != OK) return error; if (error != OK) return error;
@ -251,6 +252,7 @@ Error SpineAtlasResource::copy_from(const Ref<Resource> &p_resource) {
return OK; return OK;
} }
#endif
#if VERSION_MAJOR > 3 #if VERSION_MAJOR > 3
RES SpineAtlasResourceFormatLoader::load(const String &path, const String &original_path, Error *error, bool use_sub_threads, float *progress, CacheMode cache_mode) { RES SpineAtlasResourceFormatLoader::load(const String &path, const String &original_path, Error *error, bool use_sub_threads, float *progress, CacheMode cache_mode) {

8
spine-godot/spine_godot/SpineAtlasResource.h
View File

@ -45,8 +45,8 @@ class SpineAtlasResource : public Resource {
protected: protected:
static void _bind_methods(); static void _bind_methods();
spine::Atlas *atlas; mutable spine::Atlas *atlas;
GodotSpineTextureLoader *texture_loader; mutable GodotSpineTextureLoader *texture_loader;
String source_path; String source_path;
String atlas_data; String atlas_data;
@ -69,7 +69,9 @@ public:
Error save_to_file(const String &path);// .spatlas Error save_to_file(const String &path);// .spatlas
#if VERSION_MAJOR > 3
virtual Error copy_from(const Ref<Resource> &p_resource); virtual Error copy_from(const Ref<Resource> &p_resource);
#endif
String get_source_path(); String get_source_path();
@ -77,7 +79,7 @@ public:
Array get_normal_maps(); Array get_normal_maps();
const void clear_native_data() { void clear_native_data() const {
this->atlas = nullptr; this->atlas = nullptr;
this->texture_loader = nullptr; this->texture_loader = nullptr;
} }

6
spine-godot/spine_godot/SpineSkeletonFileResource.cpp
View File

@ -28,11 +28,13 @@
*****************************************************************************/ *****************************************************************************/
#include "SpineSkeletonFileResource.h" #include "SpineSkeletonFileResource.h"
#if VERSION_MAJOR > 3
#include "core/error/error_list.h" #include "core/error/error_list.h"
#include "core/error/error_macros.h" #include "core/error/error_macros.h"
#if VERSION_MAJOR > 3
#include "core/io/file_access.h" #include "core/io/file_access.h"
#else #else
#include "core/error_list.h"
#include "core/error_macros.h"
#include "core/os/file_access.h" #include "core/os/file_access.h"
#endif #endif
#include <spine/Json.h> #include <spine/Json.h>
@ -160,6 +162,7 @@ Error SpineSkeletonFileResource::save_to_file(const String &path) {
return OK; return OK;
} }
#if VERSION_MAJOR > 3
Error SpineSkeletonFileResource::copy_from(const Ref<Resource> &p_resource) { Error SpineSkeletonFileResource::copy_from(const Ref<Resource> &p_resource) {
auto error = Resource::copy_from(p_resource); auto error = Resource::copy_from(p_resource);
if (error != OK) return error; if (error != OK) return error;
@ -169,6 +172,7 @@ Error SpineSkeletonFileResource::copy_from(const Ref<Resource> &p_resource) {
emit_signal(SNAME("skeleton_file_changed")); emit_signal(SNAME("skeleton_file_changed"));
return OK; return OK;
} }
#endif
#if VERSION_MAJOR > 3 #if VERSION_MAJOR > 3
RES SpineSkeletonFileResourceFormatLoader::load(const String &path, const String &original_path, Error *error, bool use_sub_threads, float *progress, CacheMode cache_mode) { RES SpineSkeletonFileResourceFormatLoader::load(const String &path, const String &original_path, Error *error, bool use_sub_threads, float *progress, CacheMode cache_mode) {

2
spine-godot/spine_godot/SpineSkeletonFileResource.h
View File

@ -53,7 +53,9 @@ public:
Error save_to_file(const String &path); Error save_to_file(const String &path);
#if VERSION_MAJOR > 3
virtual Error copy_from(const Ref<Resource> &p_resource); virtual Error copy_from(const Ref<Resource> &p_resource);
#endif
}; };
class SpineSkeletonFileResourceFormatLoader : public ResourceFormatLoader { class SpineSkeletonFileResourceFormatLoader : public ResourceFormatLoader {