diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-06 19:31:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-06 19:31:08 +0100 |
| commit | a66df68143fef1d38a57fdd7f965e0e212d2f4a6 (patch) | |
| tree | 1ffcb3bd36d1834532834b78e29bb7efe15d1cd7 /core/io | |
| parent | 1dee3e0cc7590480a77d5bb50a4c90e0286c5e50 (diff) | |
| parent | 05ce2c80bb9230bcbaefea669df06906fe2bfbc5 (diff) | |
Merge pull request #56291 from aaronfranke/variant-enum-renames
Rename Variant enum members in resource_format_binary.cpp
Diffstat (limited to 'core/io')
| -rw-r--r-- | core/io/resource_format_binary.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index 9753ac2c4e..200d5fafde 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -53,9 +53,9 @@ enum { VARIANT_PLANE = 13, VARIANT_QUATERNION = 14, VARIANT_AABB = 15, - VARIANT_MATRIX3 = 16, + VARIANT_BASIS = 16, VARIANT_TRANSFORM3D = 17, - VARIANT_MATRIX32 = 18, + VARIANT_TRANSFORM2D = 18, VARIANT_COLOR = 20, VARIANT_NODE_PATH = 22, VARIANT_RID = 23, @@ -220,7 +220,7 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) { r_v = v; } break; - case VARIANT_MATRIX32: { + case VARIANT_TRANSFORM2D: { Transform2D v; v.elements[0].x = f->get_real(); v.elements[0].y = f->get_real(); @@ -231,7 +231,7 @@ Error ResourceLoaderBinary::parse_variant(Variant &r_v) { r_v = v; } break; - case VARIANT_MATRIX3: { + case VARIANT_BASIS: { Basis v; v.elements[0].x = f->get_real(); v.elements[0].y = f->get_real(); @@ -1476,7 +1476,7 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia } break; case Variant::TRANSFORM2D: { - f->store_32(VARIANT_MATRIX32); + f->store_32(VARIANT_TRANSFORM2D); Transform2D val = p_property; f->store_real(val.elements[0].x); f->store_real(val.elements[0].y); @@ -1487,7 +1487,7 @@ void ResourceFormatSaverBinaryInstance::write_variant(FileAccess *f, const Varia } break; case Variant::BASIS: { - f->store_32(VARIANT_MATRIX3); + f->store_32(VARIANT_BASIS); Basis val = p_property; f->store_real(val.elements[0].x); f->store_real(val.elements[0].y); |