Skip to content

Commit

Permalink
[godot] Remove superfluous GodotSpineExtension::_readFile impl
Browse files Browse the repository at this point in the history
  • Loading branch information
badlogic committed Oct 8, 2024
1 parent 6dbed60 commit 0dc8422
Showing 1 changed file with 1 addition and 26 deletions.
27 changes: 1 addition & 26 deletions spine-godot/spine_godot/GodotSpineExtension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,8 @@
#ifdef SPINE_GODOT_EXTENSION
#include "SpineCommon.h"
#include <godot_cpp/core/memory.hpp>
#include <godot_cpp/classes/file_access.hpp>
#else
#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
#include <spine/SpineString.h>

Expand All @@ -66,23 +59,5 @@ void GodotSpineExtension::_free(void *mem, const char *file, int line) {
}

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;
}
#endif
auto r = alloc<char>(res.size(), __FILE__, __LINE__);
memcpy(r, res.ptr(), res.size());
if (length) *length = res.size();
return r;
return NULL;
}

0 comments on commit 0dc8422

Please sign in to comment.