diff options
| author | Rémi Verschelde | 2017-11-17 20:04:29 +0100 |
|---|---|---|
| committer | GitHub | 2017-11-17 20:04:29 +0100 |
| commit | 0968c8d2f65f7ac6e0d6b3718ee1028b229b3353 (patch) | |
| tree | d2265ef6e3273658171104abe9b215f961d17495 /core/variant_parser.cpp | |
| parent | 1feeb3e1c8406caf5497d5fcb40820cbb2d0d165 (diff) | |
| parent | d28763a4c1792dc00fde3d151eaea54f9cf2b8a9 (diff) | |
| download | godot-0968c8d2f65f7ac6e0d6b3718ee1028b229b3353.tar.gz godot-0968c8d2f65f7ac6e0d6b3718ee1028b229b3353.tar.zst godot-0968c8d2f65f7ac6e0d6b3718ee1028b229b3353.zip | |
Merge pull request #12982 from tagcup/aabb_rename
Rename Rect3 to AABB.
Diffstat (limited to 'core/variant_parser.cpp')
| -rw-r--r-- | core/variant_parser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp index d60d10cd3..1552b62c6 100644 --- a/core/variant_parser.cpp +++ b/core/variant_parser.cpp @@ -595,7 +595,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, value = Quat(args[0], args[1], args[2], args[3]); return OK; - } else if (id == "Rect3" || id == "AABB") { + } else if (id == "AABB") { Vector<float> args; Error err = _parse_construct<float>(p_stream, args, line, r_err_str); @@ -606,7 +606,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, r_err_str = "Expected 6 arguments for constructor"; } - value = Rect3(Vector3(args[0], args[1], args[2]), Vector3(args[3], args[4], args[5])); + value = AABB(Vector3(args[0], args[1], args[2]), Vector3(args[3], args[4], args[5])); return OK; } else if (id == "Basis" || id == "Matrix3") { //compatibility @@ -1634,10 +1634,10 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str p_store_string_func(p_store_string_ud, "Plane( " + rtosfix(p.normal.x) + ", " + rtosfix(p.normal.y) + ", " + rtosfix(p.normal.z) + ", " + rtosfix(p.d) + " )"); } break; - case Variant::RECT3: { + case Variant::AABB: { - Rect3 aabb = p_variant; - p_store_string_func(p_store_string_ud, "Rect3( " + rtosfix(aabb.position.x) + ", " + rtosfix(aabb.position.y) + ", " + rtosfix(aabb.position.z) + ", " + rtosfix(aabb.size.x) + ", " + rtosfix(aabb.size.y) + ", " + rtosfix(aabb.size.z) + " )"); + AABB aabb = p_variant; + p_store_string_func(p_store_string_ud, "AABB( " + rtosfix(aabb.position.x) + ", " + rtosfix(aabb.position.y) + ", " + rtosfix(aabb.position.z) + ", " + rtosfix(aabb.size.x) + ", " + rtosfix(aabb.size.y) + ", " + rtosfix(aabb.size.z) + " )"); } break; case Variant::QUAT: { |