Merge EulerOrder enum with generated one

Author: Bromeon

godot-core/src/builtin/basis.rs

@@ -12,6 +12,7 @@ use crate::builtin::math::{ApproxEq, FloatExt, GlamConv, GlamType};
 use crate::builtin::real_consts::FRAC_PI_2;
 use crate::builtin::{real, Quaternion, RMat3, RQuat, RVec2, RVec3, Vector3};
 
+use crate::engine::global::EulerOrder;
 use std::cmp::Ordering;
 use std::fmt::Display;
 use std::ops::{Mul, MulAssign};
@@ -322,6 +323,7 @@ impl Basis {
         ))
     }
 
+    #[allow(clippy::wrong_self_convention)]
     fn to_euler_inner(major: real, pair0: RVec2, pair1: RVec2, pair2: RVec2) -> RVec3 {
         match Self::is_between_neg1_1(major) {
             // It's -1
@@ -606,19 +608,6 @@ unsafe impl GodotFfi for Basis {
 
 impl_godot_as_self!(Basis);
 
-/// The ordering used to interpret a set of euler angles as extrinsic
-/// rotations.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-#[repr(C)]
-pub enum EulerOrder {
-    XYZ = 0,
-    XZY = 1,
-    YXZ = 2,
-    YZX = 3,
-    ZXY = 4,
-    ZYX = 5,
-}
-
 #[cfg(test)]
 mod test {
     use crate::builtin::real_consts::{FRAC_PI_2, PI};

godot-core/src/builtin/mod.rs

@@ -88,8 +88,6 @@ pub mod strings {
     pub use super::string::TransientStringNameOrd;
 }
 
-use crate::engine::global::Side;
-
 // ----------------------------------------------------------------------------------------------------------------------------------------------
 // Implementation
 
@@ -154,7 +152,12 @@ pub(crate) fn u8_to_bool(u: u8) -> bool {
 ///
 /// _Godot equivalent: `@GlobalScope.Side`_
 #[deprecated(note = "Merged with `godot::global::Side`.")]
-pub type RectSide = Side;
+pub type RectSide = crate::engine::global::Side;
+use crate::engine::global::Side;
+
+/// The ordering used to interpret a set of euler angles as extrinsic rotations.
+#[deprecated(note = "Merged with `godot::global::EulerOrder`.")]
+pub type EulerOrder = crate::engine::global::EulerOrder;
 
 #[allow(non_upper_case_globals)]
 impl Side {

godot-core/src/builtin/quaternion.rs

@@ -9,8 +9,9 @@ use godot_ffi as sys;
 use sys::{ffi_methods, GodotFfi};
 
 use crate::builtin::math::{ApproxEq, FloatExt, GlamConv, GlamType};
-use crate::builtin::{inner, real, Basis, EulerOrder, RQuat, RealConv, Vector3};
+use crate::builtin::{inner, real, Basis, RQuat, RealConv, Vector3};
 
+use crate::engine::global::EulerOrder;
 use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign};
 
 use super::meta::impl_godot_as_self;

itest/rust/src/builtin_tests/geometry/basis_test.rs

@@ -8,7 +8,8 @@
 use godot::builtin::inner::InnerBasis;
 use godot::builtin::math::assert_eq_approx;
 use godot::builtin::meta::ToGodot;
-use godot::builtin::{real, Basis, EulerOrder, RealConv, VariantOperator, Vector3};
+use godot::builtin::{real, Basis, RealConv, VariantOperator, Vector3};
+use godot::engine::global::EulerOrder;
 
 use crate::framework::itest;