diff options
| author | Juan Linietsky | 2014-05-14 01:22:15 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-05-14 01:22:15 -0300 |
| commit | b324ff7ea584676fcc3292808d7e7ea609982f8e (patch) | |
| tree | b80e9aa0b8f2926a398e25ef904f6229cb3e28dd /core/variant.cpp | |
| parent | 45a509282e912d85c46b40974a2deb926be5be42 (diff) | |
| download | godot-b324ff7ea584676fcc3292808d7e7ea609982f8e.tar.gz godot-b324ff7ea584676fcc3292808d7e7ea609982f8e.tar.zst godot-b324ff7ea584676fcc3292808d7e7ea609982f8e.zip | |
Diffstat (limited to 'core/variant.cpp')
| -rw-r--r-- | core/variant.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index 6b3b25a10..fdb14c0c0 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -1337,6 +1337,10 @@ Variant::operator Matrix3() const { if (type==MATRIX3) return *_data._matrix3; + else if (type==QUAT) + return *reinterpret_cast<const Quat*>(_data._mem); + else if (type==TRANSFORM) + return _data._transform->basis; else return Matrix3(); } @@ -1345,6 +1349,10 @@ Variant::operator Quat() const { if (type==QUAT) return *reinterpret_cast<const Quat*>(_data._mem); + else if (type==MATRIX3) + return *_data._matrix3; + else if (type==TRANSFORM) + return _data._transform->basis; else return Quat(); } @@ -1357,6 +1365,8 @@ Variant::operator Transform() const { return *_data._transform; else if (type==MATRIX3) return Transform(*_data._matrix3,Vector3()); + else if (type==QUAT) + return Transform(Matrix3(*reinterpret_cast<const Quat*>(_data._mem)),Vector3()); else return Transform(); } |