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

[godot] Remove superfluous GodotSpineExtension::_readFile impl

Browse Source
This commit is contained in:
Mario Zechner 2024-10-08 16:00:53 +02:00
parent 6dbed6044f
commit 0dc8422c95
1 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spine-godot/spine_godot/GodotSpineExtension.cpp
View File

@ -31,15 +31,8 @@
#ifdef SPINE_GODOT_EXTENSION #ifdef SPINE_GODOT_EXTENSION
#include "SpineCommon.h" #include "SpineCommon.h"
#include <godot_cpp/core/memory.hpp> #include <godot_cpp/core/memory.hpp>
#include <godot_cpp/classes/file_access.hpp>
#else #else
#include "core/os/memory.h" #include "core/os/memory.h"
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/file_access.h"
#else
#include "core/os/file_access.h"
#endif
#endif #endif
#include <spine/SpineString.h> #include <spine/SpineString.h>
@ -66,23 +59,5 @@ void GodotSpineExtension::_free(void *mem, const char *file, int line) {
} }
char *GodotSpineExtension::_readFile(const spine::String &path, int *length) { char *GodotSpineExtension::_readFile(const spine::String &path, int *length) {
Error error;
#ifdef SPINE_GODOT_EXTENSION
// FIXME no error parameter!
auto res = FileAccess::get_file_as_bytes(String(path.buffer()));
#else
#if VERSION_MAJOR > 3
auto res = FileAccess::get_file_as_bytes(String(path.buffer()), &error);
#else
auto res = FileAccess::get_file_as_array(String(path.buffer()), &error);
#endif
if (error != OK) {
if (length) *length = 0;
return NULL; return NULL;
} }
#endif
auto r = alloc<char>(res.size(), __FILE__, __LINE__);
memcpy(r, res.ptr(), res.size());
if (length) *length = res.size();
return r;
}