asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed PackedByteArray GDScript functions

Browse source 
p_self._data.packed_array needs to be used instead of p_self._data._mem

printline
This commit is contained in:
Adam Brown 2020-05-27 12:52:54 -07:00
parent 5c4dffe7c2
commit 8f1a6d7489
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
core/variant_call.cpp
View file

@ -630,14 +630,14 @@ struct _VariantCall {
VCALL_LOCALMEM0R(Array, min); VCALL_LOCALMEM0R(Array, min);
static void _call_PackedByteArray_get_string_from_ascii(Variant &r_ret, Variant &p_self, const Variant **p_args) { static void _call_PackedByteArray_get_string_from_ascii(Variant &r_ret, Variant &p_self, const Variant **p_args) {
PackedByteArray *ba = reinterpret_cast<PackedByteArray *>(p_self._data._mem); Variant::PackedArrayRef<uint8_t> *ba = reinterpret_cast<Variant::PackedArrayRef<uint8_t> *>(p_self._data.packed_array);
String s; String s;
if (ba->size() > 0) { if (ba->array.size() > 0) {
const uint8_t *r = ba->ptr(); const uint8_t *r = ba->array.ptr();
CharString cs; CharString cs;
cs.resize(ba->size() + 1); cs.resize(ba->array.size() + 1);
copymem(cs.ptrw(), r, ba->size()); copymem(cs.ptrw(), r, ba->array.size());
cs[ba->size()] = 0; cs[ba->array.size()] = 0;
s = cs.get_data(); s = cs.get_data();
} }
@ -645,11 +645,12 @@ struct _VariantCall {
} }
static void _call_PackedByteArray_get_string_from_utf8(Variant &r_ret, Variant &p_self, const Variant **p_args) { static void _call_PackedByteArray_get_string_from_utf8(Variant &r_ret, Variant &p_self, const Variant **p_args) {
PackedByteArray *ba = reinterpret_cast<PackedByteArray *>(p_self._data._mem); Variant::PackedArrayRef<uint8_t> *ba = reinterpret_cast<Variant::PackedArrayRef<uint8_t> *>(p_self._data.packed_array);
String s; String s;
if (ba->size() > 0) { if (ba->array.size() > 0) {
const uint8_t *r = ba->ptr(); const uint8_t *r = ba->array.ptr();
s.parse_utf8((const char *)r, ba->size()); s.parse_utf8((const char *)r, ba->array.size());
} }
r_ret = s; r_ret = s;
} }
@ -675,22 +676,23 @@ struct _VariantCall {
} }
static void _call_PackedByteArray_compress(Variant &r_ret, Variant &p_self, const Variant **p_args) { static void _call_PackedByteArray_compress(Variant &r_ret, Variant &p_self, const Variant **p_args) {
PackedByteArray *ba = reinterpret_cast<PackedByteArray *>(p_self._data._mem); Variant::PackedArrayRef<uint8_t> *ba = reinterpret_cast<Variant::PackedArrayRef<uint8_t> *>(p_self._data.packed_array);
PackedByteArray compressed; PackedByteArray compressed;
if (ba->size() > 0) {
Compression::Mode mode = (Compression::Mode)(int)(*p_args[0]);
compressed.resize(Compression::get_max_compressed_buffer_size(ba->size(), mode)); if (ba->array.size() > 0) {
int result = Compression::compress(compressed.ptrw(), ba->ptr(), ba->size(), mode); Compression::Mode mode = (Compression::Mode)(int)(*p_args[0]);
compressed.resize(Compression::get_max_compressed_buffer_size(ba->array.size(), mode));
int result = Compression::compress(compressed.ptrw(), ba->array.ptr(), ba->array.size(), mode);
result = result >= 0 ? result : 0; result = result >= 0 ? result : 0;
compressed.resize(result); compressed.resize(result);
} }
r_ret = compressed; r_ret = compressed;
} }
static void _call_PackedByteArray_decompress(Variant &r_ret, Variant &p_self, const Variant **p_args) { static void _call_PackedByteArray_decompress(Variant &r_ret, Variant &p_self, const Variant **p_args) {
PackedByteArray *ba = reinterpret_cast<PackedByteArray *>(p_self._data._mem); Variant::PackedArrayRef<uint8_t> *ba = reinterpret_cast<Variant::PackedArrayRef<uint8_t> *>(p_self._data.packed_array);
PackedByteArray decompressed; PackedByteArray decompressed;
Compression::Mode mode = (Compression::Mode)(int)(*p_args[1]); Compression::Mode mode = (Compression::Mode)(int)(*p_args[1]);
@ -702,7 +704,7 @@ struct _VariantCall {
} }
decompressed.resize(buffer_size); decompressed.resize(buffer_size);
int result = Compression::decompress(decompressed.ptrw(), buffer_size, ba->ptr(), ba->size(), mode); int result = Compression::decompress(decompressed.ptrw(), buffer_size, ba->array.ptr(), ba->array.size(), mode);
result = result >= 0 ? result : 0; result = result >= 0 ? result : 0;
decompressed.resize(result); decompressed.resize(result);
@ -711,13 +713,13 @@ struct _VariantCall {
} }
static void _call_PackedByteArray_hex_encode(Variant &r_ret, Variant &p_self, const Variant **p_args) { static void _call_PackedByteArray_hex_encode(Variant &r_ret, Variant &p_self, const Variant **p_args) {
PackedByteArray *ba = reinterpret_cast<PackedByteArray *>(p_self._data._mem); Variant::PackedArrayRef<uint8_t> *ba = reinterpret_cast<Variant::PackedArrayRef<uint8_t> *>(p_self._data.packed_array);
if (ba->size() == 0) { if (ba->array.size() == 0) {
r_ret = String(); r_ret = String();
return; return;
} }
const uint8_t *r = ba->ptr(); const uint8_t *r = ba->array.ptr();
String s = String::hex_encode_buffer(&r[0], ba->size()); String s = String::hex_encode_buffer(&r[0], ba->array.size());
r_ret = s; r_ret = s;
} }