diff options
| author | alexholly | 2017-06-06 20:33:51 +0200 |
|---|---|---|
| committer | Rémi Verschelde | 2017-06-09 15:54:02 +0200 |
| commit | 935f730170d75955f708b5014da3e11c95fcdac4 (patch) | |
| tree | 693c281eb4ed706ba4be9867e7f1276450e63e99 /core/io/marshalls.cpp | |
| parent | 63fd693c1ebd2d3d2c23f3969ca8f6f3e18ff3e4 (diff) | |
| download | godot-935f730170d75955f708b5014da3e11c95fcdac4.tar.gz godot-935f730170d75955f708b5014da3e11c95fcdac4.tar.zst godot-935f730170d75955f708b5014da3e11c95fcdac4.zip | |
Diffstat (limited to 'core/io/marshalls.cpp')
| -rw-r--r-- | core/io/marshalls.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index ceae543ff..75dfd563d 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -211,9 +211,9 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int ERR_FAIL_COND_V(len < (int)4 * 6, ERR_INVALID_DATA); Rect3 val; - val.pos.x = decode_float(&buf[0]); - val.pos.y = decode_float(&buf[4]); - val.pos.z = decode_float(&buf[8]); + val.position.x = decode_float(&buf[0]); + val.position.y = decode_float(&buf[4]); + val.position.z = decode_float(&buf[8]); val.size.x = decode_float(&buf[12]); val.size.y = decode_float(&buf[16]); val.size.z = decode_float(&buf[20]); @@ -926,9 +926,9 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len) { if (buf) { Rect3 aabb = p_variant; - encode_float(aabb.pos.x, &buf[0]); - encode_float(aabb.pos.y, &buf[4]); - encode_float(aabb.pos.z, &buf[8]); + encode_float(aabb.position.x, &buf[0]); + encode_float(aabb.position.y, &buf[4]); + encode_float(aabb.position.z, &buf[8]); encode_float(aabb.size.x, &buf[12]); encode_float(aabb.size.y, &buf[16]); encode_float(aabb.size.z, &buf[20]); |