Merge pull request #997 from asmaloney/fix-shadow-eulerorder

Fix a shadowed enum (EulerOrder)
This commit is contained in:
Rémi Verschelde
2023-01-18 18:36:21 +01:00
committed by GitHub
2 changed files with 3 additions and 11 deletions

View File

@@ -31,6 +31,7 @@
#ifndef GODOT_BASIS_HPP
#define GODOT_BASIS_HPP
#include <godot_cpp/classes/global_constants.hpp>
#include <godot_cpp/variant/quaternion.hpp>
#include <godot_cpp/variant/vector3.hpp>
@@ -58,15 +59,6 @@ struct _NO_DISCARD_ Basis {
_FORCE_INLINE_ real_t determinant() const;
enum EulerOrder {
EULER_ORDER_XYZ,
EULER_ORDER_XZY,
EULER_ORDER_YXZ,
EULER_ORDER_YZX,
EULER_ORDER_ZXY,
EULER_ORDER_ZYX
};
void from_z(const Vector3 &p_z);
void rotate(const Vector3 &p_axis, real_t p_angle);